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 {