Przeglądaj źródła

记录用户登录IP地址和登录时间

RuoYi 1 rok temu
rodzic
commit
0953a9c0b2

+ 11 - 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -4,6 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
4 4
 import org.springframework.web.bind.annotation.GetMapping;
5 5
 import org.springframework.web.bind.annotation.PathVariable;
6 6
 import org.springframework.web.bind.annotation.PostMapping;
7
+import org.springframework.web.bind.annotation.PutMapping;
7 8
 import org.springframework.web.bind.annotation.RequestBody;
8 9
 import org.springframework.web.bind.annotation.RequestHeader;
9 10
 import com.ruoyi.common.core.constant.SecurityConstants;
@@ -40,4 +41,14 @@ public interface RemoteUserService
40 41
      */
41 42
     @PostMapping("/user/register")
42 43
     public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
44
+
45
+    /**
46
+     * 记录用户登录IP地址和登录时间
47
+     *
48
+     * @param sysUser 用户信息
49
+     * @param source 请求来源
50
+     * @return 结果
51
+     */
52
+    @PutMapping("/user/recordlogin")
53
+    public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
43 54
 }

+ 6 - 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -36,6 +36,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
36 36
             {
37 37
                 return R.fail("注册用户失败:" + throwable.getMessage());
38 38
             }
39
+
40
+            @Override
41
+            public R<Boolean> recordUserLogin(SysUser sysUser, String source)
42
+            {
43
+                return R.fail("记录用户登录信息失败:" + throwable.getMessage());
44
+            }
39 45
         };
40 46
     }
41 47
 }

+ 18 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R;
10 10
 import com.ruoyi.common.core.enums.UserStatus;
11 11
 import com.ruoyi.common.core.exception.ServiceException;
12 12
 import com.ruoyi.common.core.text.Convert;
13
+import com.ruoyi.common.core.utils.DateUtils;
13 14
 import com.ruoyi.common.core.utils.StringUtils;
14 15
 import com.ruoyi.common.core.utils.ip.IpUtils;
15 16
 import com.ruoyi.common.redis.service.RedisService;
@@ -98,9 +99,26 @@ public class SysLoginService
98 99
         }
99 100
         passwordService.validate(user, password);
100 101
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
102
+        recordLoginInfo(user.getUserId());
101 103
         return userInfo;
102 104
     }
103 105
 
106
+    /**
107
+     * 记录登录信息
108
+     *
109
+     * @param userId 用户ID
110
+     */
111
+    public void recordLoginInfo(Long userId)
112
+    {
113
+        SysUser sysUser = new SysUser();
114
+        sysUser.setUserId(userId);
115
+        // 更新用户登录IP
116
+        sysUser.setLoginIp(IpUtils.getIpAddr());
117
+        // 更新用户登录时间
118
+        sysUser.setLoginDate(DateUtils.getNowDate());
119
+        remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
120
+    }
121
+
104 122
     public void logout(String loginName)
105 123
     {
106 124
         recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -79,7 +79,7 @@ public class SysProfileController extends BaseController
79 79
         {
80 80
             return error("修改用户'" + loginUser.getUsername() + "'失败,邮箱账号已存在");
81 81
         }
82
-        if (userService.updateUserProfile(currentUser) > 0)
82
+        if (userService.updateUserProfile(currentUser))
83 83
         {
84 84
             // 更新缓存用户信息
85 85
             tokenService.setLoginUser(loginUser);

+ 9 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -150,6 +150,15 @@ public class SysUserController extends BaseController
150 150
     }
151 151
 
152 152
     /**
153
+     *记录用户登录IP地址和登录时间
154
+     */
155
+    @PutMapping("/recordlogin")
156
+    public R<Boolean> recordlogin(@RequestBody SysUser sysUser)
157
+    {
158
+        return R.ok(userService.updateUserProfile(sysUser));
159
+    }
160
+
161
+    /**
153 162
      * 获取用户信息
154 163
      * 
155 164
      * @return 用户信息

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -150,7 +150,7 @@ public interface ISysUserService
150 150
      * @param user 用户信息
151 151
      * @return 结果
152 152
      */
153
-    public int updateUserProfile(SysUser user);
153
+    public boolean updateUserProfile(SysUser user);
154 154
 
155 155
     /**
156 156
      * 修改用户头像

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -336,9 +336,9 @@ public class SysUserServiceImpl implements ISysUserService
336 336
      * @return 结果
337 337
      */
338 338
     @Override
339
-    public int updateUserProfile(SysUser user)
339
+    public boolean updateUserProfile(SysUser user)
340 340
     {
341
-        return userMapper.updateUser(user);
341
+        return userMapper.updateUser(user) > 0;
342 342
     }
343 343
 
344 344
     /**