From ab77b8cb8d059dc2b06c91f753f93a99f231ccb7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 24 Mar 2026 10:52:30 +0800
Subject: [PATCH] 优化菜单主题风格
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 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 431c264..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
@@ -10,6 +10,7 @@
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;
@@ -73,17 +74,11 @@
// 查询用户信息
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()))
@@ -98,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("密码错误，请重新输入");
+ }
}
/**
@@ -131,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