From aac6e0521a906aa1402f4a35f58c940e757c04cf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 13:28:52 +0800
Subject: [PATCH] 发布 4.1.0

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ae361f4..c692fc2 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -5,7 +5,7 @@
   # 鐗堟湰
   version: ${ruoyi-vue-plus.version}
   # 鐗堟潈骞翠唤
-  copyrightYear: 2021
+  copyrightYear: 2022
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
   # 鑾峰彇ip鍦板潃寮�鍏�
@@ -75,10 +75,10 @@
     restart:
       # 鐑儴缃插紑鍏�
       enabled: true
-  # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
-  thymeleaf:
-    # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
-    template-resolver-order: 1
+  mvc:
+    pathmatch:
+      # 閫傞厤 boot 2.6 璺敱涓� springfox 鍏煎
+      matching-strategy: ANT_PATH_MATCHER
   jackson:
     # 鏃ユ湡鏍煎紡鍖�
     date-format: yyyy-MM-dd HH:mm:ss
@@ -91,41 +91,55 @@
       # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
       fail_on_unknown_properties: false
 
-# token閰嶇疆
-token:
-  # 浠ょ墝鑷畾涔夋爣璇�
-  header: Authorization
-  # 浠ょ墝瀵嗛挜
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-  expireTime: 30
+# Sa-Token閰嶇疆
+sa-token:
+  # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
+  token-name: Authorization
+  # token鏈夋晥鏈� 璁句负涓�澶� (蹇呭畾杩囨湡) 鍗曚綅: 绉�
+  timeout: 86400
+  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
+  activity-timeout: 1800
+  # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
+  is-concurrent: true
+  # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆$櫥褰曟柊寤轰竴涓猼oken)
+  is-share: false
+  # 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
+  is-read-head: true
+  # 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
+  is-read-cookie: false
+  # token鍓嶇紑
+  token-prefix: "Bearer"
+  # jwt绉橀挜
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
+  is-log: true
 
 # security閰嶇疆
 security:
-  # 鐧诲嚭璺緞
-  logout-url: /logout
-  # 鍖垮悕璺緞
-  anonymous:
+  # 鎺掗櫎璺緞
+  excludes:
     - /login
+    - /smsLogin
+    - /xcxLogin
+    - /logout
     - /register
     - /captchaImage
+    # 闈欐�佽祫婧�
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
     # swagger 鏂囨。閰嶇疆
+    - /favicon.ico
     - /doc.html
     - /swagger-resources/**
     - /webjars/**
     - /*/api-docs
     # druid 鐩戞帶閰嶇疆
     - /druid/**
-  # 鐢ㄦ埛鏀捐
-  permit-all:
     # actuator 鐩戞帶閰嶇疆
     - /actuator
     - /actuator/**
-
-# 閲嶅鎻愪氦
-repeat-submit:
-  # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
-  interval: 5000
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
@@ -139,25 +153,15 @@
   typeAliasesPackage: com.ruoyi.**.domain
   # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
   checkConfigLocation: false
-  # 閫氳繃璇ュ睘鎬у彲鎸囧畾 MyBatis 鐨勬墽琛屽櫒锛孧yBatis 鐨勬墽琛屽櫒鎬诲叡鏈変笁绉嶏細
-  # SIMPLE锛氭瘡涓鍙ュ垱寤烘柊鐨勯澶勭悊鍣� REUSE锛氫細澶嶇敤棰勫鐞嗗櫒 BATCH锛氭壒閲忔墽琛屾墍鏈夌殑鏇存柊
-  executorType: SIMPLE
   configuration:
     # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
     mapUnderscoreToCamelCase: true
-    # 褰撹缃负 true 鐨勬椂鍊欙紝鎳掑姞杞界殑瀵硅薄鍙兘琚换浣曟噿灞炴�у叏閮ㄥ姞杞斤紝鍚﹀垯锛屾瘡涓睘鎬ч兘鎸夐渶鍔犺浇銆傞渶瑕佸拰 lazyLoadingEnabled 涓�璧蜂娇鐢ㄣ��
-    aggressiveLazyLoading: true
     # MyBatis 鑷姩鏄犲皠绛栫暐
     # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
     autoMappingBehavior: PARTIAL
     # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
     # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
     autoMappingUnknownColumnBehavior: NONE
-    # Mybatis涓�绾х紦瀛橈紝榛樿涓� SESSION
-    # SESSION session绾у埆缂撳瓨 STATEMENT 鍏抽棴涓�绾х紦瀛�
-    localCacheScope: SESSION
-    # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
-    cacheEnabled: false
     # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� org.apache.ibatis.logging.stdout.StdOutImpl
     # 鍏抽棴鏃ュ織璁板綍 (鍙崟绾娇鐢� p6spy 鍒嗘瀽) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 榛樿鏃ュ織杈撳嚭 org.apache.ibatis.logging.slf4j.Slf4jImpl
@@ -165,16 +169,10 @@
   global-config:
     # 鏄惁鎵撳嵃 Logo banner
     banner: true
-    # 鏄惁鍒濆鍖� SqlRunner
-    enableSqlRunner: false
     dbConfig:
       # 涓婚敭绫诲瀷
       # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
-      idType: AUTO
-      # 琛ㄥ悕鏄惁浣跨敤椹煎嘲杞笅鍒掔嚎鍛藉悕,鍙琛ㄥ悕鐢熸晥
-      tableUnderline: true
-      # 澶у啓鍛藉悕,瀵硅〃鍚嶅拰瀛楁鍚嶅潎鐢熸晥
-      capitalMode: false
+      idType: ASSIGN_ID
       # 閫昏緫宸插垹闄ゅ��
       logicDeleteValue: 2
       # 閫昏緫鏈垹闄ゅ��
@@ -217,6 +215,10 @@
   enable: true
   # 鏄惁寮�鍚敓浜х幆澧冧繚鎶ょ瓥鐣�
   production: @knife4j.production@
+  basic:
+    enable: true
+    username: ruoyi
+    password: 123456
   # 鍓嶇Ui鐨勪釜鎬у寲閰嶇疆灞炴��
   setting:
     # 榛樿璇█
@@ -241,20 +243,10 @@
 thread-pool:
   # 鏄惁寮�鍚嚎绋嬫睜
   enabled: false
-  # 鏍稿績绾跨▼姹犲ぇ灏�
-  corePoolSize: 8
-  # 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
-  maxPoolSize: 16
   # 闃熷垪鏈�澶ч暱搴�
   queueCapacity: 128
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
-  # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
-  # CALLER_RUNS_POLICY 璋冪敤鏂规墽琛�
-  # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
-  # DISCARD_POLICY 涓㈠純
-  # ABORT_POLICY 涓
-  rejectedExecutionHandler: CALLER_RUNS_POLICY
 
 --- # redisson 缂撳瓨閰嶇疆
 redisson:
@@ -282,8 +274,6 @@
 management:
   endpoints:
     web:
-      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
-      base-path: /actuator
       exposure:
         # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
         # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲

--
Gitblit v1.9.3