From 4af0979059d5d2323e2859bee84244da007f2542 Mon Sep 17 00:00:00 2001
From: lw <532810027@qq.com>
Date: Wed, 19 Jun 2024 08:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=88=90=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml       | 14 +++++++-------
 .../src/main/resources/application.yml             | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/zeroerr_oa-admin/src/main/resources/application-druid.yml b/zeroerr_oa-admin/src/main/resources/application-druid.yml
index 386e1f3..11f640a 100644
--- a/zeroerr_oa-admin/src/main/resources/application-druid.yml
+++ b/zeroerr_oa-admin/src/main/resources/application-druid.yml
@@ -5,14 +5,14 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: zeoa
-                password: dHahLWNYB7tD2Mia
 #            master:
-#                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: zero
+#                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: zeoa
+#                password: dHahLWNYB7tD2Mia
+            master:
+                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: zero
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml
index 7f2ca50..a886da0 100644
--- a/zeroerr_oa-admin/src/main/resources/application.yml
+++ b/zeroerr_oa-admin/src/main/resources/application.yml
@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  #profile: D:/zeroerr/uploadPath
-  profile: /home/zeroerr_oa/uploadPath
+  profile: D:/zeroerr/uploadPath
+  #profile: /home/zeroerr_oa/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -69,15 +69,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.189
-    #host: localhost
+    #host: 192.168.1.189
+    host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
-    #password:
+    #password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce: