From 9a26a3c4e81dad23f73a0481916d3049700c6592 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 21:14:48 +0800
Subject: [PATCH] !22 同步 master Merge pull request !22 from 疯狂的狮子li/master
---
ruoyi-admin/src/main/resources/application.yml | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 35919fa..4ed20c8 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -12,8 +12,16 @@
profile: ${user.dir}/ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
+
+captcha:
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
captchaType: math
+ # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
+ captchaCategory: circle
+ # 鏁板瓧楠岃瘉鐮佷綅鏁�
+ captchaNumberLength: 1
+ # 瀛楃楠岃瘉鐮侀暱搴�
+ captchaCharLength: 4
# 寮�鍙戠幆澧冮厤缃�
server:
@@ -49,6 +57,7 @@
level:
com.ruoyi: @logging.level@
org.springframework: warn
+ config: classpath:logback.xml
# Spring閰嶇疆
spring:
@@ -70,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:
@@ -153,7 +189,7 @@
# 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
logicDeleteField: null
# 閫昏緫宸插垹闄ゅ��
- logicDeleteValue: 1
+ logicDeleteValue: 2
# 閫昏緫鏈垹闄ゅ��
logicNotDeleteValue: 0
# 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
@@ -199,4 +235,6 @@
response:
enabled: true
okhttp:
+ enabled: true
+ hystrix:
enabled: true
\ No newline at end of file
--
Gitblit v1.9.3