From 11bc9c5453ef32df0be2c3d9c549b04910b8fbca Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 六月 2025 17:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index bce7996..204f060 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -18,10 +18,10 @@
# password: Smartor.2023
# driverClassName: com.mysql.cj.jdbc.Driver
# 娌冲崡
-# url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: 123456
-# driverClassName: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: root
+ # password: 123456
+ # driverClassName: com.mysql.cj.jdbc.Driver
# # 鏂板崕
# url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: smartor
@@ -34,6 +34,12 @@
password: Hxerp2000
driverClassName: com.mysql.cj.jdbc.Driver
+# # 楂樻柉鏁版嵁搴撻厤缃�
+# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
+# username: gaussdb
+# password: Ls@123456
+# driverClassName: org.postgresql.Driver
+
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
--
Gitblit v1.9.3