From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 二月 2023 17:06:10 +0800
Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码

---
 ruoyi-admin/src/main/resources/application.yml |   89 +++++++++++++++++++++++++++-----------------
 1 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 27482ac..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
@@ -53,6 +52,14 @@
     org.springframework: warn
   config: classpath:logback.xml
 
+# 鐢ㄦ埛閰嶇疆
+user:
+  password:
+    # 瀵嗙爜鏈�澶ч敊璇鏁�
+    maxRetryCount: 5
+    # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+    lockTime: 10
+
 # Spring閰嶇疆
 spring:
   application:
@@ -75,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
@@ -100,15 +110,13 @@
   # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
   is-share: false
   # 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
-  is-read-head: true
+  is-read-header: true
   # 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
   is-read-cookie: false
   # token鍓嶇紑
   token-prefix: "Bearer"
   # jwt绉橀挜
   jwt-secret-key: abcdefghijklmnopqrstuvwxyz
-  # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
-  is-log: true
 
 # security閰嶇疆
 security:
@@ -121,14 +129,25 @@
     - /**/*.js
     # swagger 鏂囨。閰嶇疆
     - /favicon.ico
-    - /doc.html
-    - /swagger-ui/**
+    - /*/api-docs
     - /*/api-docs/**
-    # druid 鐩戞帶閰嶇疆
-    - /druid/**
     # actuator 鐩戞帶閰嶇疆
     - /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/
@@ -147,7 +166,7 @@
     mapUnderscoreToCamelCase: true
     # MyBatis 鑷姩鏄犲皠绛栫暐
     # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
-    autoMappingBehavior: PARTIAL
+    autoMappingBehavior: FULL
     # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
     # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
     autoMappingUnknownColumnBehavior: NONE
@@ -174,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}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
@@ -199,18 +230,21 @@
         name: ${sa-token.token-name}
 
 springdoc:
+  api-docs:
+    # 鏄惁寮�鍚帴鍙ｆ枃妗�
+    enabled: true
   swagger-ui:
-    # 淇敼Swagger UI璺緞
-    path: /doc.html
     # 鎸佷箙鍖栬璇佹暟鎹�
     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鏀诲嚮
@@ -231,26 +265,11 @@
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
 
---- # redisson 缂撳瓨閰嶇疆
-redisson:
-  cacheGroup:
-    # 鐢ㄤ緥: @Cacheable(cacheNames="groupId", key="#XXX") 鏂瑰彲浣跨敤缂撳瓨缁勯厤缃�
-    - groupId: redissonCacheMap
-      # 缁勮繃鏈熸椂闂�(鑴氭湰鐩戞帶)
-      ttl: 60000
-      # 缁勬渶澶х┖闂叉椂闂�(鑴氭湰鐩戞帶)
-      maxIdleTime: 60000
-      # 缁勬渶澶ч暱搴�
-      maxSize: 0
-    - groupId: testCache
-      ttl: 1000
-      maxIdleTime: 500
-
 --- # 鍒嗗竷寮忛攣 lock4j 鍏ㄥ眬閰嶇疆
 lock4j:
   # 鑾峰彇鍒嗗竷寮忛攣瓒呮椂鏃堕棿锛岄粯璁や负 3000 姣
   acquire-timeout: 3000
-  # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
+  # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 绉�
   expire: 30000
 
 --- # Actuator 鐩戞帶绔偣鐨勯厤缃」
@@ -258,9 +277,9 @@
   endpoints:
     web:
       exposure:
-        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
-        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
-        include: @endpoints.include@
+        include: '*'
   endpoint:
+    health:
+      show-details: ALWAYS
     logfile:
       external-file: ./logs/sys-console.log

--
Gitblit v1.9.3