jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/SvgIcon/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
	ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
	ruoyi/src/main/resources/application.yml
This commit is contained in:
疯狂的狮子li
2020-03-19 09:10:03 +08:00
parent 2e6bb454f4 2cc14e5f56
commit b1afb78ca2
42 changed files with 3334 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi/src/main/resources/application.yml
View File

@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
version: 2.1.0
version: 2.2.0
# 版权年份
copyrightYear: 2019
# 实例演示开关
@ -27,8 +27,7 @@ server:
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
version: 2.2.0
# 日志配置
logging:
level: