From bf5a0260bb849e745535e57d858e300a22d6d4d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 27 三月 2023 15:06:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b25c61c..a44e5ec 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,6 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- #profile: /Users/dongshicun/IdeaProjects/JQ.OPO/testDoc/ruoyi/uploadPath
#profile: C:/YYJQ/OPO/WEB/Upload
profile: D:/YYJQ/OPO/WEB/Upload
#profile: E:/YYJQ/OPO/WEB/Upload
@@ -68,17 +67,18 @@
enabled: ALWAYS
# redis 閰嶇疆
redis:
- # 鍦板潃
- host: 47.118.79.3
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細瀹㈡埛鐜
#host: 129.88.242.37
- #host: 127.0.0.1
+ #port: 6379
+ #password: jqserver
- # 绔彛锛岄粯璁や负6379
- port: 6379
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細娴嬭瘯鐜
+ host: 116.62.18.175
+ password: Smartor
+ port: 6020
+
# 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
- password: jqserver
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
--
Gitblit v1.9.3