From 71325b540a2063a32b902e5d3aa0a3df2260f715 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 10:00:14 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-admin/src/main/resources/application.yml | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f451ded..963614d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,17 +3,25 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.2.0
+ version: 3.4.0
# 鐗堟潈骞翠唤
- copyrightYear: 2020
+ copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
profile: ${user.dir}/ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
+
+captcha:
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
captchaType: math
+ # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
+ captchaCategory: circle
+ # 鏁板瓧楠岃瘉鐮佷綅鏁�
+ captchaNumberLength: 1
+ # 瀛楃楠岃瘉鐮侀暱搴�
+ captchaCharLength: 4
# 寮�鍙戠幆澧冮厤缃�
server:
@@ -22,21 +30,32 @@
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
+ # undertow 閰嶇疆
undertow:
+ # HTTP post鍐呭鐨勬渶澶уぇ灏忋�傚綋鍊间负-1鏃讹紝榛樿鍊间负澶у皬鏄棤闄愮殑
+ max-http-post-size: -1
+ # 浠ヤ笅鐨勯厤缃細褰卞搷buffer,杩欎簺buffer浼氱敤浜庢湇鍔″櫒杩炴帴鐨処O鎿嶄綔,鏈夌偣绫讳技netty鐨勬睜鍖栧唴瀛樼鐞�
+ # 姣忓潡buffer鐨勭┖闂村ぇ灏�,瓒婂皬鐨勭┖闂磋鍒╃敤瓒婂厖鍒�
+ buffer-size: 512
# 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
io-threads: 8
# 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
worker-threads: 256
- # 浠ヤ笅鐨勯厤缃細褰卞搷buffer,杩欎簺buffer浼氱敤浜庢湇鍔″櫒杩炴帴鐨処O鎿嶄綔,鏈夌偣绫讳技netty鐨勬睜鍖栧唴瀛樼鐞�
- # 姣忓潡buffer鐨勭┖闂村ぇ灏�,瓒婂皬鐨勭┖闂磋鍒╃敤瓒婂厖鍒�
- buffer-size: 512
# 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
direct-buffers: true
+# # 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
# Spring閰嶇疆
@@ -46,7 +65,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: dev
+ active: @profiles.active@
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -68,12 +87,12 @@
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 30
-
+
# MyBatis閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
# 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
- mapper-locations: classpath*:mapper/**/*Mapper.xml
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
typeAliasesPackage: com.ruoyi.**.domain
# 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
@@ -142,7 +161,7 @@
# 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
logicDeleteField: null
# 閫昏緫宸插垹闄ゅ��
- logicDeleteValue: 1
+ logicDeleteValue: 2
# 閫昏緫鏈垹闄ゅ��
logicNotDeleteValue: 0
# 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
@@ -179,3 +198,13 @@
excludes: /system/notice/*
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+
+feign:
+ # 寮�鍚帇缂�
+ compression:
+ request:
+ enabled: true
+ response:
+ enabled: true
+ okhttp:
+ enabled: true
\ No newline at end of file
--
Gitblit v1.9.3