提交 50f94bfe 作者: Vben

chore(axios): remove useless code

上级 ee384b1f
...@@ -8,7 +8,6 @@ import { AxiosCanceler } from './axiosCancel'; ...@@ -8,7 +8,6 @@ import { AxiosCanceler } from './axiosCancel';
import { isFunction } from '/@/utils/is'; import { isFunction } from '/@/utils/is';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
//import { errorResult } from './const';
import { ContentTypeEnum } from '/@/enums/httpEnum'; import { ContentTypeEnum } from '/@/enums/httpEnum';
import { RequestEnum } from '../../../enums/httpEnum'; import { RequestEnum } from '../../../enums/httpEnum';
......
...@@ -5,7 +5,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios'; ...@@ -5,7 +5,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios';
import type { RequestOptions, Result } from './types'; import type { RequestOptions, Result } from './types';
export interface CreateAxiosOptions extends AxiosRequestConfig { export interface CreateAxiosOptions extends AxiosRequestConfig {
prefixUrl?: string; urlPrefix?: string;
transform?: AxiosTransform; transform?: AxiosTransform;
requestOptions?: RequestOptions; requestOptions?: RequestOptions;
} }
......
// The interface return value data cannot be this, otherwise the request will be judged as a failure
export const errorResult = '__ERROR_RESULT__';
...@@ -2,12 +2,12 @@ import { isObject, isString } from '/@/utils/is'; ...@@ -2,12 +2,12 @@ import { isObject, isString } from '/@/utils/is';
const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm'; const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm';
export function createNow<T extends boolean>( export function joinTimestamp<T extends boolean>(
join: boolean, join: boolean,
restful: T restful: T
): T extends true ? string : object; ): T extends true ? string : object;
export function createNow(join: boolean, restful = false): string | object { export function joinTimestamp(join: boolean, restful = false): string | object {
if (!join) { if (!join) {
return restful ? '' : {}; return restful ? '' : {};
} }
......
...@@ -18,12 +18,11 @@ import { getToken } from '/@/utils/auth'; ...@@ -18,12 +18,11 @@ import { getToken } from '/@/utils/auth';
import { setObjToUrlParams, deepMerge } from '/@/utils'; import { setObjToUrlParams, deepMerge } from '/@/utils';
import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog'; import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
//import { errorResult } from './const';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { createNow, formatRequestDate } from './helper'; import { joinTimestamp, formatRequestDate } from './helper';
const globSetting = useGlobSetting(); const globSetting = useGlobSetting();
const prefix = globSetting.urlPrefix; const urlPrefix = globSetting.urlPrefix;
const { createMessage, createErrorModal } = useMessage(); const { createMessage, createErrorModal } = useMessage();
/** /**
...@@ -51,7 +50,6 @@ const transform: AxiosTransform = { ...@@ -51,7 +50,6 @@ const transform: AxiosTransform = {
if (!data) { if (!data) {
// return '[HTTP] Request has no return value'; // return '[HTTP] Request has no return value';
throw new Error(t('sys.api.apiRequestFailed')); throw new Error(t('sys.api.apiRequestFailed'));
//return errorResult;
} }
// 这里 code,result,message为 后台统一的字段,需要在 types.ts内修改为项目自己的接口返回格式 // 这里 code,result,message为 后台统一的字段,需要在 types.ts内修改为项目自己的接口返回格式
const { code, result, message } = data; const { code, result, message } = data;
...@@ -91,7 +89,7 @@ const transform: AxiosTransform = { ...@@ -91,7 +89,7 @@ const transform: AxiosTransform = {
const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true } = options; const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true } = options;
if (joinPrefix) { if (joinPrefix) {
config.url = `${prefix}${config.url}`; config.url = `${urlPrefix}${config.url}`;
} }
if (apiUrl && isString(apiUrl)) { if (apiUrl && isString(apiUrl)) {
...@@ -101,10 +99,10 @@ const transform: AxiosTransform = { ...@@ -101,10 +99,10 @@ const transform: AxiosTransform = {
if (config.method?.toUpperCase() === RequestEnum.GET) { if (config.method?.toUpperCase() === RequestEnum.GET) {
if (!isString(params)) { if (!isString(params)) {
// 给 get 请求加上时间戳参数,避免从缓存中拿数据。 // 给 get 请求加上时间戳参数,避免从缓存中拿数据。
config.params = Object.assign(params || {}, createNow(joinTime, false)); config.params = Object.assign(params || {}, joinTimestamp(joinTime, false));
} else { } else {
// 兼容restful风格 // 兼容restful风格
config.url = config.url + params + `${createNow(joinTime, true)}`; config.url = config.url + params + `${joinTimestamp(joinTime, true)}`;
config.params = undefined; config.params = undefined;
} }
} else { } else {
...@@ -173,7 +171,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) { ...@@ -173,7 +171,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
// 基础接口地址 // 基础接口地址
// baseURL: globSetting.apiUrl, // baseURL: globSetting.apiUrl,
// 接口可能会有通用的地址部分,可以统一抽取出来 // 接口可能会有通用的地址部分,可以统一抽取出来
prefixUrl: prefix, urlPrefix: urlPrefix,
headers: { 'Content-Type': ContentTypeEnum.JSON }, headers: { 'Content-Type': ContentTypeEnum.JSON },
// 如果是form-data格式 // 如果是form-data格式
// headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED }, // headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论