diff --git a/composables/useDollarFetchRequest.ts b/composables/useDollarFetchRequest.ts index cc38377..5ab6a00 100644 --- a/composables/useDollarFetchRequest.ts +++ b/composables/useDollarFetchRequest.ts @@ -1,4 +1,5 @@ import { isArray } from "~/utils/utils"; +import refreshToken from "~/utils/RefreshToken"; type FetchType = typeof $fetch; export type FetchOptions = Parameters[1]; @@ -7,16 +8,15 @@ const useClientRequest = async ( url: string, opts?: FetchOptions ) => { - const token = useCookie("token"); + // const token = useCookie("token"); const runtimeConfig = useRuntimeConfig(); const defaultOptions: FetchOptions = { baseURL: runtimeConfig.public.apiBase, onRequest({ options }) { options.headers = options.headers || 'application/json'; - if (token.value) { - // @ts-ignore - options.headers["authorization"] = "Bearer " + token.value; + if (refreshToken.getToken().token) { + options.headers.set("Authorization", `Bearer ${refreshToken.getToken().token}`); } }, onResponse({ response }) { diff --git a/store/user.ts b/store/user.ts index abcb058..e017c46 100644 --- a/store/user.ts +++ b/store/user.ts @@ -4,14 +4,7 @@ import { getUserInfo } from "~/api/common/index"; import type { AppMemberUserInfoRespVO } from "~/api/common/types"; import MQTTClient from "~/utils/mqttClient"; import { socialLoginByCode } from "~/api/pay"; -// const { -// $openLogin, -// $closeLogin, -// $openRegister, -// $closeRegister, -// $openLoginEmail, -// $closeLoginEmail, -// } = useNuxtApp(); +const app = useNuxtApp(); export default defineStore("useUserStore", { state: () => ({ @@ -90,8 +83,7 @@ export default defineStore("useUserStore", { // 打开登录界面 if (!data.accessToken) { ElMessage.error("因你未绑定手机号,请先绑定手机号"); - // @ts-ignore - // $openLogin("verify", row.code, row.type, row.state); + app.$openLogin("verify", row.code, row.type, row.state); } else { refreshToken.setToken(data.accessToken, data.refreshToken); refreshToken.setUserId(data.userId.toString());