From 9c8c30d9ead02243a0cc3807fe6d47df9a6b51af Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 15:33:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 2ab7106..b6f5a84 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -41,7 +41,7 @@
logging:
file:
# 鏃ュ織璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/logs锛孡inux閰嶇疆 /home/ruoyi/logs,涓嶅～鍚岀骇鐩綍logs锛�
- path: D:/lihu/ls/logs
+ path: E:/lihu/ls/logs
level:
com.ruoyi: debug
org.springframework: warn
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: srm
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -72,13 +72,13 @@
enabled: ALWAYS
# redis 閰嶇疆
redis:
- # # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
- # host: 129.88.242.37
- # password: jqserver
- # port: 6379
+# # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
+# host: 129.88.242.37
+# password: jqserver
+# port: 6379
# 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- host: 116.62.18.175
+ host: 192.168.1.10
password: Smartor
port: 6020
@@ -149,6 +149,5 @@
urlPatterns: /system/*,/monitor/*,/tool/*
-#閽夐拤鐨勫瘑閽�
-dingAppid: dingn8iip5ubj7clrrsv
-dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
+
--
Gitblit v1.9.3