From b964c493c42771ebe50222f552342c24b3b069de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 15 Jul 2022 20:46:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=87=BA?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/auth/controller/TokenController.java  |  7 +------
 .../com/ruoyi/auth/service/SysLoginService.java     | 13 +++++++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

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<Void> 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) {
+        }
     }
 
     /**