From dd518e9c2cee1c5df2c1b0ea5610245ddba59681 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 13 ++++++++-----
1 files changed, 8 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 53ed3c5..3b82526 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,5 +1,6 @@
package com.ruoyi.auth.service;
+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;
@@ -17,6 +18,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
@@ -26,16 +28,16 @@
*/
@Component
public class SysLoginService {
- @Autowired
+ @Resource
private RemoteUserService remoteUserService;
- @Autowired
+ @Resource
private SysPasswordService passwordService;
- @Autowired
+ @Resource
private SysRecordLogService recordLogService;
- @Autowired
+ @Resource
private RedisService redisService;
/**
@@ -88,7 +90,8 @@
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
- throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+ throw new ServiceException("您的账号已被禁用，请联系平台");
}
passwordService.validate(user, password, request);
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
--
Gitblit v1.7.1