From e2126944eb47eb144d1142d848aaa1fc5ee7fccc Mon Sep 17 00:00:00 2001
From: fuyongxin <110568259@qq.com>
Date: Wed, 03 Jun 2026 15:01:17 +0800
Subject: [PATCH] 修改ruoyi-改为sgd
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 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 7f674b6..907ffdf 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,13 +2,18 @@
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.text.Convert;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
+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;
@@ -30,6 +35,9 @@
@Autowired
private SysRecordLogService recordLogService;
+
+ @Autowired
+ private RedisService redisService;
/**
* 登录
@@ -56,20 +64,21 @@
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());
}
-
+
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
@@ -84,12 +93,58 @@
}
passwordService.validate(user, password);
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+ recordLoginInfo(user.getUserId());
return userInfo;
}
+ /**
+ * 记录登录信息
+ *
+ * @param userId 用户ID
+ */
+ public void recordLoginInfo(Long userId)
+ {
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(userId);
+ // 更新用户登录IP
+ sysUser.setLoginIp(IpUtils.getIpAddr());
+ // 更新用户登录时间
+ sysUser.setLoginDate(DateUtils.getNowDate());
+ remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
+ }
+
+ /**
+ * 退出
+ */
public void logout(String loginName)
{
recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
+ }
+
+ /**
+ * 解锁
+ */
+ public void unlock(String password)
+ {
+ String username = SecurityUtils.getUsername();
+ // 或密码为空 错误
+ if (StringUtils.isEmpty(password))
+ {
+ throw new ServiceException("密码不能为空");
+ }
+ // 查询用户信息
+ R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+
+ if (R.FAIL == userResult.getCode())
+ {
+ throw new ServiceException(userResult.getMsg());
+ }
+
+ SysUser user = userResult.getData().getSysUser();
+ if (!SecurityUtils.matchesPassword(password, user.getPassword()))
+ {
+ throw new ServiceException("密码错误，请重新输入");
+ }
}
/**
@@ -117,6 +172,7 @@
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
sysUser.setNickName(username);
+ sysUser.setPwdUpdateDate(DateUtils.getNowDate());
sysUser.setPassword(SecurityUtils.encryptPassword(password));
R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
--
Gitblit v1.9.3