From d50e7a3d178a7f05852207d4525b258c826117ac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 23:39:50 +0800
Subject: [PATCH] !30 同步dev分支 Merge pull request !30 from 疯狂的狮子li/dev
---
ruoyi-admin/src/main/resources/application.yml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 963614d..9a0def6 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -57,6 +57,7 @@
level:
com.ruoyi: @logging.level@
org.springframework: warn
+ config: classpath:logback.xml
# Spring閰嶇疆
spring:
@@ -78,6 +79,33 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
+ application:
+ name: ruoyi-vue-plus
+ boot:
+ admin:
+ # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
+ client:
+ # 璁剧疆 Spring Boot Admin Server 鍦板潃
+ 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
+
+# Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+ endpoints:
+ web:
+ # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
+ base-path: /actuator
+ exposure:
+ # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+ include: '*'
+ endpoint:
+ logfile:
+ external-file: ./logs/sys-console.log
# token閰嶇疆
token:
@@ -170,11 +198,11 @@
# NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
# DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
# NEVER 涓嶅姞鍏� SQL
- insertStrategy: NOT_NULL
+ insertStrategy: NOT_EMPTY
# 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
- updateStrategy: NOT_NULL
+ updateStrategy: NOT_EMPTY
# 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
- selectStrategy: NOT_NULL
+ selectStrategy: NOT_EMPTY
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
@@ -207,4 +235,6 @@
response:
enabled: true
okhttp:
+ enabled: true
+ hystrix:
enabled: true
\ No newline at end of file
--
Gitblit v1.9.3