From cd526828b3527c6468fe1f54fcbc36a765bad575 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 12 Sep 2024 16:45:12 +0800 Subject: [PATCH] chore: sse close before logout --- apps/web-antd/src/api/core/auth.ts | 8 ++++++++ apps/web-antd/src/layouts/basic.vue | 4 +--- apps/web-antd/src/store/auth.ts | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/api/core/auth.ts b/apps/web-antd/src/api/core/auth.ts index cb194362..e521f7ff 100644 --- a/apps/web-antd/src/api/core/auth.ts +++ b/apps/web-antd/src/api/core/auth.ts @@ -91,6 +91,14 @@ export function doLogout() { return requestClient.post('/auth/logout'); } +/** + * 关闭sse连接 + * @returns void + */ +export function seeConnectionClose() { + return requestClient.get('/resource/sse/close'); +} + /** * @param companyName 租户/公司名称 * @param domain 绑定域名(不带http(s)://) 可选 diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index 80a1b1a7..59dc915b 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -81,10 +81,8 @@ const avatar = computed(() => { }); async function handleLogout() { - // resetAllStores(); + await authStore.logout(); resetRoutes(); - // await router.replace(LOGIN_PATH); - authStore.logout(); } const notifyStore = useNotifyStore(); diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts index b46f6dc0..56feb749 100644 --- a/apps/web-antd/src/store/auth.ts +++ b/apps/web-antd/src/store/auth.ts @@ -10,7 +10,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores'; import { notification } from 'ant-design-vue'; import { defineStore } from 'pinia'; -import { doLogout, getUserInfoApi, loginApi } from '#/api'; +import { doLogout, getUserInfoApi, loginApi, seeConnectionClose } from '#/api'; import { $t } from '#/locales'; export const useAuthStore = defineStore('auth', () => { @@ -73,7 +73,9 @@ export const useAuthStore = defineStore('auth', () => { } async function logout(redirect: boolean = true) { + console.log(accessStore.accessToken); try { + await seeConnectionClose(); await doLogout(); } catch (error) { console.error(error);