From 604fe2152a6f25a8d5a4b7eb318d2baadeac6b8e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 16:27:49 +0800
Subject: [PATCH] bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 2c46dad..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
@@ -18,6 +18,7 @@
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;
@@ -50,6 +51,8 @@
@Autowired
private RedisService redisService;
+ @Autowired
+ private RemoteConfigService remoteConfigService;
/**
* 登录
*/
@@ -135,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("对不起，您的账号： 已被删除");
+ 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("对不起，您的账号： 已停用");
+ throw new ServiceException(servicePhone,501);
}
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
}
--
Gitblit v1.7.1