From a412b6b03a027472fee4fc12f487c3ff16faf0bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Tue, 13 Jul 2021 13:38:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=AA=8C=E8=AF=81=E7=A0=81=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=20=E8=BD=AC=E7=A7=BB=E5=88=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml       |  2 --
 .../config/properties/CaptchaProperties.java         |  5 -----
 .../ruoyi/framework/web/service/SysLoginService.java | 12 ++++--------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b88929dd..4a52958a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -14,8 +14,6 @@ ruoyi:
   addressEnabled: true
 
 captcha:
-  # 验证码开关
-  enabled: true
   # 验证码类型 math 数组计算 char 字符验证
   type: math
   # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
index 86ac7060..cf9ad8b0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
@@ -14,11 +14,6 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "captcha")
 public class CaptchaProperties {
 
-	/**
-	 * 验证码开关
-	 */
-	private Boolean enabled;
-
 	/**
 	 * 验证码类型
  	 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 47258ddd..239825f0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -11,7 +11,6 @@ import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.config.properties.CaptchaProperties;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,9 +40,6 @@ public class SysLoginService
     @Autowired
     private RedisCache redisCache;
 
-	@Autowired
-	private CaptchaProperties captchaProperties;
-
 	@Autowired
     private ISysUserService userService;
 
@@ -64,11 +60,12 @@ public class SysLoginService
      */
     public String login(String username, String password, String code, String uuid)
     {
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+		HttpServletRequest request = ServletUtils.getRequest();
+		boolean captchaOnOff = configService.selectCaptchaOnOff();
         // 验证码开关
         if (captchaOnOff)
         {
-            validateCapcha(username, code, uuid);
+            validateCapcha(username, code, uuid, request);
         }
         // 用户验证
         Authentication authentication = null;
@@ -106,8 +103,7 @@ public class SysLoginService
      * @param uuid 唯一标识
      * @return 结果
      */
-    public void validateCapcha(String username, String code, String uuid) {
-		HttpServletRequest request = ServletUtils.getRequest();
+    public void validateCapcha(String username, String code, String uuid, HttpServletRequest request) {
 		String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
 		String captcha = redisCache.getCacheObject(verifyKey);
 		redisCache.deleteObject(verifyKey);