From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 29f2616..1f49d12 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
@@ -13,7 +13,9 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.domain.SeBei;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.ManagementClient;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -40,13 +42,16 @@
@Autowired
private RedisService redisService;
+ @Autowired
+ private ManagementClient managementClient;
+
/**
* 登录
*/
- public LoginUser login(String username, String password)
+ public LoginUser login(String username, String password,String seBei)
{
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password))
@@ -101,6 +106,19 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
+// if (user.getUserType().equals("02")){
+// throw new ServiceException("登录失败，登录账号权限不足");
+// }
+
+ if (org.springframework.util.StringUtils.hasLength(seBei) && user.getUserType().equals("03")){
+ SeBei se=new SeBei();
+ se.setUserId(user.getUserId());
+ se.setSebei(seBei);
+ Integer getequipmente = managementClient.getequipmente(se).getData();
+ if (getequipmente==1){
+ throw new ServiceException("登录失败，登录账号与当前设备不匹配");
+ }
+ }
passwordService.validate(user, password);
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
return userInfo;
--
Gitblit v1.7.1