From a412b6b03a027472fee4fc12f487c3ff16faf0bf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:38:53 +0800
Subject: [PATCH] update 验证码开关 转移到系统配置内
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 12 ++++--------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java | 5 -----
ruoyi-admin/src/main/resources/application.yml | 2 --
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 b88929d..4a52958 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -14,8 +14,6 @@
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 86ac706..cf9ad8b 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
@@ -15,11 +15,6 @@
public class CaptchaProperties {
/**
- * 楠岃瘉鐮佸紑鍏�
- */
- private Boolean enabled;
-
- /**
* 楠岃瘉鐮佺被鍨�
*/
private String type;
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 47258dd..239825f 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.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;
@@ -42,9 +41,6 @@
private RedisCache redisCache;
@Autowired
- private CaptchaProperties captchaProperties;
-
- @Autowired
private ISysUserService userService;
@Autowired
@@ -64,11 +60,12 @@
*/
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 @@
* @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);
--
Gitblit v1.9.3