From 1eed180f9c2bf73130ddcab66d25e6a641660ff0 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 25 三月 2024 17:13:33 +0800 Subject: [PATCH] 合并代码 --- cloud-server-account/src/main/resources/sharding-jdbc.properties | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cloud-server-account/src/main/resources/sharding-jdbc.properties b/cloud-server-account/src/main/resources/sharding-jdbc.properties index 367da05..cd3746e 100644 --- a/cloud-server-account/src/main/resources/sharding-jdbc.properties +++ b/cloud-server-account/src/main/resources/sharding-jdbc.properties @@ -1,20 +1,7 @@ -datasource.names=master0 -datasource.master0.type=com.alibaba.druid.pool.DruidDataSource -datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver -datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -datasource.master0.username=root -datasource.master0.password=123456 -datasource.master0.maxActive=20 -datasource.master0.maxWait=60000 -datasource.master0.minIdle=5 -datasource.master0.initialSize=2 - - - #datasource.names=master0 #datasource.master0.type=com.alibaba.druid.pool.DruidDataSource #datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver -#datasource.master0.url=jdbc:mysql://192.168.110.80/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai #datasource.master0.username=root #datasource.master0.password=123456 #datasource.master0.maxActive=20 @@ -24,3 +11,16 @@ +datasource.names=master0 +datasource.master0.type=com.alibaba.druid.pool.DruidDataSource +datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver +datasource.master0.url=jdbc:mysql://127.0.0.1/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +datasource.master0.username=root +datasource.master0.password=playpai2023! +datasource.master0.maxActive=20 +datasource.master0.maxWait=60000 +datasource.master0.minIdle=5 +datasource.master0.initialSize=2 + + + -- Gitblit v1.7.1