feat(cms): 新增轮播图副标题字段并调整导航链接行为
- 在 CmsBannerItem 实体中新增 subtitle 字段,支持单图副标题描述 - 在数据库 cms_banner_group 表添加 subtitle 字段以支持副标题存储 - 删除 CmsNavigationServiceImpl 中外链导航默认设置的 target="_blank" 行为 - 调整 application.yml 文件,更新文件服务器地址及上传路径配置 - 优化配置文件,删除多余注释和无关旧配置,新增 AI 找房模型配置项
This commit is contained in:
@@ -40,6 +40,9 @@ public class CmsBannerItem implements Serializable {
|
|||||||
@Schema(description = "单图标题(alt/无障碍)")
|
@Schema(description = "单图标题(alt/无障碍)")
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
|
@Schema(description = "单图副标题")
|
||||||
|
private String subtitle;
|
||||||
|
|
||||||
@Schema(description = "跳转类型: 0无 1外链 2文章 3产品")
|
@Schema(description = "跳转类型: 0无 1外链 2文章 3产品")
|
||||||
private Integer linkType;
|
private Integer linkType;
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ public class CmsNavigationServiceImpl extends ServiceImpl<CmsNavigationMapper, C
|
|||||||
// 3.外链模型
|
// 3.外链模型
|
||||||
if (navigation.getModel().equals("links")) {
|
if (navigation.getModel().equals("links")) {
|
||||||
navigation.setPath(path);
|
navigation.setPath(path);
|
||||||
navigation.setTarget("_blank");
|
|
||||||
navigation.setComponent(null);
|
navigation.setComponent(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS `cms_banner_item` (
|
|||||||
`group_id` INT NOT NULL COMMENT '所属轮播组ID',
|
`group_id` INT NOT NULL COMMENT '所属轮播组ID',
|
||||||
`image` VARCHAR(500) NOT NULL COMMENT '图片地址',
|
`image` VARCHAR(500) NOT NULL COMMENT '图片地址',
|
||||||
`title` VARCHAR(120) DEFAULT NULL COMMENT '单图标题(alt/无障碍)',
|
`title` VARCHAR(120) DEFAULT NULL COMMENT '单图标题(alt/无障碍)',
|
||||||
|
`subtitle` VARCHAR(255) DEFAULT NULL COMMENT '单图副标题',
|
||||||
`link_type` TINYINT NOT NULL DEFAULT 0 COMMENT '跳转类型: 0无 1外链 2文章 3产品',
|
`link_type` TINYINT NOT NULL DEFAULT 0 COMMENT '跳转类型: 0无 1外链 2文章 3产品',
|
||||||
`link_url` VARCHAR(500) DEFAULT NULL COMMENT '外链地址',
|
`link_url` VARCHAR(500) DEFAULT NULL COMMENT '外链地址',
|
||||||
`link_target_id` INT DEFAULT NULL COMMENT '跳转目标ID(文章/产品)',
|
`link_target_id` INT DEFAULT NULL COMMENT '跳转目标ID(文章/产品)',
|
||||||
|
|||||||
@@ -22,13 +22,6 @@ spring:
|
|||||||
jackson:
|
jackson:
|
||||||
time-zone: GMT+8
|
time-zone: GMT+8
|
||||||
date-format: yyyy-MM-dd HH:mm:ss
|
date-format: yyyy-MM-dd HH:mm:ss
|
||||||
serialization:
|
|
||||||
write-dates-as-timestamps: false
|
|
||||||
deserialization:
|
|
||||||
fail-on-unknown-properties: false
|
|
||||||
# 确保启用Java 8时间支持
|
|
||||||
modules:
|
|
||||||
- com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
|
|
||||||
|
|
||||||
# 连接池配置
|
# 连接池配置
|
||||||
datasource:
|
datasource:
|
||||||
@@ -82,10 +75,7 @@ mybatis-plus:
|
|||||||
map-underscore-to-camel-case: true
|
map-underscore-to-camel-case: true
|
||||||
cache-enabled: true
|
cache-enabled: true
|
||||||
global-config:
|
global-config:
|
||||||
banner: false
|
:banner: false
|
||||||
# SqlRunner.db().xxx 需要开启该开关,否则会报:
|
|
||||||
# Mapped Statements collection does not contain value for com.baomidou.mybatisplus.core.mapper.SqlRunner.Delete
|
|
||||||
enable-sql-runner: true
|
|
||||||
db-config:
|
db-config:
|
||||||
id-type: auto
|
id-type: auto
|
||||||
logic-delete-value: 1
|
logic-delete-value: 1
|
||||||
@@ -102,11 +92,10 @@ config:
|
|||||||
# 主服务器
|
# 主服务器
|
||||||
server-url: https://server.websoft.top/api
|
server-url: https://server.websoft.top/api
|
||||||
# 文件服务器
|
# 文件服务器
|
||||||
file-server: https://file.websoft.top
|
file-server: https://file.wsdns.cn
|
||||||
# 其他
|
upload-path: /Users/gxwebsoft/Documents/uploads/
|
||||||
api-url: https://server.websoft.top/api
|
local-upload-path: /Users/gxwebsoft/Documents/uploads/
|
||||||
upload-path: /Users/gxwebsoft/Documents/uploads
|
api-url: https://cms-api.websoft.top/api
|
||||||
local-upload-path: /Users/gxwebsoft/Documents/uploads
|
|
||||||
|
|
||||||
# 阿里云OSS云存储
|
# 阿里云OSS云存储
|
||||||
endpoint: https://oss-cn-shenzhen.aliyuncs.com
|
endpoint: https://oss-cn-shenzhen.aliyuncs.com
|
||||||
@@ -121,18 +110,18 @@ shop:
|
|||||||
order:
|
order:
|
||||||
# 测试账号配置
|
# 测试账号配置
|
||||||
test-account:
|
test-account:
|
||||||
enabled: true # 禁用测试账号功能
|
enabled: true
|
||||||
phone-numbers:
|
phone-numbers:
|
||||||
- "19163679581" # 改为其他测试手机号
|
- "13737128880"
|
||||||
test-pay-amount: 0.01
|
test-pay-amount: 0.01
|
||||||
|
|
||||||
# 租户特殊规则配置
|
# 租户特殊规则配置
|
||||||
# tenant-rules:
|
tenant-rules:
|
||||||
# - tenant-id: 10324
|
- tenant-id: 10324
|
||||||
# tenant-name: "百色中学"
|
tenant-name: "百色中学"
|
||||||
# min-amount: 10
|
min-amount: 10
|
||||||
# min-amount-message: "捐款金额最低不能少于10元,感谢您的爱心捐赠^_^"
|
min-amount-message: "捐款金额最低不能少于10元,感谢您的爱心捐赠^_^"
|
||||||
# enabled: true
|
enabled: true
|
||||||
|
|
||||||
# 默认配置
|
# 默认配置
|
||||||
default-config:
|
default-config:
|
||||||
@@ -141,32 +130,6 @@ shop:
|
|||||||
min-order-amount: 0
|
min-order-amount: 0
|
||||||
order-timeout-minutes: 30
|
order-timeout-minutes: 30
|
||||||
|
|
||||||
# 订单自动取消配置
|
|
||||||
auto-cancel:
|
|
||||||
# 是否启用自动取消功能
|
|
||||||
enabled: true
|
|
||||||
# 默认超时时间(分钟)
|
|
||||||
default-timeout-minutes: 30
|
|
||||||
# 定时任务检查间隔(分钟)
|
|
||||||
check-interval-minutes: 1
|
|
||||||
# 批量处理大小
|
|
||||||
batch-size: 100
|
|
||||||
# 定时任务执行时间(cron表达式)
|
|
||||||
# 生产环境:每5分钟执行一次
|
|
||||||
cron: "0 */5 * * * ?"
|
|
||||||
|
|
||||||
# 租户特殊配置
|
|
||||||
# tenant-configs:
|
|
||||||
# - tenant-id: 10324
|
|
||||||
# tenant-name: "百色中学"
|
|
||||||
# timeout-minutes: 120 # 捐款订单给更长的支付时间
|
|
||||||
# enabled: true
|
|
||||||
# 可以添加更多租户配置
|
|
||||||
# - tenant-id: 10550
|
|
||||||
# tenant-name: "其他租户"
|
|
||||||
# timeout-minutes: 15
|
|
||||||
# enabled: true
|
|
||||||
|
|
||||||
# 证书配置
|
# 证书配置
|
||||||
certificate:
|
certificate:
|
||||||
# 证书加载模式: CLASSPATH, FILESYSTEM, VOLUME
|
# 证书加载模式: CLASSPATH, FILESYSTEM, VOLUME
|
||||||
@@ -201,69 +164,14 @@ springdoc:
|
|||||||
swagger-ui:
|
swagger-ui:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
# AI 模块(Ollama)
|
|
||||||
ai:
|
|
||||||
ollama:
|
|
||||||
base-url: https://ai-api.websoft.top
|
|
||||||
fallback-url: http://47.119.165.234:11434
|
|
||||||
chat-model: qwen3.5:cloud
|
|
||||||
embed-model: qwen3-embedding:4b
|
|
||||||
connect-timeout-ms: 10000
|
|
||||||
read-timeout-ms: 300000
|
|
||||||
write-timeout-ms: 60000
|
|
||||||
max-concurrency: 4
|
|
||||||
rag-max-candidates: 2000
|
|
||||||
rag-top-k: 5
|
|
||||||
rag-chunk-size: 800
|
|
||||||
rag-chunk-overlap: 120
|
|
||||||
|
|
||||||
# LED - 排班接口(业务中台)对接配置
|
|
||||||
led:
|
|
||||||
bme:
|
|
||||||
base-url: ${LED_BME_BASE_URL:http://16.1.4.201:7979}
|
|
||||||
appid: ${LED_BME_APPID:BQ73n58Lf}
|
|
||||||
secret-key: ${LED_BME_SECRET_KEY:jk720-DCPnGq@5t8}
|
|
||||||
mechanism-id: ${LED_BME_MECHANISM_ID:10001}
|
|
||||||
default-ext-user-id: ${LED_BME_DEFAULT_EXT_USER_ID:txzhyy}
|
|
||||||
default-hospital-id: ${LED_BME_DEFAULT_HOSPITAL_ID:}
|
|
||||||
timeout-ms: ${LED_BME_TIMEOUT_MS:10000}
|
|
||||||
|
|
||||||
# 启用 Knife4j
|
# 启用 Knife4j
|
||||||
knife4j:
|
knife4j:
|
||||||
enable: true
|
enable: true
|
||||||
|
|
||||||
# 优惠券配置
|
# AI找房智能体模型配置。
|
||||||
coupon:
|
house:
|
||||||
# 过期处理定时任务配置
|
ai:
|
||||||
expire:
|
model:
|
||||||
# 定时任务执行时间(cron表达式)
|
endpoint: https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions
|
||||||
# 生产环境:每天凌晨2点执行
|
name: qwen3.6-flash
|
||||||
# 开发环境:每10分钟执行一次
|
api-key: sk-3ce4f27d08ab4bdfac42b828119a694a
|
||||||
cron: "0 0 2 * * ?"
|
|
||||||
# 开发环境可以设置为: "0 */10 * * * ?"
|
|
||||||
|
|
||||||
# 状态管理配置
|
|
||||||
status:
|
|
||||||
# 是否启用自动状态更新
|
|
||||||
auto-update: true
|
|
||||||
# 批量处理大小
|
|
||||||
batch-size: 1000
|
|
||||||
|
|
||||||
# 支付配置
|
|
||||||
payment:
|
|
||||||
# 开发环境配置
|
|
||||||
dev:
|
|
||||||
# 开发环境回调地址(本地调试用)
|
|
||||||
notify-url: "http://frps-10550.s209.websoft.top/api/shop/shop-order/notify"
|
|
||||||
# 开发环境是否启用环境感知
|
|
||||||
environment-aware: true
|
|
||||||
|
|
||||||
|
|
||||||
# 通知配置(企业微信/飞书机器人 Webhook)
|
|
||||||
notify:
|
|
||||||
# 企业微信群机器人 Webhook,格式:https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=YOUR_KEY
|
|
||||||
# 不启用时留空或删除此行
|
|
||||||
wecom-webhook: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=aa0d2f30-b785-44a2-ad19-05834569b7c5"
|
|
||||||
# 飞书群机器人 Webhook,格式:https://open.feishu.cn/open-apis/bot/v2/hook/YOUR_TOKEN
|
|
||||||
feishu-webhook: ""
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user