From 71325b540a2063a32b902e5d3aa0a3df2260f715 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 10:00:14 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-admin/src/main/resources/application.yml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 57a9344..963614d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.3.0
+ version: 3.4.0
# 鐗堟潈骞翠唤
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
@@ -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:
@@ -153,7 +161,7 @@
# 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
logicDeleteField: null
# 閫昏緫宸插垹闄ゅ��
- logicDeleteValue: 1
+ logicDeleteValue: 2
# 閫昏緫鏈垹闄ゅ��
logicNotDeleteValue: 0
# 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
@@ -190,3 +198,13 @@
excludes: /system/notice/*
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+
+feign:
+ # 寮�鍚帇缂�
+ compression:
+ request:
+ enabled: true
+ response:
+ enabled: true
+ okhttp:
+ enabled: true
\ No newline at end of file
--
Gitblit v1.9.3