From dcd95d013ff52aa630505fc7dec2ca7412d59ef3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 六月 2021 12:43:23 +0800
Subject: [PATCH] update springboot 2.3.11 => 2.4.7 update springboot-admin 2.3.1 => 2.4.1 update feign 2.2.6 => 3.0.3 update hutool 5.7.1 => 5.7.2
---
ruoyi-admin/src/main/resources/application.yml | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a142ec6..8de6569 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,25 +8,27 @@
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
- # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
- profile: ${user.dir}/ruoyi/uploadPath
+ # 鏂囦欢璺緞
+ profile: ./ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
+ addressEnabled: true
captcha:
+ # 楠岃瘉鐮佸紑鍏�
+ enabled: true
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
+ type: math
# line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
- captchaCategory: circle
+ category: circle
# 鏁板瓧楠岃瘉鐮佷綅鏁�
- captchaNumberLength: 1
+ numberLength: 1
# 瀛楃楠岃瘉鐮侀暱搴�
- captchaCharLength: 4
+ charLength: 4
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8081
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -84,6 +86,17 @@
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:
@@ -195,6 +208,11 @@
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:
@@ -206,7 +224,7 @@
urlPatterns: /system/*,/monitor/*,/tool/*
# 鍏ㄥ眬绾跨▼姹犵浉鍏抽厤缃�
-threadPoolConfig:
+thread-pool:
# 鏄惁寮�鍚嚎绋嬫睜
enabled: false
# 鏍稿績绾跨▼姹犲ぇ灏�
@@ -235,7 +253,7 @@
enabled: true
okhttp:
enabled: true
- hystrix:
+ circuitbreaker:
enabled: true
--- # 瀹氭椂浠诲姟閰嶇疆
@@ -281,8 +299,6 @@
url: http://localhost:${server.port}${spring.boot.admin.context-path}
instance:
prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
- # username: ruoyi
- # password: 123456
# Spring Boot Admin Server 鏈嶅姟绔殑鐩稿叧閰嶇疆
context-path: /admin # 閰嶇疆 Spring
@@ -297,4 +313,4 @@
include: '*'
endpoint:
logfile:
- external-file: ./logs/sys-console.log
\ No newline at end of file
+ external-file: ./logs/sys-console.log
--
Gitblit v1.9.3