commit | 5f4247db1a13784058ad5362c2203c0e4511a737 | [log] [tgz] |
---|---|---|
author | Jiarenxiang <SingalJia@outlook.com> | Fri Jun 06 18:10:35 2025 +0800 |
committer | Jiarenxiang <SingalJia@outlook.com> | Fri Jun 06 18:18:00 2025 +0800 |
tree | 422e4470aeb73875a39ebef0e6fcbc3d0ed25f70 | |
parent | 747f1d76fe3abeaf758cc2b62284346463584969 [diff] [blame] |
解决合并冲突,并实现种子junit单元测试 Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1eb2c2f..56c7d69 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -12,10 +12,10 @@ # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: + enabled: true + url: jdbc:mysql://39.105.38.63:3306/pt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: pt + password: JR8dHyiAJjtf6JAi # 初始连接数 initialSize: 5 # 最小连接池数量