diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index cec22a3d9..a7795f323 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
@@ -172,12 +171,6 @@ public class SysLoginService
*/
public void recordLoginInfo(Long userId)
{
- SysUser sysUser = new SysUser();
- sysUser.setUserId(userId);
- //避免每次登录把部门id更新为null
- sysUser.setDeptId(0L);
- sysUser.setLoginIp(IpUtils.getIpAddr());
- sysUser.setLoginDate(DateUtils.getNowDate());
- userService.updateUserProfile(sysUser);
+ userService.updateLoginInfo(userId, IpUtils.getIpAddr(), DateUtils.getNowDate());
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index aaca43326..dc36f359e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.mapper;
+import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -76,6 +77,16 @@ public interface SysUserMapper
*/
public int updateUserAvatar(@Param("userId") Long userId, @Param("avatar") String avatar);
+ /**
+ * 更新用户登录信息(IP和登录时间)
+ *
+ * @param userId 用户ID
+ * @param loginIp 登录IP地址
+ * @param loginDate 登录时间
+ * @return 结果
+ */
+ public int updateLoginInfo(@Param("userId") Long userId, @Param("loginIp") String loginIp, @Param("loginDate") Date loginDate);
+
/**
* 重置用户密码
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index d687a5c12..5cf9f7cd3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service;
+import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -161,6 +162,16 @@ public interface ISysUserService
*/
public boolean updateUserAvatar(Long userId, String avatar);
+ /**
+ * 更新用户登录信息(IP和登录时间)
+ *
+ * @param userId 用户ID
+ * @param loginIp 登录IP地址
+ * @param loginDate 登录时间
+ * @return 结果
+ */
+ public void updateLoginInfo(Long userId, String loginIp, Date loginDate);
+
/**
* 重置用户密码
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 9ac4a75bb..5b1609924 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
@@ -354,6 +355,19 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.updateUserAvatar(userId, avatar) > 0;
}
+ /**
+ * 更新用户登录信息(IP和登录时间)
+ *
+ * @param userId 用户ID
+ * @param loginIp 登录IP地址
+ * @param loginDate 登录时间
+ * @return 结果
+ */
+ public void updateLoginInfo(Long userId, String loginIp, Date loginDate)
+ {
+ userMapper.updateLoginInfo(userId, loginIp, loginDate);
+ }
+
/**
* 重置用户密码
*
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c50d677d9..65ff36025 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -205,6 +205,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_user set avatar = #{avatar} where user_id = #{userId}
+
+ update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}
+
+
update sys_user set pwd_update_date = sysdate(), password = #{password} where user_id = #{userId}