From e995eef7545e94993210604e1c519480b20f15d9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 27 三月 2023 08:58:48 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/resources/application-druid.yml | 2 ++
ruoyi-admin/src/main/resources/application.yml | 15 ++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 953d4e1..4479fd8 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,10 +6,12 @@
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/lihuopo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: opo
password: opo@2022
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cdd376c..67f7a21 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,16 +67,18 @@
enabled: ALWAYS
# redis 閰嶇疆
redis:
- # 鍦板潃
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細娴嬭瘯鐜
host: 116.62.18.175
- #host: 129.88.242.37
-
- # 绔彛锛岄粯璁や负6379
+ password: Smartor
port: 6020
+
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細瀹㈡埛鐜
+ #host: 129.88.242.37
+ #port: 6379
+ #password: jqserver
+
# 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
- password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
--
Gitblit v1.9.3