From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-admin/src/main/resources/application-druid.yml | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/resources/application-druid.yml b/ltkj-admin/src/main/resources/application-druid.yml
index 3a63017..79e47a0 100644
--- a/ltkj-admin/src/main/resources/application-druid.yml
+++ b/ltkj-admin/src/main/resources/application-druid.yml
@@ -6,19 +6,36 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- #url: jdbc:mysql://192.168.0.101:3306/mydb?serverTimezone=UTC
- url: jdbc:mysql://47.109.86.30:3306/ltkj_tj1.0?serverTimezone=GMT%2B8
- #url: jdbc:mysql://192.168.0.101:3306/mydb?serverTimezone=GMT%2B8
+ url: jdbc:mysql://101.42.27.146:3306/ltkj_tj1.0?serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ltkj_tj1.0?serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ltkj_tj2.0?serverTimezone=GMT%2B8
username: root
#password: Root_ltkj123
password: Root_ltkj123
# 浠庡簱鏁版嵁婧�
- slave:
+ slavepacs:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
+# enabled: true
+# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.0.111:1433;DatabaseName=Testlg
+# username: sa
+# password: admin123
+ # 浠庡簱鏁版嵁婧�
+ slavehis:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+# enabled: true
+# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.0.111:1433;DatabaseName=Testlg
+# username: sa
+# password: admin123
+ # 浠庡簱鏁版嵁婧�
+ slavelis:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+# enabled: true
+# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.0.111:1433;DatabaseName=Testlg
+# username: sa
+# password: admin123
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -34,7 +51,7 @@
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
maxEvictableIdleTimeMillis: 900000
# 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
+ validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
--
Gitblit v1.8.0