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 | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 18f2bdd..f293140 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -121,6 +121,7 @@
# swagger 鏂囨。閰嶇疆
- /*/api-docs
- /*/api-docs/**
+ - /warm-flow-ui/token-name
# 澶氱鎴烽厤缃�
tenant:
@@ -141,6 +142,8 @@
# MyBatisPlus閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
+ # 鑷畾涔夐厤缃� 鏄惁鍏ㄥ眬寮�鍚�昏緫鍒犻櫎 鍏抽棴鍚� 鎵�鏈夐�昏緫鍒犻櫎鍔熻兘灏嗗け鏁�
+ enableLogicDelete: true
# 澶氬寘鍚嶄娇鐢� 渚嬪 org.dromara.**.mapper,org.xxx.**.mapper
mapperPackage: org.dromara.**.mapper,cn.shlanbao.**.mapper
# 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
@@ -217,7 +220,9 @@
packages-to-scan: org.dromara.system
- group: 4.浠ｇ爜鐢熸垚妯″潡
packages-to-scan: org.dromara.generator
- - group: 5.璐ㄩ噺妯″潡
+ - group: 5.宸ヤ綔娴佹ā鍧�
+ packages-to-scan: org.dromara.workflow
+ - group: 6.璐ㄩ噺妯″潡
packages-to-scan: cn.shlanbao.qms
# 闃叉XSS鏀诲嚮
@@ -225,9 +230,9 @@
# 杩囨护寮�鍏�
enabled: true
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
+ excludeUrls:
+ - /system/notice
+ - /warm-flow/save-xml
# 鍏ㄥ眬绾跨▼姹犵浉鍏抽厤缃�
# 濡備娇鐢↗DK21璇风洿鎺ヤ娇鐢ㄨ櫄鎷熺嚎绋� 涓嶈寮�鍚閰嶇疆
@@ -272,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