From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X

---
 ruoyi-admin/src/main/resources/application.yml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9db74dc..f293140 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,7 +8,7 @@
   copyrightYear: 2024
 
 captcha:
-  enable: true
+  enable: false
   # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
   type: MATH
@@ -47,7 +47,6 @@
     org.dromara: @logging.level@
     org.springframework: warn
     org.mybatis.spring.mapper: error
-    org.apache.fury: warn
   config: classpath:logback-plus.xml
 
 # 鐢ㄦ埛閰嶇疆
@@ -111,12 +110,15 @@
 security:
   # 鎺掗櫎璺緞
   excludes:
+    # 闈欐�佽祫婧�
     - /*.html
     - /**/*.html
     - /**/*.css
     - /**/*.js
+    # 鍏叡璺緞
     - /favicon.ico
     - /error
+    # swagger 鏂囨。閰嶇疆
     - /*/api-docs
     - /*/api-docs/**
     - /warm-flow-ui/token-name
@@ -124,7 +126,7 @@
 # 澶氱鎴烽厤缃�
 tenant:
   # 鏄惁寮�鍚�
-  enable: true
+  enable: false
   # 鎺掗櫎琛�
   excludes:
     - sys_menu
@@ -143,11 +145,11 @@
   # 鑷畾涔夐厤缃� 鏄惁鍏ㄥ眬寮�鍚�昏緫鍒犻櫎 鍏抽棴鍚� 鎵�鏈夐�昏緫鍒犻櫎鍔熻兘灏嗗け鏁�
   enableLogicDelete: true
   # 澶氬寘鍚嶄娇鐢� 渚嬪 org.dromara.**.mapper,org.xxx.**.mapper
-  mapperPackage: org.dromara.**.mapper
+  mapperPackage: org.dromara.**.mapper,cn.shlanbao.**.mapper
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
-  typeAliasesPackage: org.dromara.**.domain
+  typeAliasesPackage: org.dromara.**.domain, cn.shlanbao.**.domain
   global-config:
     dbConfig:
       # 涓婚敭绫诲瀷
@@ -172,7 +174,7 @@
 # api鎺ュ彛鍔犲瘑
 api-decrypt:
   # 鏄惁寮�鍚叏灞�鎺ュ彛鍔犲瘑
-  enabled: true
+  enabled: false
   # AES 鍔犲瘑澶存爣璇�
   headerFlag: encrypt-key
   # 鍝嶅簲鍔犲瘑鍏挜 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA 浣跨敤鑰呰鑷鏇存崲
@@ -220,6 +222,8 @@
       packages-to-scan: org.dromara.generator
     - group: 5.宸ヤ綔娴佹ā鍧�
       packages-to-scan: org.dromara.workflow
+    - group: 6.璐ㄩ噺妯″潡
+      packages-to-scan: cn.shlanbao.qms
 
 # 闃叉XSS鏀诲嚮
 xss:
@@ -276,7 +280,7 @@
 --- # warm-flow宸ヤ綔娴侀厤缃�
 warm-flow:
   # 鏄惁寮�鍚伐浣滄祦锛岄粯璁rue
-  enabled: false
+  enabled: true
   # 鏄惁寮�鍚璁″櫒ui
   ui: true
   # 榛樿Authorization锛屽鏋滄湁澶氫釜token锛岀敤閫楀彿鍒嗛殧

--
Gitblit v1.9.3