From df6867ee052790c3d690f341c422540e47ae5ec3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 10:52:14 +0800
Subject: [PATCH] update 优化 默认开启复杂结构 resultMap 自动映射 简化xml编码(多结构实体需带上主键id)

---
 ruoyi-admin/src/main/resources/application.yml |  125 ++++++++++++++++-------------------------
 1 files changed, 48 insertions(+), 77 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 56076b3..fd93576 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,6 +53,14 @@
     org.springframework: warn
   config: classpath:logback.xml
 
+# 鐢ㄦ埛閰嶇疆
+user:
+  password:
+    # 瀵嗙爜鏈�澶ч敊璇鏁�
+    maxRetryCount: 5
+    # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+    lockTime: 10
+
 # Spring閰嶇疆
 spring:
   application:
@@ -76,9 +84,8 @@
       # 鐑儴缃插紑鍏�
       enabled: true
   mvc:
-    pathmatch:
-      # 閫傞厤 boot 2.6 璺敱涓� springfox 鍏煎
-      matching-strategy: ANT_PATH_MATCHER
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
   jackson:
     # 鏃ユ湡鏍煎紡鍖�
     date-format: yyyy-MM-dd HH:mm:ss
@@ -104,27 +111,18 @@
   # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼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:
   # 鎺掗櫎璺緞
   excludes:
-    - /login
-    - /smsLogin
-    - /xcxLogin
-    - /logout
-    - /register
-    - /captchaImage
-    - /captchaSms
     # 闈欐�佽祫婧�
     - /*.html
     - /**/*.html
@@ -132,12 +130,8 @@
     - /**/*.js
     # swagger 鏂囨。閰嶇疆
     - /favicon.ico
-    - /doc.html
-    - /swagger-resources/**
-    - /webjars/**
     - /*/api-docs
-    # druid 鐩戞帶閰嶇疆
-    - /druid/**
+    - /*/api-docs/**
     # actuator 鐩戞帶閰嶇疆
     - /actuator
     - /actuator/**
@@ -159,7 +153,7 @@
     mapUnderscoreToCamelCase: true
     # MyBatis 鑷姩鏄犲皠绛栫暐
     # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
-    autoMappingBehavior: PARTIAL
+    autoMappingBehavior: FULL
     # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
     # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
     autoMappingUnknownColumnBehavior: NONE
@@ -190,46 +184,38 @@
 swagger:
   # 鏄惁寮�鍚痵wagger
   enabled: true
-  # 璇锋眰鍓嶇紑
-  pathMapping: /dev-api
-  # 鏍囬
-  title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
-  # 鎻忚堪
-  description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
-  # 鐗堟湰
-  version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
-  # 浣滆�呬俊鎭�
-  contact:
-    name: Lion Li
-    email: crazylionli@163.com
-    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
-  groups:
-    - name: 1.婕旂ず妗堜緥
-      basePackage: com.ruoyi.demo
-    - name: 2.绯荤粺妯″潡
-      basePackage: com.ruoyi.web
-    - name: 3.浠ｇ爜鐢熸垚妯″潡
-      basePackage: com.ruoyi.generator
+  info:
+    # 鏍囬
+    title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+    # 鎻忚堪
+    description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+    # 鐗堟湰
+    version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
+    # 浣滆�呬俊鎭�
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  components:
+    # 閴存潈鏂瑰紡閰嶇疆
+    security-schemes:
+      apiKey:
+        type: APIKEY
+        in: HEADER
+        name: ${sa-token.token-name}
 
-knife4j:
-  # 鏄惁寮�鍚疜nife4j澧炲己妯″紡
-  enable: true
-  # 鏄惁寮�鍚敓浜х幆澧冧繚鎶ょ瓥鐣�
-  production: @knife4j.production@
-  basic:
-    enable: true
-    username: ruoyi
-    password: 123456
-  # 鍓嶇Ui鐨勪釜鎬у寲閰嶇疆灞炴��
-  setting:
-    # 榛樿璇█
-    language: zh-CN
-    # 鏄惁鏄剧ずFooter
-    enableFooter: false
-    # 鏄惁寮�鍚姩鎬佸弬鏁拌皟璇曞姛鑳�
-    enableDynamicParameter: true
-    # 鏄惁鍦ㄦ瘡涓狣ebug璋冭瘯鏍忓悗鏄剧ず鍒锋柊鍙橀噺鎸夐挳
-    enableReloadCacheParameter: true
+springdoc:
+  swagger-ui:
+    # 鎸佷箙鍖栬璇佹暟鎹�
+    persistAuthorization: true
+  #杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
+  group-configs:
+    - group: 1.婕旂ず妯″潡
+      packages-to-scan: com.ruoyi.demo
+    - group: 2.绯荤粺妯″潡
+      packages-to-scan: com.ruoyi.web
+    - group: 3.浠ｇ爜鐢熸垚妯″潡
+      packages-to-scan: com.ruoyi.generator
 
 # 闃叉XSS鏀诲嚮
 xss:
@@ -249,26 +235,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 鐩戞帶绔偣鐨勯厤缃」
@@ -276,9 +247,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