diff --git a/os-admin/src/main/resources/application-druid.yml b/os-admin/src/main/resources/application-druid.yml index 17a29de..4a86182 100644 --- a/os-admin/src/main/resources/application-druid.yml +++ b/os-admin/src/main/resources/application-druid.yml @@ -2,12 +2,19 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource +# druid: +# # 主库数据源 +# master: +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=jdap_ems +# username: sa +# password: haiwei@123 + driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=jdap_ems - username: sa + url: jdbc:mysql://10.42.0.1:4000/tao_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root password: haiwei@123 # 从库数据源 slave: diff --git a/os-admin/src/main/resources/application.yml b/os-admin/src/main/resources/application.yml index 343e7e9..119835c 100644 --- a/os-admin/src/main/resources/application.yml +++ b/os-admin/src/main/resources/application.yml @@ -5,11 +5,11 @@ ruoyi: # 版本 version: 3.8.7 # 版权年份 - copyrightYear: 2024 + copyrightYear: 2025 # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -86,7 +86,7 @@ spring: # 数据库索引 database: 7 # 密码 - password: redis@2023 + password: haiwei@123 # 连接超时时间 timeout: 30s lettuce: @@ -122,7 +122,7 @@ mybatis: # PageHelper分页插件 pagehelper: # 明确数据源时使用 - helperDialect: sqlserver + helperDialect: mysql reasonable: true supportMethodsArguments: true params: count=countSql