From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master

---
 ruoyi-admin/src/main/resources/application-druid.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c1eaa91..3676437 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,7 @@
 #        password: Hxerp2000
 #        driverClassName: com.mysql.cj.jdbc.Driver
         #  鍏徃鏈湴
-        url: jdbc:mysql://192.168.100.10:3306/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: smartor
         password: Smartor.2023
         driverClassName: com.mysql.cj.jdbc.Driver
@@ -113,7 +113,7 @@
             multi-statement-allow: true
   # redis 閰嶇疆
   redis:
-    host: 127.0.0.1 #192.168.100.10
+    host: 192.168.100.10
     port: 6020
     database: 0
     password: Smartor
@@ -269,4 +269,4 @@
 #闅忚鍖婚櫌锛�1鏂板崕   2涓芥按
 visitHosp: 2
 
-isEncryp:
\ No newline at end of file
+isEncryp:

--
Gitblit v1.9.3