From 19c823c2c8df4cceee0d827fb598e7f0d9b69154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 三月 2025 18:57:58 +0800
Subject: [PATCH] 修改809对接bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 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 13b6d0b..434da95 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
@@ -1,10 +1,5 @@
package com.ruoyi.auth.service;
-import com.ruoyi.other.api.domain.Shop;
-import com.ruoyi.other.api.feignClient.ShopClient;
-import com.ruoyi.system.api.RemoteUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants;
@@ -17,8 +12,10 @@
import com.ruoyi.common.core.utils.ip.IpUtils;
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.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -41,8 +38,7 @@
@Resource
private RedisService redisService;
- @Resource
- private ShopClient shopClient;
+
/**
* 登录
*/
@@ -95,32 +91,23 @@
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
throw new ServiceException("您所属门店已被冻结，请联系平台");
}
- if (user.getRoleType()==2){
- Shop data = shopClient.getShopById(user.getObjectId()).getData();
- if (data==null){
- throw new ServiceException("门店不存在");
- }else{
- if (data.getStatus()==2){
- throw new ServiceException("您所属门店已被冻结，请联系平台");
- }
- }
- }
passwordService.validate(user, password, request);
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
return userInfo;
}
+
public LoginUser loginShop(String username, String password, HttpServletRequest request) {
username = username.trim();
// 查询用户信息
R<LoginUser> userResult = remoteUserService.infoShop(username, SecurityConstants.INNER);
-
+
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
recordLogService.recordLogininfor(request, null, username, Constants.LOGIN_FAIL_STATUS, "登录用户不存在");
throw new ServiceException("登录用户：" + username + " 不存在");
}
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
-
+
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password)) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户/密码必须填写");
@@ -144,12 +131,12 @@
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "很遗憾，访问IP已被列入系统黑名单");
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
-
+
if (R.FAIL == userResult.getCode()) {
throw new ServiceException(userResult.getMsg());
}
-
-
+
+
if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "对不起，您的账号已被删除");
throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
--
Gitblit v1.7.1