From 57535a2ce7b6734a04905a2e5b5b3ecd38ba40b2 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 21 Mar 2023 14:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/xyz/playedu/api/PlayEduFCtx.java           | 9 ---------
 .../playedu/api/controller/backend/LoginController.java  | 2 +-
 .../playedu/api/controller/frontend/LoginController.java | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/PlayEduFCtx.java b/src/main/java/xyz/playedu/api/PlayEduFCtx.java
index 5361b8e..a4172d6 100644
--- a/src/main/java/xyz/playedu/api/PlayEduFCtx.java
+++ b/src/main/java/xyz/playedu/api/PlayEduFCtx.java
@@ -14,7 +14,6 @@ public class PlayEduFCtx {
     private static final String KEY_USER_ID = "user_id";
     private static final String KEY_USER = "user";
     private static final String KEY_JWT_JTI = "jwt_jti";
-    private static final String KEY_TOKEN = "token";
 
     public PlayEduFCtx() {
     }
@@ -59,12 +58,4 @@ public class PlayEduFCtx {
     public static String getJwtJti() {
         return (String) get(KEY_JWT_JTI);
     }
-
-    public static void setToken(String token) {
-        put(KEY_TOKEN, token);
-    }
-
-    public static String getToken() {
-        return (String) get(KEY_TOKEN);
-    }
 }
diff --git a/src/main/java/xyz/playedu/api/controller/backend/LoginController.java b/src/main/java/xyz/playedu/api/controller/backend/LoginController.java
index 5ee26e5..a738ce6 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/LoginController.java
+++ b/src/main/java/xyz/playedu/api/controller/backend/LoginController.java
@@ -68,7 +68,7 @@ public class LoginController {
 
     @PostMapping("/logout")
     public JsonResponse logout() throws JwtLogoutException {
-        jwtService.logout(RequestUtil.token(), SystemConstant.JWT_PRV_ADMIN_USER);
+        jwtService.adminUserLogout(RequestUtil.token());
         return JsonResponse.success("success");
     }
 
diff --git a/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java b/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java
index e9c769a..2421e85 100644
--- a/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java
+++ b/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java
@@ -70,7 +70,7 @@ public class LoginController {
 
     @PostMapping("/logout")
     public JsonResponse logout() throws JwtLogoutException {
-        jwtService.userLogout(PlayEduFCtx.getToken());
+        jwtService.userLogout(RequestUtil.token());
         ctx.publishEvent(new UserLogoutEvent(this, PlayEduFCtx.getUserId(), PlayEduFCtx.getJwtJti()));
         return JsonResponse.success();
     }