diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index ca824c7..b9e6401 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -13,12 +13,12 @@ import { stringify } from "qs"; import NProgress from "../progress"; import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; -import { baseUrlApi } from './httpConfig.ts' +import { baseUrlApi } from "./httpConfig.ts"; import { message } from "../message"; // 相关配置请参考:www.axios-js.com/zh-cn/docs/#axios-request-config-1 const defaultConfig: AxiosRequestConfig = { // 请求超时时间 - timeout: 10000, + timeout: 30000, headers: { Accept: "application/json, text/plain, */*", "Content-Type": "multipart/form-data", @@ -78,37 +78,37 @@ class PureHttp { return whiteList.some(url => config.url.endsWith(url)) ? config : new Promise(resolve => { - const data = getToken(); - if (data) { - const now = new Date().getTime(); - const expired = parseInt(data.expires) - now <= 0; - if (expired) { - if (!PureHttp.isRefreshing) { - PureHttp.isRefreshing = true; - // token过期刷新 - useUserStoreHook() - .handRefreshToken({ refreshToken: data.refreshToken }) - .then(res => { - const token = res.data.accessToken; - config.headers["Authorization"] = formatToken(token); - PureHttp.requests.forEach(cb => cb(token)); - PureHttp.requests = []; - }) - .finally(() => { - PureHttp.isRefreshing = false; - }); + const data = getToken(); + if (data) { + const now = new Date().getTime(); + const expired = parseInt(data.expires) - now <= 0; + if (expired) { + if (!PureHttp.isRefreshing) { + PureHttp.isRefreshing = true; + // token过期刷新 + useUserStoreHook() + .handRefreshToken({ refreshToken: data.refreshToken }) + .then(res => { + const token = res.data.accessToken; + config.headers["Authorization"] = formatToken(token); + PureHttp.requests.forEach(cb => cb(token)); + PureHttp.requests = []; + }) + .finally(() => { + PureHttp.isRefreshing = false; + }); + } + resolve(PureHttp.retryOriginalRequest(config)); + } else { + config.headers["Authorization"] = formatToken( + data.accessToken + ); + resolve(config); } - resolve(PureHttp.retryOriginalRequest(config)); } else { - config.headers["Authorization"] = formatToken( - data.accessToken - ); resolve(config); } - } else { - resolve(config); - } - }); + }); }, error => { return Promise.reject(error); @@ -163,12 +163,12 @@ class PureHttp { return new Promise((resolve, reject) => { PureHttp.axiosInstance .request(config) - .then((response) => { + .then(response => { // console.log(response) if ([301, 302].includes(response.code)) { - message(response.msg, 'error') + message(response.msg, "error"); useUserStoreHook().logOut(); - return + return; } resolve(response); })