From 52325307f49be5c8e4edc2b0d477c19a07742f5a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 一月 2021 15:08:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-admin/src/main/resources/application.yml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 394380b..4e0d2b7 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,9 +3,9 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.2.1
+ version: 3.3.0
# 鐗堟潈骞翠唤
- copyrightYear: 2020
+ copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
@@ -22,6 +22,7 @@
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
+ # undertow 閰嶇疆
undertow:
# HTTP post鍐呭鐨勬渶澶уぇ灏忋�傚綋鍊间负-1鏃讹紝榛樿鍊间负澶у皬鏄棤闄愮殑
max-http-post-size: -1
@@ -34,11 +35,19 @@
worker-threads: 256
# 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
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閰嶇疆
@@ -48,7 +57,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: dev
+ active: @profiles.active@
# 鏂囦欢涓婁紶
servlet:
multipart:
--
Gitblit v1.9.3