红德堂-V1.2 最后登录时间修改

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -557,19 +557,19 @@ public class AppLoginController extends AppBaseController{
         return user;
     }
 
-    @PostMapping("/loginTest")
-    public R loginTest(@RequestBody String userId) {
-        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
-        if (user!=null){
-            String token = jwtUtils.generateToken(user.getUserId());
-            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
-            Map<String, Object> map = new HashMap<>();
-            map.put("token", token);
-            map.put("user", user);
-            return R.ok(map);
-        }
-        return R.error("用户不存在！");
-    }
+//    @PostMapping("/loginTest")
+//    public R loginTest(@RequestBody String userId) {
+//        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
+//        if (user!=null){
+//            String token = jwtUtils.generateToken(user.getUserId());
+//            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("token", token);
+//            map.put("user", user);
+//            return R.ok(map);
+//        }
+//        return R.error("用户不存在！");
+//    }
 
     /**
      * 退出清除jpushId

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController2.java

@@ -210,6 +210,8 @@ public class AppLoginController2 extends AppBaseController{
                     return R.ok(map);
                 }
             }
+            // 更新最后登录时间
+            updateLastLoginTime(user);
             int isFirstLogin = userNewTaskService.performTaskOne(user.getUserId());
             String token = jwtUtils.generateToken(user.getUserId());
             redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
@@ -438,9 +440,22 @@ public class AppLoginController2 extends AppBaseController{
         }
         String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
         userMap.setLastIp(ipAddr);
+        userMap.setUpdateTime(new Date());
         userMapper.updateFsUser(userMap);
     }
 
+    /**
+     * 更新最后登录时间
+     */
+    private void updateLastLoginTime(FsUser user) {
+        FsUser updateUser = new FsUser();
+        updateUser.setUserId(user.getUserId());
+        updateUser.setUpdateTime(new Date());
+        String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+        updateUser.setLastIp(ipAddr);
+        userMapper.updateFsUser(updateUser);
+    }
+
     private R generateTokenAndReturn(FsUser user) {
         String token = jwtUtils.generateToken(user.getUserId());
         redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
@@ -480,6 +495,9 @@ public class AppLoginController2 extends AppBaseController{
         // 检查是否写入过appCreateTime，没写入则写入
         checkAppCreateTime(user);
 
+        // 更新最后登录时间
+        updateLastLoginTime(user);
+
         // 发送消息
         threadPoolTaskExecutor.execute(() -> sendMessage(user));
 
@@ -520,6 +538,7 @@ public class AppLoginController2 extends AppBaseController{
                 FsUser fsUser = new FsUser();
                 fsUser.setUserId(user.getUserId());
                 fsUser.setPhone(encryptPhone(param.getPhone()));
+                fsUser.setUpdateTime(new Date());
                 String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
                 fsUser.setLastIp(ipAddr);
                 userMapper.updateFsUser(fsUser);
@@ -538,6 +557,9 @@ public class AppLoginController2 extends AppBaseController{
 //                }
         }
 
+        // 更新最后登录时间
+        updateLastLoginTime(user);
+
         return generateTokenAndReturn(user);
     }
 
@@ -573,19 +595,20 @@ public class AppLoginController2 extends AppBaseController{
         return user;
     }
 
-    @PostMapping("/loginTest")
-    public R loginTest(@RequestBody String userId) {
-        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
-        if (user!=null){
-            String token = jwtUtils.generateToken(user.getUserId());
-            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
-            Map<String, Object> map = new HashMap<>();
-            map.put("token", token);
-            map.put("user", user);
-            return R.ok(map);
-        }
-        return R.error("用户不存在！");
-    }
+//    @PostMapping("/loginTest")
+//    public R loginTest(@RequestBody String userId) {
+//        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
+//        if (user!=null){
+//            updateLastLoginTime(user);
+//            String token = jwtUtils.generateToken(user.getUserId());
+//            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("token", token);
+//            map.put("user", user);
+//            return R.ok(map);
+//        }
+//        return R.error("用户不存在！");
+//    }
 
     /**
      * 退出清除jpushId
@@ -710,6 +733,9 @@ public class AppLoginController2 extends AppBaseController{
         // 验证码登录用户密码为空时，设置默认密码123456
         initPassword(user);
 
+        // 更新最后登录时间
+        updateLastLoginTime(user);
+
         // 发送消息
         threadPoolTaskExecutor.execute(() -> sendMessage(user));