【新增】APP登录登出日志
This commit is contained in:
@@ -4,9 +4,11 @@ import cn.dev33.satoken.stp.StpUtil;
|
|||||||
import com.corewing.app.common.Result;
|
import com.corewing.app.common.Result;
|
||||||
import com.corewing.app.common.annotation.CommonLog;
|
import com.corewing.app.common.annotation.CommonLog;
|
||||||
import com.corewing.app.dto.*;
|
import com.corewing.app.dto.*;
|
||||||
|
import com.corewing.app.entity.DevLog;
|
||||||
import com.corewing.app.entity.User;
|
import com.corewing.app.entity.User;
|
||||||
import com.corewing.app.service.UserService;
|
import com.corewing.app.service.UserService;
|
||||||
import com.corewing.app.service.VerifyCodeService;
|
import com.corewing.app.service.VerifyCodeService;
|
||||||
|
import com.corewing.app.util.DevLogUtil;
|
||||||
import com.corewing.app.util.I18nUtil;
|
import com.corewing.app.util.I18nUtil;
|
||||||
import com.corewing.app.util.IpUtil;
|
import com.corewing.app.util.IpUtil;
|
||||||
import com.corewing.app.util.RedisUtil;
|
import com.corewing.app.util.RedisUtil;
|
||||||
@@ -76,7 +78,7 @@ public class AppUserController {
|
|||||||
data.put("username", user.getUsername());
|
data.put("username", user.getUsername());
|
||||||
|
|
||||||
redisUtil.set("APP_" + user.getId(), user);
|
redisUtil.set("APP_" + user.getId(), user);
|
||||||
|
DevLogUtil.executeLoginLog(user.getUsername());
|
||||||
return Result.success(I18nUtil.getMessage("user.login.success"), data);
|
return Result.success(I18nUtil.getMessage("user.login.success"), data);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return Result.error(e.getMessage());
|
return Result.error(e.getMessage());
|
||||||
@@ -112,7 +114,14 @@ public class AppUserController {
|
|||||||
@ApiOperation("用户登出接口")
|
@ApiOperation("用户登出接口")
|
||||||
@PostMapping("/logout")
|
@PostMapping("/logout")
|
||||||
public Result<String> logout() {
|
public Result<String> logout() {
|
||||||
|
Long userId = StpUtil.getLoginIdAsLong();
|
||||||
|
User user = (User) redisUtil.get("APP_" + userId);
|
||||||
|
if(user == null) {
|
||||||
|
user = userService.getById(userId);
|
||||||
|
redisUtil.set("APP_" + user.getId(), user);
|
||||||
|
}
|
||||||
StpUtil.logout();
|
StpUtil.logout();
|
||||||
|
DevLogUtil.executeLogoutLog(user.getUsername());
|
||||||
return Result.success(I18nUtil.getMessage("user.logout.success"));
|
return Result.success(I18nUtil.getMessage("user.logout.success"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,6 +251,7 @@ public class AppUserController {
|
|||||||
data.put("userId", user.getId());
|
data.put("userId", user.getId());
|
||||||
data.put("username", user.getUsername());
|
data.put("username", user.getUsername());
|
||||||
redisUtil.set("APP_" + user.getId(), user);
|
redisUtil.set("APP_" + user.getId(), user);
|
||||||
|
DevLogUtil.executeLoginLog(user.getUsername());
|
||||||
return Result.success(I18nUtil.getMessage("user.login.success"), data);
|
return Result.success(I18nUtil.getMessage("user.login.success"), data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|||||||
throw new RuntimeException(I18nUtil.getMessage("error.verify.code.invalid"));
|
throw new RuntimeException(I18nUtil.getMessage("error.verify.code.invalid"));
|
||||||
}
|
}
|
||||||
StpUtil.logout();
|
StpUtil.logout();
|
||||||
|
DevLogUtil.executeLogoutLog(user.getUsername());
|
||||||
// 删除记录
|
// 删除记录
|
||||||
this.removeById(user.getId());
|
this.removeById(user.getId());
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user