From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/application-druid.yml |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index dd7720d..d36a314 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@
         druid:
             # 涓诲簱鏁版嵁婧�
             master:
-                url: jdbc:mysql://114.132.189.42:9004/zt_radio_requency?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3307/lims-xjxj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123456
             # 浠庡簱鏁版嵁婧�
@@ -58,4 +58,63 @@
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true
+
+    # Redis 杩炴帴閰嶇疆
+    data:
+        redis:
+            host: 127.0.0.1
+            port: 6379
+            database: 0
+            password:
+            timeout: 10s
+            lettuce:
+              pool:
+                # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+                min-idle: 0
+                # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+                max-idle: 8
+                # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+                max-active: 8
+                # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+                max-wait: -1ms
+
+# 椤圭洰鐩稿叧閰嶇疆
+ruoyi:
+  name: RuoYi
+  version: 3.9.2
+  copyrightYear: 2026
+  profile: D:/ruoyi/uploadPath
+  addressEnabled: false
+
+# 鐢ㄦ埛瀵嗙爜閰嶇疆
+user:
+  password:
+    maxRetryCount: 5
+    lockTime: 10
+
+# 浠ょ墝閰嶇疆
+token:
+  header: Authorization
+  secret: awertgbadrtawetfgfbsdfawerghbfdsftreagd
+  expireTime: 450
+
+# 闃茬洍閾鹃厤缃�
+referer:
+  enabled: false
+  allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip
+
+# XSS 杩囨护閰嶇疆
+xss:
+  enabled: true
+  excludes: /system/notice
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+  path: D:\椤圭洰鏂囦欢瀛樺偍\image
+  # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+  allowed: png,jpg,jpeg,gif
+
+# 鎶ュ憡 word 瀛樺偍璺緞
+wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word

--
Gitblit v1.9.3