lbqms.git - Gitblit

			@@ -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);

	ruoyi-admin/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -14,8 +14,6 @@
			addressEnabled: true

			captcha:
			# 验证码开关
			enabled: true
			# 验证码类型 math 数组计算 char 字符验证
			type: math
			# line 线段干扰 circle 圆圈干扰 shear 扭曲干扰

			@@ -15,11 +15,6 @@
			public class CaptchaProperties {

			/**
			* 验证码开关
			*/
			private Boolean enabled;

			/**
			* 验证码类型
			*/
			private String type;