From d56c77d6ba4213c9e188ff223795ff9305628d81 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 17:07:23 +0800
Subject: [PATCH] fix 修复 超管租户无套餐不能编辑问题 改为后端校验

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 80f3bf3..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
@@ -83,6 +82,9 @@
     restart:
       # 鐑儴缃插紑鍏�
       enabled: true
+  mvc:
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
   jackson:
     # 鏃ユ湡鏍煎紡鍖�
     date-format: yyyy-MM-dd HH:mm:ss
@@ -133,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:
@@ -150,7 +166,7 @@
     mapUnderscoreToCamelCase: true
     # MyBatis 鑷姩鏄犲皠绛栫暐
     # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
-    autoMappingBehavior: PARTIAL
+    autoMappingBehavior: FULL
     # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
     # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
     autoMappingUnknownColumnBehavior: NONE
@@ -177,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}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
@@ -202,13 +230,21 @@
         name: ${sa-token.token-name}
 
 springdoc:
+  api-docs:
+    # 鏄惁寮�鍚帴鍙ｆ枃妗�
+    enabled: true
+  swagger-ui:
+    # 鎸佷箙鍖栬璇佹暟鎹�
+    persistAuthorization: true
   #杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
   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