From 28fa991fc279d55dfc1329bbef1ffb14ab7b4338 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 七月 2021 10:43:33 +0800
Subject: [PATCH] update 修复 thread-pool: enabled 配置不生效问题
---
ruoyi-admin/src/main/resources/application.yml | 313 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 252 insertions(+), 61 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ed57412..4a52958 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,17 +1,27 @@
# 椤圭洰鐩稿叧閰嶇疆
ruoyi:
# 鍚嶇О
- name: RuoYi
+ name: RuoYi-Vue-Plus
# 鐗堟湰
- version: 3.0.0
+ version: ${ruoyi-vue-plus.version}
# 鐗堟潈骞翠唤
- copyrightYear: 2019
+ copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ # 鏂囦欢璺緞
+ profile: ./ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
+ addressEnabled: true
+
+captcha:
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ type: math
+ # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
+ category: circle
+ # 鏁板瓧楠岃瘉鐮佷綅鏁�
+ numberLength: 1
+ # 瀛楃楠岃瘉鐮侀暱搴�
+ charLength: 4
# 寮�鍙戠幆澧冮厤缃�
server:
@@ -20,93 +30,175 @@
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
+ # undertow 閰嶇疆
undertow:
- # 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
- io-threads: 8
- # 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
- worker-threads: 256
+ # HTTP post鍐呭鐨勬渶澶уぇ灏忋�傚綋鍊间负-1鏃讹紝榛樿鍊间负澶у皬鏄棤闄愮殑
+ max-http-post-size: -1
# 浠ヤ笅鐨勯厤缃細褰卞搷buffer,杩欎簺buffer浼氱敤浜庢湇鍔″櫒杩炴帴鐨処O鎿嶄綔,鏈夌偣绫讳技netty鐨勬睜鍖栧唴瀛樼鐞�
# 姣忓潡buffer鐨勭┖闂村ぇ灏�,瓒婂皬鐨勭┖闂磋鍒╃敤瓒婂厖鍒�
buffer-size: 512
# 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
direct-buffers: true
-
+ threads:
+ # 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
+ 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: debug
+ com.ruoyi: @logging.level@
org.springframework: warn
+ config: classpath:logback.xml
# Spring閰嶇疆
spring:
+ application:
+ name: ${ruoyi.name}
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
- profiles:
- active: dev
+ profiles:
+ active: @profiles.active@
# 鏂囦欢涓婁紶
servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 10MB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 20MB
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 10MB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 20MB
# 鏈嶅姟妯″潡
devtools:
restart:
# 鐑儴缃插紑鍏�
enabled: true
+ # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
+ thymeleaf:
+ # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
+ template-resolver-order: 1
+ jackson:
+ # 鏃ユ湡鏍煎紡鍖�
+ date-format: yyyy-MM-dd HH:mm:ss
+ serialization:
+ # 鏍煎紡鍖栬緭鍑�
+ indent_output: false
+ # 蹇界暐鏃犳硶杞崲鐨勫璞�
+ fail_on_empty_beans: false
+ deserialization:
+ # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
+ fail_on_unknown_properties: false
# token閰嶇疆
token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: abcdefghijklmnopqrstuvwxyz
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 30
-# MyBatis閰嶇疆
+# MyBatisPlus閰嶇疆
+# https://baomidou.com/config/
mybatis-plus:
- mapper-locations: classpath*:mapper/**/*Mapper.xml
- #瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
+ # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+ # 渚嬪 com.**.**.mapper
+ mapperPackage: com.ruoyi.**.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:
- map-underscore-to-camel-case: true
- cache-enabled: true
+ # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈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: false
+ # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
+ # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
- banner: false
- #鍒锋柊mapper 璋冭瘯绁炲櫒
- refresh: true
- db-config:
- #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
- id-type: auto
- #瀛楁绛栫暐 0:"蹇界暐鍒ゆ柇",1:"闈� NULL 鍒ゆ柇"),2:"闈炵┖鍒ゆ柇"
- field-strategy: not_empty
- #椹煎嘲涓嬪垝绾胯浆鎹�
- db-column-underline: true
- #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
- #capital-mode: true
- #搴忓垪鎺ュ彛瀹炵幇绫婚厤缃�
- #key-generator: com.baomidou.springboot.xxx
- #閫昏緫鍒犻櫎閰嶇疆
- logic-delete-value: 1
- logic-not-delete-value: 0
- #鏁版嵁搴撶被鍨�
- db-type: mysql
- #鑷畾涔塖QL娉ㄥ叆鍣�
- #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
- #鑷畾涔夊～鍏呯瓥鐣ユ帴鍙ｅ疄鐜�
- #meta-object-handler: com.baomidou.springboot.xxx
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- reasonable: true
- supportMethodsArguments: true
- params: count=countSql
+ # 鏄惁鎵撳嵃 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
# Swagger閰嶇疆
swagger:
@@ -114,12 +206,111 @@
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
# 闃叉XSS鏀诲嚮
-xss:
+xss:
# 杩囨护寮�鍏�
enabled: true
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
excludes: /system/notice/*
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 鍏ㄥ眬绾跨▼姹犵浉鍏抽厤缃�
+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 姣
+ 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 = ?
--
Gitblit v1.9.3