From c5885452272d45d201a8870eca9fda6b4b689928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Wed, 26 Mar 2025 17:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=99=BB=E5=BD=95=E4=BA=86?= =?UTF-8?q?=E6=9F=90=E4=B8=AA=E8=B4=A6=E5=8F=B7=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=80=E5=87=BA=E3=80=81=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=8F=90=E7=A4=BA=E9=87=8D=E5=A4=8D=E3=80=81?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E9=82=80=E8=AF=B7=E7=AD=89?= =?UTF-8?q?=E6=96=B0=E6=B6=88=E6=81=AF=E6=B2=A1=E6=9C=89=E5=9C=A8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=9B=BE=E6=A0=87=E4=B8=8A=E4=BD=93=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/interceptor.ts | 4 +++- src/stores/user.ts | 4 ++++ src/utils/hooks/useLogin.ts | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/router/interceptor.ts b/src/router/interceptor.ts index de3c1d4..a3f18e6 100644 --- a/src/router/interceptor.ts +++ b/src/router/interceptor.ts @@ -45,8 +45,10 @@ export const injectRouter = (router) => { const account = useAccountStore(); router.beforeEach(async (to, from) => { + let access_token = localStorage.getItem('access_token') || ''; + let refresh_token = localStorage.getItem('refresh_token') || ''; // 如果是从blog跳转过来的判断是否登陆,如果登陆则写入storage - await account.checkIsLogin(); + await account.checkIsLogin(access_token,refresh_token); // 判断命名空间类型 const globalStore = useGlobalInfoStore(); globalStore.setNamespaceType(-1); // 重置namespaceType,防止非组织路由请求组织信息 diff --git a/src/stores/user.ts b/src/stores/user.ts index d0a557e..9d5a28a 100644 --- a/src/stores/user.ts +++ b/src/stores/user.ts @@ -63,6 +63,10 @@ export const useAccountStore = defineStore('accountInfo', () => { // const { data, error } = await getUserToken(); // if (data?.data) { // const { access_token, refresh_token } = data.data; + + if(!access_token|| !refresh_token) { + return + } localStorage.setItem('access_token', access_token); localStorage.setItem('refresh_token', refresh_token); saveStatus(true); diff --git a/src/utils/hooks/useLogin.ts b/src/utils/hooks/useLogin.ts index 9db45cb..679dbff 100644 --- a/src/utils/hooks/useLogin.ts +++ b/src/utils/hooks/useLogin.ts @@ -43,9 +43,9 @@ export function useLogin() { unMount(); const { username, email } = conf; RecordInfo(conf); - Message.success({ - message: '欢迎来到GitCode!' - }); + // Message.success({ + // message: '欢迎来到GitCode!' + // }); if (`${username}@gitcode.com` === email) { // 需要修改默认邮箱的弹窗 localStorage.setItem('validator_email', 'invalid'); } else {