diff --git a/continew-admin-ui/src/router/guard/userLoginInfo.ts b/continew-admin-ui/src/router/guard/userLoginInfo.ts index 9989979f..fb813718 100644 --- a/continew-admin-ui/src/router/guard/userLoginInfo.ts +++ b/continew-admin-ui/src/router/guard/userLoginInfo.ts @@ -23,7 +23,7 @@ export default function setupUserLoginInfoGuard(router: Router) { await userStore.getInfo(); next(); } catch (error) { - await userStore.logout(); + await userStore.logoutCallBack(); next({ name: 'login', query: { diff --git a/continew-admin-ui/src/utils/request.ts b/continew-admin-ui/src/utils/request.ts index 1846a05d..42565095 100644 --- a/continew-admin-ui/src/utils/request.ts +++ b/continew-admin-ui/src/utils/request.ts @@ -60,7 +60,7 @@ axios.interceptors.response.use( okText: '重新登录', async onOk() { const userStore = useUserStore(); - userStore.logout(); + userStore.logoutCallBack(); window.location.reload(); }, }); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java index b3febdb4..7426bd7b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java @@ -110,7 +110,6 @@ public class AuthController { return LoginResp.builder().token(token).build(); } - @SaIgnore @Operation(summary = "用户退出", description = "注销用户的当前登录") @Parameter(name = "Authorization", description = "令牌", required = true, example = "Bearer xxxx-xxxx-xxxx-xxxx", in = ParameterIn.HEADER)