From 97873a7b2b7bc2ee2d0f3cdb2c2454ff9156dab9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 四月 2021 17:43:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-admin/src/main/resources/application.yml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 35919fa..3bc738d 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:
@@ -153,7 +161,7 @@
       # 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
       logicDeleteField: null
       # 閫昏緫宸插垹闄ゅ��
-      logicDeleteValue: 1
+      logicDeleteValue: 2
       # 閫昏緫鏈垹闄ゅ��
       logicNotDeleteValue: 0
       # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
@@ -199,4 +207,6 @@
     response:
       enabled: true
   okhttp:
+    enabled: true
+  hystrix:
     enabled: true
\ No newline at end of file

--
Gitblit v1.9.3