From 457e566525d57ce0904e00aab9298ab0693ad5a1 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 24 十一月 2023 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 71c9ca2..772971f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -30,13 +30,6 @@
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 30
# MyBatis閰嶇疆
-#mybatis:
-# # 鎼滅储鎸囧畾鍖呭埆鍚�
-# typeAliasesPackage: com.ruoyi.**.domain
-# # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
-# mapperLocations: classpath*:mapper/**/*Mapper.xml
-# # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
-# configLocation: classpath:mybatis/mybatis-config.xml
mybatis-plus:
type-Aliases-Package: com.ruoyi.**.domain
mapper-Locations: classpath*:mapper/**/*Mapper.xml
@@ -45,34 +38,29 @@
banner: off # 鍏抽棴mybatisplus鍚姩鍥炬爣
db-config: #涓婚敭涓嶇敤MyBatis plus鐨勯洩鑺辩畻娉�,鐢ㄦ暟鎹簱鐨勪富閿嚜澧�
id-type: uuid
-# configuration:
-# # 鏄惁寮�鍚嚜鍔ㄩ┘宄板懡鍚嶈鍒欐槧灏�:浠庢暟鎹簱鍒楀悕鍒癑ava灞炴�ч┘宄板懡鍚嶇殑绫讳技鏄犲皠
-# map-underscore-to-camel-case: true
-# # 濡傛灉鏌ヨ缁撴灉涓寘鍚┖鍊肩殑鍒楋紝鍒� MyBatis 鍦ㄦ槧灏勭殑鏃跺�欙紝涓嶄細鏄犲皠杩欎釜瀛楁
-# call-setters-on-nulls: true
-# # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
helperDialect: postgresql
supportMethodsArguments: true
params: count=countSql
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /
-knife4j:
- # knife4j澧炲己鍔熻兘
- enable: true
- #鏄惁涓虹敓浜фā寮� 椤圭洰閮ㄥ睘鏃朵负true 闃叉鎺ュ彛鏆撮湶
- production: false
- # 閰嶇疆鐢ㄦ埛瀵嗙爜
- basic:
- enable: true
- username: admin
- password: ardkj12345
+# forest閰嶇疆
+forest:
+ backend: okhttp3 # 鍚庣HTTP妗嗘灦锛堥粯璁や负 okhttp3锛�
+ max-connections: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堥粯璁や负 500锛�
+ max-route-connections: 500 # 姣忎釜璺敱鐨勬渶澶ц繛鎺ユ暟锛堥粯璁や负 500锛�
+ max-request-queue-size: 100 # [鑷獀1.5.22鐗堟湰璧峰彲鐢╙ 鏈�澶ц姹傜瓑寰呴槦鍒楀ぇ灏�
+ max-async-thread-size: 300 # [鑷獀1.5.21鐗堟湰璧峰彲鐢╙ 鏈�澶у紓姝ョ嚎绋嬫暟
+ max-async-queue-size: 16 # [鑷獀1.5.22鐗堟湰璧峰彲鐢╙ 鏈�澶у紓姝ョ嚎绋嬫睜闃熷垪澶у皬
+ timeout: 3000 # [宸蹭笉鎺ㄨ崘浣跨敤] 璇锋眰瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 3000锛�
+ connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 timeout锛�
+ read-timeout: 3000 # 鏁版嵁璇诲彇瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 timeout锛�
+ max-retry-count: 0 # 璇锋眰澶辫触鍚庨噸璇曟鏁帮紙榛樿涓� 0 娆′笉閲嶈瘯锛�
+ ssl-protocol: TLS # 鍗曞悜楠岃瘉鐨凥TTPS鐨勯粯璁LS鍗忚锛堥粯璁や负 TLS锛�
+ log-enabled: true # 鎵撳紑鎴栧叧闂棩蹇楋紙榛樿涓� true锛�
+ log-request: true # 鎵撳紑/鍏抽棴Forest璇锋眰鏃ュ織锛堥粯璁や负 true锛�
+ log-response-status: true # 鎵撳紑/鍏抽棴Forest鍝嶅簲鐘舵�佹棩蹇楋紙榛樿涓� true锛�
+ log-response-content: true # 鎵撳紑/鍏抽棴Forest鍝嶅簲鍐呭鏃ュ織锛堥粯璁や负 false锛�
+ async-mode: platform # [鑷獀1.5.27鐗堟湰璧峰彲鐢╙ 寮傛妯″紡锛堥粯璁や负 platform锛�
# 闃叉XSS鏀诲嚮
xss:
# 杩囨护寮�鍏�
@@ -107,6 +95,29 @@
enabled: false
thymeleaf:
cache: false
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: 127.0.0.1
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # 瀵嗙爜
+ password:
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+ # 婵�娲婚厤缃枃浠�
profiles:
active: dev-druid,dev
--
Gitblit v1.9.3