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("退出成功", "退出成功")); }