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 |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4e0d2b7..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:
@@ -84,7 +92,7 @@
 # https://baomidou.com/config/
 mybatis-plus:
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   typeAliasesPackage: com.ruoyi.**.domain
   # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
@@ -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