diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index d0c7c9eb..d805a48c 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -82,12 +82,7 @@ public class TokenController { @ApiOperation("登出方法") @DeleteMapping("logout") public R logout() { - try { - String username = LoginHelper.getUsername(); - StpUtil.logout(); - sysLoginService.logout(username); - } catch (NotLoginException e) { - } + sysLoginService.logout(); return R.ok(); } 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 a84a13a9..d6da579f 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 @@ -1,5 +1,6 @@ package com.ruoyi.auth.service; +import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; @@ -79,8 +80,16 @@ public class SysLoginService { return StpUtil.getTokenValue(); } - public void logout(String loginName) { - recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success")); + /** + * 退出登录 + */ + public void logout() { + try { + String username = LoginHelper.getUsername(); + StpUtil.logout(); + recordLogininfor(username, Constants.LOGOUT, MessageUtils.message("user.logout.success")); + } catch (NotLoginException e) { + } } /**