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 | 51 +++++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 33fbcb7..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,19 +110,23 @@
security:
# 鎺掗櫎璺緞
excludes:
+ # 闈欐�佽祫婧�
- /*.html
- /**/*.html
- /**/*.css
- /**/*.js
+ # 鍏叡璺緞
- /favicon.ico
- /error
+ # swagger 鏂囨。閰嶇疆
- /*/api-docs
- /*/api-docs/**
+ - /warm-flow-ui/token-name
# 澶氱鎴烽厤缃�
tenant:
# 鏄惁寮�鍚�
- enable: true
+ enable: false
# 鎺掗櫎琛�
excludes:
- sys_menu
@@ -139,12 +142,14 @@
# MyBatisPlus閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
+ # 鑷畾涔夐厤缃� 鏄惁鍏ㄥ眬寮�鍚�昏緫鍒犻櫎 鍏抽棴鍚� 鎵�鏈夐�昏緫鍒犻櫎鍔熻兘灏嗗け鏁�
+ 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:
# 涓婚敭绫诲瀷
@@ -169,7 +174,7 @@
# api鎺ュ彛鍔犲瘑
api-decrypt:
# 鏄惁寮�鍚叏灞�鎺ュ彛鍔犲瘑
- enabled: true
+ enabled: false
# AES 鍔犲瘑澶存爣璇�
headerFlag: encrypt-key
# 鍝嶅簲鍔犲瘑鍏挜 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA 浣跨敤鑰呰鑷鏇存崲
@@ -215,6 +220,10 @@
packages-to-scan: org.dromara.system
- group: 4.浠ｇ爜鐢熸垚妯″潡
packages-to-scan: org.dromara.generator
+ - group: 5.宸ヤ綔娴佹ā鍧�
+ packages-to-scan: org.dromara.workflow
+ - group: 6.璐ㄩ噺妯″潡
+ packages-to-scan: cn.shlanbao.qms
# 闃叉XSS鏀诲嚮
xss:
@@ -223,8 +232,7 @@
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
excludeUrls:
- /system/notice
- - /workflow/model/save
- - /workflow/model/editModelXml
+ - /warm-flow/save-xml
# 鍏ㄥ眬绾跨▼姹犵浉鍏抽厤缃�
# 濡備娇鐢↗DK21璇风洿鎺ヤ娇鐢ㄨ櫄鎷熺嚎绋� 涓嶈寮�鍚閰嶇疆
@@ -269,24 +277,11 @@
# 璁剧疆璁块棶婧愬湴鍧�
allowedOrigins: '*'
---- #flowable閰嶇疆
-flowable:
- # 寮�鍏� 鐢ㄤ簬鍚姩/鍋滅敤宸ヤ綔娴�
+--- # warm-flow宸ヤ綔娴侀厤缃�
+warm-flow:
+ # 鏄惁寮�鍚伐浣滄祦锛岄粯璁rue
enabled: true
- process.enabled: ${flowable.enabled}
- eventregistry.enabled: ${flowable.enabled}
- async-executor-activate: false #鍏抽棴瀹氭椂浠诲姟JOB
- # 灏哾atabaseSchemaUpdate璁剧疆涓簍rue銆傚綋Flowable鍙戠幇搴撲笌鏁版嵁搴撹〃缁撴瀯涓嶄竴鑷存椂锛屼細鑷姩灏嗘暟鎹簱琛ㄧ粨鏋勫崌绾ц嚦鏂扮増鏈��
- database-schema-update: true
- activity-font-name: 瀹嬩綋
- label-font-name: 瀹嬩綋
- annotation-font-name: 瀹嬩綋
- # 鍏抽棴鍚勪釜妯″潡鐢熸垚琛紝鐩墠鍙娇鐢ㄥ伐浣滄祦鍩虹琛�
- idm:
- enabled: false
- cmmn:
- enabled: false
- dmn:
- enabled: false
- app:
- enabled: false
+ # 鏄惁寮�鍚璁″櫒ui
+ ui: true
+ # 榛樿Authorization锛屽鏋滄湁澶氫釜token锛岀敤閫楀彿鍒嗛殧
+ token-name: ${sa-token.token-name},clientid
--
Gitblit v1.9.3