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 | 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 3ea04c7..8de6569 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# 鏂囦欢璺緞
profile: ./ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
+ addressEnabled: true
captcha:
# 楠岃瘉鐮佸紑鍏�
@@ -86,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:
@@ -242,7 +253,7 @@
enabled: true
okhttp:
enabled: true
- hystrix:
+ circuitbreaker:
enabled: true
--- # 瀹氭椂浠诲姟閰嶇疆
@@ -288,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
--
Gitblit v1.9.3