From 8a97d2717b29d969d79706850f5cb57972153eef Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期四, 30 六月 2022 15:20:02 +0800
Subject: [PATCH] update 优化登出方法
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 14 +++++++++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 9 +--------
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 cdb1d6c..9c40578 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 @@
@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 1a672e5..540708f 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 @@
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) {
+ }
}
/**
--
Gitblit v1.9.3