diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/controller/admin/auth/AuthController.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/controller/admin/auth/AuthController.java
index bb48db0d..98eebf1d 100644
--- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/controller/admin/auth/AuthController.java
+++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/controller/admin/auth/AuthController.java
@@ -126,9 +126,9 @@ public class AuthController {
             OAuth2AccessTokenDO oAuth2AccessTokenDO = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(oauth2_access_token), OAuth2AccessTokenDO.class);
             // 判断账号是否登录过
             if (oAuth2AccessTokenDO != null && oAuth2AccessTokenDO.getUserInfo().get("username").equals(loginUserName)) {
-                stringRedisTemplate.opsForValue().getAndDelete(oauth2_access_token);
-//                String token = oauth2_access_token.split(":")[1];
-//                authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType());
+//                stringRedisTemplate.opsForValue().getAndDelete(oauth2_access_token);
+                String token = oauth2_access_token.split(":")[1];
+                authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType());
             }
         }
         return success(true);
@@ -150,10 +150,10 @@ public class AuthController {
             // 判断账号是否登录过
             if (oAuth2AccessTokenDO != null && oAuth2AccessTokenDO.getUserInfo().get("username").equals(loginoutVo.getUsername())) {
                 // 说明登录了，别的地方登录了，请重新登录
-                stringRedisTemplate.opsForValue().getAndDelete(oauth2_access_token);
+//                stringRedisTemplate.opsForValue().getAndDelete(oauth2_access_token);
                 // TODO 要更改的地方
-//                String token = oauth2_access_token.split(":")[1];
-//                authService.logout(token, LoginLogTypeEnum.LOGOUT_ADMIN_SELF.getType());
+                String token = oauth2_access_token.split(":")[1];
+                authService.logout(token, LoginLogTypeEnum.LOGOUT_ADMIN_SELF.getType());
             }
         }
         return success("退出成功，请重新输入用户名密码登录！");
diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/oauth2/OAuth2TokenServiceImpl.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/oauth2/OAuth2TokenServiceImpl.java
index 835c5c0f..57861944 100644
--- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/oauth2/OAuth2TokenServiceImpl.java
+++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/oauth2/OAuth2TokenServiceImpl.java
@@ -159,7 +159,9 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     }
 
     private OAuth2AccessTokenDO createOAuth2AccessToken(OAuth2RefreshTokenDO refreshTokenDO, OAuth2ClientDO clientDO) {
-        OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
+        // OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
+        // 使刷新token与AccessToken相同，简化前端调用
+        OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(refreshTokenDO.getRefreshToken())
                 .setUserId(refreshTokenDO.getUserId()).setUserType(refreshTokenDO.getUserType())
                 .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType()))
                 .setClientId(clientDO.getClientId()).setScopes(refreshTokenDO.getScopes())