diff --git a/mock/api/auth.ts b/mock/api/auth.ts index c2481c9c..7bec62bc 100644 --- a/mock/api/auth.ts +++ b/mock/api/auth.ts @@ -80,11 +80,11 @@ const apis: MockMethod[] = [ { url: '/mock/updateToken', method: 'post', - response: (): Service.MockServiceResult => { + response: (): Service.MockServiceResult => { return { code: 200, message: 'ok', - data: token.token + data: token }; } } diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index 3b66bab1..29cb808c 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -36,10 +36,10 @@ export function fetchUserRoutes(userId: string) { return mockRequest.post('/getUserRoutes', { userId }); } -export function fetchTestToken() { - return mockRequest.post('/testToken', { userName: 'Soybean' }); -} - +/** + * 刷新token + * @param refreshToken + */ export function fetchUpdateToken(refreshToken: string) { - return mockRequest.post('/updateToken', { refreshToken }); + return mockRequest.post('/updateToken', { refreshToken }); } diff --git a/src/service/request/instance.ts b/src/service/request/instance.ts index 6afed14c..d9146fb3 100644 --- a/src/service/request/instance.ts +++ b/src/service/request/instance.ts @@ -1,6 +1,6 @@ import axios from 'axios'; import type { AxiosRequestConfig, AxiosInstance, AxiosError } from 'axios'; -import { REQUEST_TIMEOUT, REFRESH_TOKEN_CODE } from '@/config'; +import { REFRESH_TOKEN_CODE } from '@/config'; import { getToken, transformRequestData, @@ -23,7 +23,7 @@ export default class CustomAxiosInstance { /** * * @param axiosConfig - axios配置 - * @param backendSuccessCode - 后端业务上定义的成功请求的状态码 + * @param backendConfig - 后端返回的数据配置 */ constructor( axiosConfig: AxiosRequestConfig, @@ -35,11 +35,7 @@ export default class CustomAxiosInstance { } ) { this.backendConfig = backendConfig; - const defaultConfig: AxiosRequestConfig = { - timeout: REQUEST_TIMEOUT - }; - Object.assign(defaultConfig, axiosConfig); - this.instance = axios.create(defaultConfig); + this.instance = axios.create(axiosConfig); this.setInterceptor(); } diff --git a/src/store/subscribe/index.ts b/src/store/subscribe/index.ts index a575015b..2ab17b36 100644 --- a/src/store/subscribe/index.ts +++ b/src/store/subscribe/index.ts @@ -1,8 +1,8 @@ -import subscribeAppStore from './app'; +// import subscribeAppStore from './app'; import subscribeThemeStore from './theme'; /** 订阅状态 */ export function subscribeStore() { - subscribeAppStore(); + // subscribeAppStore(); subscribeThemeStore(); }