Merge remote-tracking branch 'origin/master'

liusheng

2025-08-14 694f1b57d85bd50cd15c84527d726b4f0ec502dd

 ruoyi-admin/src/main/resources/application-hn.yml

@@ -6,8 +6,8 @@
    druid:
      # 主库数据源
      master:
        #        河南
        url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #   河南
        url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
        driverClassName: com.mysql.cj.jdbc.Driver
@@ -15,12 +15,12 @@

      # 从库数据源
      slave:
      # 从数据源开关/默认关闭(公司)
      # enabled: true
      # url: jdbc:sqlserver://116.62.18.175:6001;DatabaseName=iv-ywey;encrypt=false;SelectMethod=cursor
      # username: sa
      # password: Hxerp2000
      # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
        # 从数据源开关/默认关闭(公司)
        enabled: true
        url: jdbc:postgresql://10.10.13.108:5432/hdr?socketTimeout=300000
        username: mbsjjk
        password: sjjk@2025
        driver-class-name: org.postgresql.Driver

      # 从数据源开关/默认关闭(义乌二院)
      # enabled: true
@@ -47,7 +47,7 @@
      #      validationQuery: SELECT 1 FROM DUAL
      validationQuery: SELECT 1
      testWhileIdle: true
      testOnBorrow: false
      testOnBorrow: true
      testOnReturn: false
      webStatFilter:
        enabled: true
@@ -91,6 +91,12 @@
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms

# PageHelper分页插件
pagehelper:
  helperDialect: postgresql
  supportMethodsArguments: true
  params: count=countSql

# Swagger配置
swagger:
  # 是否开启swagger
@@ -114,6 +120,27 @@
    default-page: 1
    default-size: 10

# SSO配置
sso:
  enabled: true
  client_id: "mbglxt"  # 信通院提供
  client_secret: "mbglxt"  # 信通院提供
  # 内网配置
  internal:
    authorize_url: "http://10.10.13.112:37727/connect/authorize"
    token_url: "http://10.10.13.112:37727/connect/token"
    userinfo_url: "http://10.10.13.112:37727/connect/userinfo"
    redirect_uri: "http://10.10.13.142:8096/sso/callback"
  # 外网配置
  external:
    authorize_url: "http://172.20.111.142:37727/connect/authorize"
    token_url: "http://172.20.111.142:37727/connect/token"
    userinfo_url: "http://172.20.111.142:37727/connect/userinfo"
    redirect_uri: "http://172.20.111.142:8096/sso/callback"
  state: "smartor"  # 你们系统标识
  scope: "openid roles profile"


#钉钉的密钥
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD