From 8a97d2717b29d969d79706850f5cb57972153eef Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: Thu, 30 Jun 2022 15:19:26 +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

---
 .../web/controller/system/SysLoginController.java  |  9 +--------
 .../com/ruoyi/system/service/SysLoginService.java  | 14 +++++++++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index cdb1d6cd6..9c4057898 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,7 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.R;
@@ -102,12 +100,7 @@ public class SysLoginController {
     @ApiOperation("登出方法")
     @PostMapping("/logout")
     public R<Void> logout() {
-        try {
-            String username = LoginHelper.getUsername();
-            StpUtil.logout();
-            loginService.logout(username);
-        } catch (NotLoginException e) {
-        }
+        loginService.logout();
         return R.ok("退出成功");
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index 1a672e59c..540708f4b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -113,9 +114,16 @@ public class SysLoginService {
         return StpUtil.getTokenValue();
     }
 
-
-    public void logout(String loginName) {
-        asyncService.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success"), ServletUtils.getRequest());
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            String username = LoginHelper.getUsername();
+            StpUtil.logout();
+            asyncService.recordLogininfor(username, Constants.LOGOUT, MessageUtils.message("user.logout.success"), ServletUtils.getRequest());
+        } catch (NotLoginException e) {
+        }
     }
 
     /**