diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index bfb21a0..fd75447 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -2,7 +2,6 @@ import { AxiosConfig, AxiosResponse, AxiosRequestHeaders, - AxiosError, InternalAxiosRequestConfig } from './types' import { ElMessage } from 'element-plus' @@ -76,15 +75,8 @@ const defaultRequestInterceptors = (config: InternalAxiosRequestConfig) => { } return config } -;(error: AxiosError) => { - console.log(error) - Promise.reject(error) -} const defaultResponseInterceptors = (response: AxiosResponse) => { - if ((response as any).code === 'ERR_CANCELED') { - return Promise.reject(response) - } if (response?.config?.responseType === 'blob') { // 如果是文件流,直接过 return response @@ -94,11 +86,6 @@ const defaultResponseInterceptors = (response: AxiosResponse) => { ElMessage.error((response as any).message) } } -;(error: AxiosError) => { - console.log('err' + error) // for debug - ElMessage.error(error.message) - return Promise.reject(error) -} export { defaultResponseInterceptors, defaultRequestInterceptors } export default config diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 08e50d2..da11733 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -1,7 +1,8 @@ -import axios from 'axios' +import axios, { AxiosError } from 'axios' import config, { defaultRequestInterceptors, defaultResponseInterceptors } from './config' import { AxiosInstance, InternalAxiosRequestConfig, RequestConfig, AxiosResponse } from './types' +import { ElMessage } from 'element-plus' const { interceptors, baseUrl } = config export const PATH_URL = baseUrl[import.meta.env.VITE_API_BASE_PATH] @@ -30,7 +31,11 @@ axiosInstance.interceptors.response.use( // 这里不能做任何处理,否则后面的 interceptors 拿不到完整的上下文了 return res }, - (err: any) => err + (error: AxiosError) => { + console.log('err' + error) // for debug + ElMessage.error(error.message) + return Promise.reject(error) + } ) axiosInstance.interceptors.request.use(requestInterceptors || defaultRequestInterceptors)