Bladeren bron

Merge pull request #256 from zyckx/main

fix(token): 统一导出token store和修复token获取以及添加逻辑
菲鸽 8 maanden geleden
bovenliggende
commit
4b8f7ca0c4
3 gewijzigde bestanden met toevoegingen van 7 en 4 verwijderingen
  1. 4 3
      src/http/interceptor.ts
  2. 2 1
      src/store/index.ts
  3. 1 0
      src/store/token.ts

+ 4 - 3
src/http/interceptor.ts

@@ -1,5 +1,5 @@
 import type { CustomRequestOptions } from '@/http/types'
-import { useUserStore } from '@/store'
+import { useTokenStore } from '@/store'
 import { getEnvBaseUrl } from '@/utils'
 import { platform } from '@/utils/platform'
 import { stringifyQuery } from './tools/queryString'
@@ -47,8 +47,9 @@ const httpInterceptor = {
       ...options.header,
     }
     // 3. 添加 token 请求头标识
-    const userStore = useUserStore()
-    const { token } = userStore.userInfo as unknown as IUserToken
+    const tokenStore = useTokenStore()
+    const token = tokenStore.validToken
+
     if (token) {
       options.header.Authorization = `Bearer ${token}`
     }

+ 2 - 1
src/store/index.ts

@@ -13,6 +13,7 @@ store.use(
 
 export default store
 
-export * from './theme'
 // 模块统一导出
+export * from './theme'
+export * from './token'
 export * from './user'

+ 1 - 0
src/store/token.ts

@@ -266,6 +266,7 @@ export const useTokenStore = defineStore(
       // 内部系统使用的方法
       refreshToken,
       tryGetValidToken,
+      validToken: getValidToken,
 
       // 调试或特殊场景可能需要直接访问的信息
       tokenInfo,