From ebc848b5b55b49ba0bafc84d2e0a90a9b5aa0d0e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 06 Jul 2023 09:27:48 +0800
Subject: [PATCH] 优化页签在Firefox浏览器被遮挡的问题(I7BVAJ)
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 88 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 52 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 29c79ce..431c264 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
@@ -2,19 +2,19 @@
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;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.UserStatus;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SecurityUtils;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.system.api.RemoteLogService;
+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.SysLogininfor;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
@@ -27,10 +27,16 @@
public class SysLoginService
{
@Autowired
- private RemoteLogService remoteLogService;
+ private RemoteUserService remoteUserService;
@Autowired
- private RemoteUserService remoteUserService;
+ private SysPasswordService passwordService;
+
+ @Autowired
+ private SysRecordLogService recordLogService;
+
+ @Autowired
+ private RedisService redisService;
/**
* 登录
@@ -40,60 +46,64 @@
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password))
{
- recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
throw new ServiceException("用户/密码必须填写");
}
// 密码如果不在指定范围内 错误
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
{
- recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
throw new ServiceException("用户密码不在指定范围");
}
// 用户名不在指定范围内 错误
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH)
{
- recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
throw new ServiceException("用户名不在指定范围");
+ }
+ // IP黑名单校验
+ String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
+ if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
+ {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
+ throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
// 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+
+ if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
+ {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
+ throw new ServiceException("登录用户：" + username + " 不存在");
+ }
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
}
-
- if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
- {
- recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
- throw new ServiceException("登录用户：" + username + " 不存在");
- }
+
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
- recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
- recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
- if (!SecurityUtils.matchesPassword(password, user.getPassword()))
- {
- recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
- throw new ServiceException("用户不存在/密码错误");
- }
- recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+ passwordService.validate(user, password);
+ recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
return userInfo;
}
public void logout(String loginName)
{
- recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
+ recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
}
/**
@@ -128,32 +138,6 @@
{
throw new ServiceException(registerResult.getMsg());
}
- recordLogininfor(username, Constants.REGISTER, "注册成功");
+ recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
}
-
- /**
- * 记录登录信息
- *
- * @param username 用户名
- * @param status 状态
- * @param message 消息内容
- * @return
- */
- public void recordLogininfor(String username, String status, String message)
- {
- SysLogininfor logininfor = new SysLogininfor();
- logininfor.setUserName(username);
- logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
- logininfor.setMsg(message);
- // 日志状态
- if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
- {
- logininfor.setStatus("0");
- }
- else if (Constants.LOGIN_FAIL.equals(status))
- {
- logininfor.setStatus("1");
- }
- remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
- }
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3