From d8803113a2a7824d24a9949a7561e9b67fd4bf16 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 十二月 2025 09:03:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
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 9170119..d217081 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
@@ -18,8 +18,10 @@
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
+import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TAppUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -55,6 +57,8 @@
private ISysConfigService configService;
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private TAppUserService tAppUserService;
/**
* 登录验证
@@ -124,7 +128,7 @@
* @param password 密码
* @return 结果
*/
- public LoginUserApplet loginCodeApplet(String account, String password)
+ public LoginUserApplet loginPwdApplet(String account, String password)
{
// 登录前置校验
if (StringUtils.isEmpty(account)){
@@ -172,11 +176,45 @@
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(account, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUserApplet loginUser = (LoginUserApplet) authentication.getPrincipal();
- recordAppLoginInfo(loginUser.getUserId());
+ recordAppLoginInfo(loginUser.getUserId().toString());
// 生成token
return loginUser;
}
-
+ /**
+ * 登录验证
+ *
+ * @param username 用户名
+ * @param code 验证码
+ * @return 结果
+ */
+ public LoginUserApplet loginCodeApplet(String username, String code)
+ {
+ // 登录前置校验
+ if (StringUtils.isEmpty(username)){
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
+ throw new UserNotExistsException();
+ }
+ // 用户验证
+ TAppUser user = tAppUserService.getOne(Wrappers.<TAppUser>lambdaQuery().eq(TAppUser::getPhone,username));
+ if (StringUtils.isNull(user)){
+ log.info("登录用户：{} 不存在.", username);
+ throw new ServiceException(MessageUtils.message("user.not.exists"));
+ } else if (user.getStatus().equals(3)) {
+ log.info("登录用户：{} 已被删除.", username);
+ throw new ServiceException(MessageUtils.message("user.password.delete"));
+ }
+ // 校验验证码
+ Object cacheObject = redisCache.getCacheObject(user.getPhone());
+ if(!code.equals(String.valueOf(cacheObject))){
+ log.info("登录用户：{} 短信验证码错误{}", username,code);
+ throw new ServiceException("短信验证码错误");
+ }
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+ LoginUserApplet loginUser = new LoginUserApplet(user.getId(), null, null, null);
+ recordAppLoginInfo(loginUser.getUserId().toString());
+ // 生成token
+ return loginUser;
+ }
/**
* 登录验证
*
--
Gitblit v1.7.1