From bbf8efb4cf186a753128a88822cfd28af46a0f38 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 14:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index cc4ed8f..e7e3ad8 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,20 +6,15 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# # 鍖婚櫌鐜
+ # 鍖婚櫌鐜
# url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: JQ
# password: Jqserver88
- # 寮�鍙戠幆澧�-闃块噷浜�
-# url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-# username: opo
-# password: opo@2022
-
- # 寮�鍙戠幆澧�-鍐呯綉
- url: jdbc:mysql://192.168.1.16:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+# # 寮�鍙戠幆澧�
+ url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: opo
- password: Smartor.2023
+ password: opo@2022
# 浠庡簱鏁版嵁婧�
slave:
@@ -67,4 +62,4 @@
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
--
Gitblit v1.9.3