From 4cefcf6ada94919053e66d1756af33fff0dc1c4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 十二月 2023 10:34:02 +0800
Subject: [PATCH] update easyexcel 3.3.2 => 3.3.3 update springboot-admin 3.1.7 => 3.1.8 update aws-java-sdk-s3 1.12.540 => 1.12.600

---
 ruoyi-admin/src/main/resources/application.yml |  376 +++++++++++++++++++++--------------------------------
 1 files changed, 147 insertions(+), 229 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 1d3415e..0ed7ccb 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,23 +3,17 @@
   # 鍚嶇О
   name: RuoYi-Vue-Plus
   # 鐗堟湰
-  version: ${ruoyi-vue-plus.version}
+  version: ${revision}
   # 鐗堟潈骞翠唤
-  copyrightYear: 2021
-  # 瀹炰緥婕旂ず寮�鍏�
-  demoEnabled: true
-  # 鏂囦欢璺緞
-  profile: ./ruoyi/uploadPath
-  # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: true
+  copyrightYear: 2023
 
 captcha:
-  # 楠岃瘉鐮佸紑鍏�
-  enabled: true
+  enable: true
+  # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
-  type: math
+  type: MATH
   # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
-  category: circle
+  category: CIRCLE
   # 鏁板瓧楠岃瘉鐮佷綅鏁�
   numberLength: 1
   # 瀛楃楠岃瘉鐮侀暱搴�
@@ -46,24 +40,27 @@
       io: 8
       # 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
       worker: 256
-#  # tomcat 閰嶇疆
-#  tomcat:
-#    # tomcat鐨刄RI缂栫爜
-#    uri-encoding: UTF-8
-#    # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
-#    max-threads: 500
-#    # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�25
-#    min-spare-threads: 30
 
 # 鏃ュ織閰嶇疆
 logging:
   level:
-    com.ruoyi: @logging.level@
+    org.dromara: @logging.level@
     org.springframework: warn
-  config: classpath:logback.xml
+    tech.powerjob.worker.background: warn
+  config: classpath:logback-plus.xml
+
+# 鐢ㄦ埛閰嶇疆
+user:
+  password:
+    # 瀵嗙爜鏈�澶ч敊璇鏁�
+    maxRetryCount: 5
+    # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+    lockTime: 10
 
 # Spring閰嶇疆
 spring:
+  application:
+    name: ${ruoyi.name}
   # 璧勬簮淇℃伅
   messages:
     # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
@@ -77,15 +74,9 @@
       max-file-size: 10MB
       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
       max-request-size: 20MB
-  # 鏈嶅姟妯″潡
-  devtools:
-    restart:
-      # 鐑儴缃插紑鍏�
-      enabled: true
-  # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
-  thymeleaf:
-    # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
-    template-resolver-order: 1
+  mvc:
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
   jackson:
     # 鏃ユ湡鏍煎紡鍖�
     date-format: yyyy-MM-dd HH:mm:ss
@@ -98,132 +89,138 @@
       # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
       fail_on_unknown_properties: false
 
