From bbf8efb4cf186a753128a88822cfd28af46a0f38 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 14:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 2ab7106..3fb9563 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
@@ -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,12 @@
urlPatterns: /system/*,/monitor/*,/tool/*
-#閽夐拤鐨勫瘑閽�
-dingAppid: dingn8iip5ubj7clrrsv
-dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+###閽夐拤鐨勫瘑閽ワ紙鍏徃锛�
+#agentId: 1779052814
+#dingAppid: dingn8iip5ubj7clrrsv
+#dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
+#閽夐拤鐨勫瘑閽ワ紙鐪佷汉姘戯級
+agentId: 2975938892
+dingAppid: dingbxgfddodocmtqqsu
+dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
--
Gitblit v1.9.3