Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 68b27795ae929f5300fc6fb301b31aada74a2e2f

 admin/src/main/resources/application.yml

@@ -50,6 +50,14 @@

# Spring配置
spring:
  rabbitmq:
    # 集群地址，用逗号分隔
    host: ${custom.rabbitmq.host}
    port: ${custom.rabbitmq.port}
    virtual-host: ${custom.rabbitmq.virtual-host}
    username: ${custom.rabbitmq.username}
    password: ${custom.rabbitmq.password}
    connection-timeout: 15000
  # 资源信息
  messages:
    # 国际化资源文件路径
@@ -74,7 +82,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://${custom.datasource.master.ip}:${custom.datasource.master.port}/${custom.datasource.master.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://${custom.datasource.master.ip}:${custom.datasource.master.port}/${custom.datasource.master.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
        username: ${custom.datasource.master.username}
        password: ${custom.datasource.master.password}
      # 从库数据源
@@ -164,7 +172,7 @@
  # 令牌密钥
  secret: abcdefghijklmnopqrstuvwxyz
  # 令牌有效期（默认30分钟）
  expireTime: 30
  expireTime: 43200

# MyBatis-plus配置
mybatis-plus:
@@ -174,6 +182,7 @@
  mapperLocations: classpath*:mapper/**/*Mapper.xml
  # 加载全局的配置文件
  configLocation: classpath:mybatis/mybatis-config.xml

# PageHelper分页插件
pagehelper:
  helperDialect: mysql
@@ -195,3 +204,15 @@
  excludes: /system/notice
  # 匹配链接
  urlPatterns: /system/*,/monitor/*,/tool/*

oss:
  access-key-id: "LTAI5t8MF5uEc3ZjqLFCR9bP"
  access-key-secret: "CjdGwbbPlyv6kZessjLMZ52V2w0RBX"
  endpoint: "oss-cn-hongkong.aliyuncs.com"
  bucket: "huichang-tms.oss-cn-hongkong.aliyuncs.com"
  region: "cn-hongkong"
  roleArn: "acs:ram::1097562432747899:role/tms-oss"
  key: "tms"