-# token閰嶇疆
-token:
-  # 浠ょ墝鑷畾涔夋爣璇�
-  header: Authorization
-  # 浠ょ墝瀵嗛挜
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-  expireTime: 30
+# Sa-Token閰嶇疆
+sa-token:
+  # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
+  token-name: Authorization
+  # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
+  is-concurrent: true
+  # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
+  is-share: false
+  # jwt绉橀挜
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+
+# security閰嶇疆
+security:
+  # 鎺掗櫎璺緞
+  excludes:
+    # 闈欐�佽祫婧�
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
+    # 鍏叡璺緞
+    - /favicon.ico
+    - /error
+    # swagger 鏂囨。閰嶇疆
+    - /*/api-docs
+    - /*/api-docs/**
+    # 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
+    - sys_client
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
 mybatis-plus:
   # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
   # 渚嬪 com.**.**.mapper
-  mapperPackage: com.ruoyi.**.mapper
+  mapperPackage: org.dromara.**.mapper
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
-  typeAliasesPackage: com.ruoyi.**.domain
-  # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
-  #typeAliasesSuperType: Class<?>
-  # 濡傛灉閰嶇疆浜嗚灞炴�э紝SqlSessionFactoryBean 浼氭妸璇ュ寘涓嬮潰鐨勭被娉ㄥ唽涓哄搴旂殑 TypeHandler
-  #typeHandlersPackage: null
-  # 濡傛灉閰嶇疆浜嗚灞炴�э紝浼氬皢璺緞涓嬬殑鏋氫妇绫昏繘琛屾敞鍏ワ紝璁╁疄浣撶被瀛楁鑳藉绠�鍗曞揩鎹风殑浣跨敤鏋氫妇灞炴��
-  #typeEnumsPackage: null
-  # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
-  checkConfigLocation: false
-  # 閫氳繃璇ュ睘鎬у彲鎸囧畾 MyBatis 鐨勬墽琛屽櫒锛孧yBatis 鐨勬墽琛屽櫒鎬诲叡鏈変笁绉嶏細
-  # SIMPLE锛氳鎵ц鍣ㄧ被鍨嬩笉鍋氱壒娈婄殑浜嬫儏锛屼负姣忎釜璇彞鐨勬墽琛屽垱寤轰竴涓柊鐨勯澶勭悊璇彞锛圥reparedStatement锛�
-  # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
-  # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
-  executorType: SIMPLE
-  # 鎸囧畾澶栭儴鍖� MyBatis Properties 閰嶇疆锛岄�氳繃璇ラ厤缃彲浠ユ娊绂婚厤缃紝瀹炵幇涓嶅悓鐜鐨勯厤缃儴缃�
-  configurationProperties: null
-  configuration:
-    # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
-    # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
-    mapUnderscoreToCamelCase: true
-    # 榛樿鏋氫妇澶勭悊绫�,濡傛灉閰嶇疆浜嗚灞炴��,鏋氫妇灏嗙粺涓�浣跨敤鎸囧畾澶勭悊鍣ㄨ繘琛屽鐞�
-    # org.apache.ibatis.type.EnumTypeHandler : 瀛樺偍鏋氫妇鐨勫悕绉�
-    # org.apache.ibatis.type.EnumOrdinalTypeHandler : 瀛樺偍鏋氫妇鐨勭储寮�
-    # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 鏋氫妇绫婚渶瑕佸疄鐜癐Enum鎺ュ彛鎴栧瓧娈垫爣璁癅EnumValue娉ㄨВ.
-    defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
-    # 褰撹缃负 true 鐨勬椂鍊欙紝鎳掑姞杞界殑瀵硅薄鍙兘琚换浣曟噿灞炴�у叏閮ㄥ姞杞斤紝鍚﹀垯锛屾瘡涓睘鎬ч兘鎸夐渶鍔犺浇銆傞渶瑕佸拰 lazyLoadingEnabled 涓�璧蜂娇鐢ㄣ��
-    aggressiveLazyLoading: true
-    # MyBatis 鑷姩鏄犲皠绛栫暐
-    # NONE锛氫笉鍚敤鑷姩鏄犲皠
-    # PARTIAL锛氬彧瀵归潪宓屽鐨� resultMap 杩涜鑷姩鏄犲皠
-    # FULL锛氬鎵�鏈夌殑 resultMap 閮借繘琛岃嚜鍔ㄦ槧灏�
-    autoMappingBehavior: PARTIAL
-    # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
-    # NONE锛氫笉鍋氫换浣曞鐞� (榛樿鍊�)
-    # WARNING锛氫互鏃ュ織鐨勫舰寮忔墦鍗扮浉鍏宠鍛婁俊鎭�
-    # FAILING锛氬綋浣滄槧灏勫け璐ュ鐞嗭紝骞舵姏鍑哄紓甯稿拰璇︾粏淇℃伅
-    autoMappingUnknownColumnBehavior: NONE
-    # Mybatis涓�绾х紦瀛橈紝榛樿涓� SESSION
-    # SESSION session绾у埆缂撳瓨锛屽悓涓�涓猻ession鐩稿悓鏌ヨ璇彞涓嶄細鍐嶆鏌ヨ鏁版嵁搴�
-    # STATEMENT 鍏抽棴涓�绾х紦瀛�
-    localCacheScope: SESSION
-    # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
-    cacheEnabled: true
-    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
-    # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
+  typeAliasesPackage: org.dromara.**.domain
   global-config:
-    # 鏄惁鎵撳嵃 Logo banner
-    banner: true
-    # 鏄惁鍒濆鍖� SqlRunner
-    enableSqlRunner: false
     dbConfig:
       # 涓婚敭绫诲瀷
-      # AUTO 鏁版嵁搴揑D鑷
-      # NONE 绌�
-      # INPUT 鐢ㄦ埛杈撳叆ID
-      # ASSIGN_ID 鍏ㄥ眬鍞竴ID
-      # ASSIGN_UUID 鍏ㄥ眬鍞竴ID UUID
-      idType: AUTO
-      # 琛ㄥ悕鍓嶇紑
-      tablePrefix: null
-      # 瀛楁 format,渚�: %s,(瀵逛富閿棤鏁�)
-      columnFormat: null
-      # 琛ㄥ悕鏄惁浣跨敤椹煎嘲杞笅鍒掔嚎鍛藉悕,鍙琛ㄥ悕鐢熸晥
-      tableUnderline: true
-      # 澶у啓鍛藉悕,瀵硅〃鍚嶅拰瀛楁鍚嶅潎鐢熸晥
-      capitalMode: false
-      # 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
-      logicDeleteField: null
-      # 閫昏緫宸插垹闄ゅ��
-      logicDeleteValue: 2
-      # 閫昏緫鏈垹闄ゅ��
-      logicNotDeleteValue: 0
-      # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
-      # IGNORED 蹇界暐鍒ゆ柇
-      # NOT_NULL 闈濶ULL鍒ゆ柇
-      # NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
-      # DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
-      # NEVER 涓嶅姞鍏� SQL
-      insertStrategy: NOT_EMPTY
-      # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
-      updateStrategy: NOT_EMPTY
-      # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
-      selectStrategy: NOT_EMPTY
+      # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
+      # 濡傞渶鏀逛负鑷 闇�瑕佸皢鏁版嵁搴撹〃鍏ㄩ儴璁剧疆涓鸿嚜澧�
+      idType: ASSIGN_ID
 
-# Swagger閰嶇疆
-swagger:
-  # 鏄惁寮�鍚痵wagger
+# 鏁版嵁鍔犲瘑
+mybatis-encryptor:
+  # 鏄惁寮�鍚姞瀵�
+  enable: false
+  # 榛樿鍔犲瘑绠楁硶
+  algorithm: BASE64
+  # 缂栫爜鏂瑰紡 BASE64/HEX銆傞粯璁ASE64
+  encode: BASE64
+  # 瀹夊叏绉橀挜 瀵圭О绠楁硶鐨勭閽� 濡傦細AES锛孲M4
+  password:
+  # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA
+  publicKey:
+  privateKey:
+
+# api鎺ュ彛鍔犲瘑
+api-decrypt:
+  # 鏄惁寮�鍚叏灞�鎺ュ彛鍔犲瘑
   enabled: true
-  # 璇锋眰鍓嶇紑
-  pathMapping: /dev-api
-  # 鏍囬
-  title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
-  # 鎻忚堪
-  description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
-  # 鐗堟湰
-  version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
-  # 浣滆�呬俊鎭�
-  contact:
-    name: Lion Li
-    email: crazylionli@163.com
-    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  # AES 鍔犲瘑澶存爣璇�
+  headerFlag: encrypt-key
+  # 鍝嶅簲鍔犲瘑鍏挜 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA 浣跨敤鑰呰鑷鏇存崲
+  # 瀵瑰簲鍓嶇瑙ｅ瘑绉侀挜 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
+  publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ==
+  # 璇锋眰瑙ｅ瘑绉侀挜 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA 浣跨敤鑰呰鑷鏇存崲
+  # 瀵瑰簲鍓嶇鍔犲瘑鍏挜 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
+  privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
+
+springdoc:
+  api-docs:
+    # 鏄惁寮�鍚帴鍙ｆ枃妗�
+    enabled: true
+#  swagger-ui:
+#    # 鎸佷箙鍖栬璇佹暟鎹�
+#    persistAuthorization: true
+  info:
+    # 鏍囬
+    title: '鏍囬锛�${ruoyi.name}澶氱鎴风鐞嗙郴缁焈鎺ュ彛鏂囨。'
+    # 鎻忚堪
+    description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+    # 鐗堟湰
+    version: '鐗堟湰鍙�: ${ruoyi.version}'
+    # 浣滆�呬俊鎭�
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/dromara/RuoYi-Vue-Plus
+  components:
+    # 閴存潈鏂瑰紡閰嶇疆
+    security-schemes:
+      apiKey:
+        type: APIKEY
+        in: HEADER
+        name: ${sa-token.token-name}
+  #杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
+  group-configs:
+    - group: 1.婕旂ず妯″潡
+      packages-to-scan: org.dromara.demo
+    - group: 2.閫氱敤妯″潡
+      packages-to-scan: org.dromara.web
+    - group: 3.绯荤粺妯″潡
+      packages-to-scan: org.dromara.system
+    - group: 4.浠ｇ爜鐢熸垚妯″潡
+      packages-to-scan: org.dromara.generator
 
 # 闃叉XSS鏀诲嚮
 xss:
   # 杩囨护寮�鍏�
   enabled: true
   # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
-  excludes: /system/notice/*
+  excludes: /system/notice
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
 
@@ -231,114 +228,35 @@
 thread-pool:
   # 鏄惁寮�鍚嚎绋嬫睜
   enabled: false
-  # 鏍稿績绾跨▼姹犲ぇ灏�
-  corePoolSize: 8
-  # 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
-  maxPoolSize: 16
   # 闃熷垪鏈�澶ч暱搴�
   queueCapacity: 128
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
-  # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
-  # CallerRunsPolicy 绛夊緟
-  # DiscardOldestPolicy 鏀惧純鏈�鏃х殑
-  # DiscardPolicy 涓㈠純
-  # AbortPolicy 涓
-  rejectedExecutionHandler: CallerRunsPolicy
-
-# feign 鐩稿叧閰嶇疆
-feign:
-  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
-  # 渚嬪 com.**.**.feign
-  package: com.ruoyi.**.feign
-  # 寮�鍚帇缂�
-  compression:
-    request:
-      enabled: true
-    response:
-      enabled: true
-  okhttp:
-    enabled: true
-  circuitbreaker:
-    enabled: true
-
---- # 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
 
---- # 瀹氭椂浠诲姟閰嶇疆
-spring:
-  quartz:
-    scheduler-name: RuoyiScheduler
-    startup-delay: 1s
-    overwrite-existing-jobs: true
-    auto-startup: true
-    job-store-type: jdbc
-    properties:
-      org:
-        quartz:
-          # Scheduler 鐩稿叧閰嶇疆
-          scheduler:
-            instanceName: RuoyiScheduler
-            instanceId: AUTO
-          # 绾跨▼姹犵浉鍏抽厤缃�
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 20
-            threadPriority: 5
-          # JobStore 闆嗙兢閰嶇疆
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            isClustered: true
-            clusterCheckinInterval: 15000
-            txIsolationLevelSerializable: true
-            misfireThreshold: 60000
-            tablePrefix: QRTZ_
-            # sqlserver 鍚敤
-            # selectWithLockSQL: SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
-
---- # 鐩戞帶閰嶇疆
-spring:
-  application:
-    name: ruoyi-vue-plus
-  boot:
-    admin:
-      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
-      client:
-        # 璁剧疆 Spring Boot Admin Server 鍦板潃
-        url: http://localhost:${server.port}${spring.boot.admin.context-path}
-        instance:
-          prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
-      # Spring Boot Admin Server 鏈嶅姟绔殑鐩稿叧閰嶇疆
-      context-path: /admin # 閰嶇疆 Spring
-
-# Actuator 鐩戞帶绔偣鐨勯厤缃」
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
 management:
   endpoints:
     web:
-      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
-      base-path: /actuator
       exposure:
-        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
         include: '*'
   endpoint:
+    health:
+      show-details: ALWAYS
     logfile:
       external-file: ./logs/sys-console.log
+
+--- # websocket
+websocket:
+  # 濡傛灉鍏抽棴 闇�瑕佸拰鍓嶇寮�鍏充竴璧峰叧闂�
+  enabled: true
+  # 璺緞
+  path: /resource/websocket
+  # 璁剧疆璁块棶婧愬湴鍧�
+  allowedOrigins: '*'

--
Gitblit v1.9.3