From a7389e026856e7a2369ad2e928778b036894a96c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 13 八月 2023 01:21:20 +0800
Subject: [PATCH] bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 c527bee..4ee5f2c 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
@@ -12,11 +12,13 @@
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.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
+import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
@@ -49,6 +51,8 @@
@Autowired
private RedisService redisService;
+ @Autowired
+ private RemoteConfigService remoteConfigService;
/**
* 登录
*/
@@ -134,15 +138,16 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单",Constants.FROM_MINI_APP);
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
+ String servicePhone = remoteConfigService.getServicePhone().getData();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+ throw new ServiceException(servicePhone,501);
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+ throw new ServiceException(servicePhone,501);
}
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
}
@@ -176,12 +181,12 @@
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+ throw new ServiceException("对不起，您的账号： 已被删除");
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+ throw new ServiceException("对不起，您的账号： 已停用");
}
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
}
@@ -195,6 +200,9 @@
{
// 查询用户信息
R<QwH5LoginVo> userResult = remoteShopService.qwH5Login(qwUserDetail);
+ if(userResult==null){
+ throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
+ }
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
@@ -239,7 +247,10 @@
public QwH5LoginVo qwH5StaffLogin(QwUserDetailDto qwUserDetail)
{
// 查询用户信息
- R<QwH5LoginVo> userResult = remoteShopService.qwH5Login(qwUserDetail);
+ R<QwH5LoginVo> userResult = remoteUserService.qwH5StaffLogin(qwUserDetail);
+ if(userResult==null){
+ throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
+ }
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
--
Gitblit v1.7.1