From face1a695132461b2a2e6b2c47e3dfe495d9b227 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 24 一月 2025 16:18:34 +0800 Subject: [PATCH] 合并代码 --- cloud-server-activity/src/main/resources/sharding-jdbc.properties | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cloud-server-activity/src/main/resources/sharding-jdbc.properties b/cloud-server-activity/src/main/resources/sharding-jdbc.properties index 7f8645e..a8273e2 100644 --- a/cloud-server-activity/src/main/resources/sharding-jdbc.properties +++ b/cloud-server-activity/src/main/resources/sharding-jdbc.properties @@ -1,22 +1,9 @@ -#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_activity?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://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai datasource.master0.username=root -datasource.master0.password=playpai2023! +datasource.master0.password=123456 datasource.master0.maxActive=20 datasource.master0.maxWait=60000 datasource.master0.minIdle=5 @@ -24,4 +11,17 @@ +#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:3306/playpai_activity?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