From 38292033f2697be236007c370abe1114a88b1c1d Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 23 Mar 2023 14:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index 880eb4b9..4a90c397 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java @@ -208,11 +208,18 @@ public class UserController { @GetMapping("/loginOut") public RestResponse loginOut(HttpServletRequest request) { HttpSession session = request.getSession(); - String userKey = (String) session.getAttribute("userKey"); - String userToken = (String) session.getAttribute("userToken"); + String token = request.getHeader("user-token"); + String key = request.getHeader("user-key"); + if (token != null) { + AuthenticationTokenPool.removeUserToken(token); + redisTemplate.delete(key); + } else { + String userKey = (String) session.getAttribute("userKey"); + String userToken = (String) session.getAttribute("userToken"); + AuthenticationTokenPool.removeUserToken(userToken); + redisTemplate.delete(userKey); + } session.invalidate(); - AuthenticationTokenPool.removeUserToken(userToken); - redisTemplate.delete(userKey); return new RestResponse("", 200, new StatusInfo("退出成功", "退出成功")); }