From c23f48c5ec15476299edadd91fa18f908d710a4f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 08:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 840ba2b..2e9f4b3 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -16,14 +16,12 @@
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.model.LoginUser;
+import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
/**
* 登录校验方法
@@ -234,11 +232,17 @@
if (!verificationCodeCache.equals(verificationCode)) {
throw new ServiceException("验证码错误，请重新输入！");
}
+ // 校验密码，6位数数字
+ if (!password.matches("^\\d{6}$")) {
+ throw new ServiceException("密码必须为6位数字！");
+ }
R<LoginUser> userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
if (R.FAIL == userInfo.getCode()) {
throw new ServiceException(userInfo.getMsg());
}
remoteUserService.changePassword(username, SecurityUtils.encryptPassword(password),
SecurityConstants.INNER);
+ redisService.deleteObject(
+ CacheConstants.CHANGE_PASSWORD_CAPTCHA_CODE_KEY + username);
}
}
--
Gitblit v1.7.1