From e7242d40110c8a157867acd2d1a1718fb640d4c5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 16:02:04 +0800
Subject: [PATCH] fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ; fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ;
---
ruoyi-admin/src/main/resources/application.yml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index fd93576..f18898c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -10,10 +10,9 @@
demoEnabled: true
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
- # 缂撳瓨鎳掑姞杞�
- cacheLazy: false
captcha:
+ enable: true
# 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
type: MATH
@@ -136,6 +135,20 @@
- /actuator
- /actuator/**
+# 澶氱鎴烽厤缃�
+tenant:
+ # 鏄惁寮�鍚�
+ enable: true
+ # 鎺掗櫎琛�
+ excludes:
+ - sys_menu
+ - sys_tenant
+ - sys_tenant_package
+ - sys_role_dept
+ - sys_role_menu
+ - sys_user_post
+ - sys_user_role
+
# MyBatisPlus閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
@@ -180,10 +193,22 @@
# 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
where-strategy: NOT_NULL
+# 鏁版嵁鍔犲瘑
+mybatis-encryptor:
+ # 鏄惁寮�鍚姞瀵�
+ enable: false
+ # 榛樿鍔犲瘑绠楁硶
+ algorithm: BASE64
+ # 缂栫爜鏂瑰紡 BASE64/HEX銆傞粯璁ASE64
+ encode: BASE64
+ # 瀹夊叏绉橀挜 瀵圭О绠楁硶鐨勭閽� 濡傦細AES锛孲M4
+ password:
+ # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA
+ publicKey:
+ privateKey:
+
# Swagger閰嶇疆
swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
info:
# 鏍囬
title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
@@ -205,6 +230,9 @@
name: ${sa-token.token-name}
springdoc:
+ api-docs:
+ # 鏄惁寮�鍚帴鍙ｆ枃妗�
+ enabled: true
swagger-ui:
# 鎸佷箙鍖栬璇佹暟鎹�
persistAuthorization: true
@@ -212,9 +240,11 @@
group-configs:
- group: 1.婕旂ず妯″潡
packages-to-scan: com.ruoyi.demo
- - group: 2.绯荤粺妯″潡
+ - group: 2.閫氱敤妯″潡
packages-to-scan: com.ruoyi.web
- - group: 3.浠ｇ爜鐢熸垚妯″潡
+ - group: 3.绯荤粺妯″潡
+ packages-to-scan: com.ruoyi.system
+ - group: 4.浠ｇ爜鐢熸垚妯″潡
packages-to-scan: com.ruoyi.generator
# 闃叉XSS鏀诲嚮
--
Gitblit v1.9.3