From e7acba8aaaa91a067728d4769b4af5a9dd6ac189 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 31 五月 2023 19:03:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f9f74c3..4b73f12 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,10 +9,10 @@
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
   # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  #寮�鍙戠幆澧�
-  #profile: D:/YYJQ/OPO/WEB/Upload
-  #鍖婚櫌鐜
-  profile: E:/YYJQ/OPO/WEB/Upload
+  # 寮�鍙戠幆澧�
+  profile: D:/lihusoft/OPO/WEB/Upload
+  # 鍖婚櫌鐜
+  #profile: E:/OPO/WEB/Upload
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁$畻 char 瀛楃楠岃瘉
@@ -69,14 +69,14 @@
   # redis 閰嶇疆
   redis:
     # 鍦板潃銆佸瘑鐮併�佺鍙o紙榛樿涓�6379锛夛細鍖婚櫌鐜
-    host: 129.88.242.37
-    password: jqserver
-    port: 6379
+    #host: 129.88.242.37
+    #password: jqserver
+    #port: 6379
 
     # 鍦板潃銆佸瘑鐮併�佺鍙o紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
-    #host: 116.62.18.175
-    #password: Smartor
-    #port: 6020
+    host: 116.62.18.175
+    password: Smartor
+    port: 6020
 
     # 鏁版嵁搴撶储寮�
     database: 0

--
Gitblit v1.9.3