diff --git a/src/api/login/types.ts b/src/api/login/types.ts index 860808e..31bb526 100644 --- a/src/api/login/types.ts +++ b/src/api/login/types.ts @@ -8,5 +8,4 @@ export interface UserType { password: string role: string roleId: string - permissions: string | string[] } diff --git a/src/axios/config.ts b/src/axios/config.ts index 92def84..d1c0a77 100644 --- a/src/axios/config.ts +++ b/src/axios/config.ts @@ -1,12 +1,8 @@ import { AxiosResponse, AxiosRequestHeaders, InternalAxiosRequestConfig } from './types' import { ElMessage } from 'element-plus' import qs from 'qs' -import router from '@/router' import { SUCCESS_CODE } from '@/constants' - -import { useStorage } from '@/hooks/web/useStorage' - -const { clear } = useStorage() +import { useUserStoreWithOut } from '@/store/modules/user' const defaultRequestInterceptors = (config: InternalAxiosRequestConfig) => { if ( @@ -40,9 +36,8 @@ const defaultResponseInterceptors = (response: AxiosResponse) => { } else { ElMessage.error(response?.data?.message) if (response?.data?.code === 401) { - // token过期 - clear() - router.push('/login') + const userStore = useUserStoreWithOut() + userStore.logout() } } } diff --git a/src/components/UserInfo/src/UserInfo.vue b/src/components/UserInfo/src/UserInfo.vue index 095000e..eba341f 100644 --- a/src/components/UserInfo/src/UserInfo.vue +++ b/src/components/UserInfo/src/UserInfo.vue @@ -1,49 +1,27 @@