From 50f94bfee4c58b864e335269d698a26f48b75ccb Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Sun, 6 Jun 2021 15:08:01 +0800
Subject: [PATCH] chore(axios): remove useless code

---
 src/utils/http/axios/Axios.ts          |  1 -
 src/utils/http/axios/axiosTransform.ts |  2 +-
 src/utils/http/axios/const.ts          |  2 --
 src/utils/http/axios/helper.ts         |  4 ++--
 src/utils/http/axios/index.ts          | 14 ++++++--------
 5 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 src/utils/http/axios/const.ts

diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index 35ac7437..84feddb2 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -8,7 +8,6 @@ import { AxiosCanceler } from './axiosCancel';
 import { isFunction } from '/@/utils/is';
 import { cloneDeep } from 'lodash-es';
 
-//import { errorResult } from './const';
 import { ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum } from '../../../enums/httpEnum';
 
diff --git a/src/utils/http/axios/axiosTransform.ts b/src/utils/http/axios/axiosTransform.ts
index 27f9ba3e..c4f0adfd 100644
--- a/src/utils/http/axios/axiosTransform.ts
+++ b/src/utils/http/axios/axiosTransform.ts
@@ -5,7 +5,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import type { RequestOptions, Result } from './types';
 
 export interface CreateAxiosOptions extends AxiosRequestConfig {
-  prefixUrl?: string;
+  urlPrefix?: string;
   transform?: AxiosTransform;
   requestOptions?: RequestOptions;
 }
diff --git a/src/utils/http/axios/const.ts b/src/utils/http/axios/const.ts
deleted file mode 100644
index 2d45c68c..00000000
--- a/src/utils/http/axios/const.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// The interface return value data cannot be this, otherwise the request will be judged as a failure
-export const errorResult = '__ERROR_RESULT__';
diff --git a/src/utils/http/axios/helper.ts b/src/utils/http/axios/helper.ts
index 30369d57..dc30e047 100644
--- a/src/utils/http/axios/helper.ts
+++ b/src/utils/http/axios/helper.ts
@@ -2,12 +2,12 @@ import { isObject, isString } from '/@/utils/is';
 
 const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm';
 
-export function createNow<T extends boolean>(
+export function joinTimestamp<T extends boolean>(
   join: boolean,
   restful: T
 ): 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) {
     return restful ? '' : {};
   }
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index daeb6b9c..d847f9af 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -18,12 +18,11 @@ import { getToken } from '/@/utils/auth';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 
-//import { errorResult } from './const';
 import { useI18n } from '/@/hooks/web/useI18n';
-import { createNow, formatRequestDate } from './helper';
+import { joinTimestamp, formatRequestDate } from './helper';
 
 const globSetting = useGlobSetting();
-const prefix = globSetting.urlPrefix;
+const urlPrefix = globSetting.urlPrefix;
 const { createMessage, createErrorModal } = useMessage();
 
 /**
@@ -51,7 +50,6 @@ const transform: AxiosTransform = {
     if (!data) {
       // return '[HTTP] Request has no return value';
       throw new Error(t('sys.api.apiRequestFailed'));
-      //return errorResult;
     }
     //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
     const { code, result, message } = data;
@@ -91,7 +89,7 @@ const transform: AxiosTransform = {
     const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true } = options;
 
     if (joinPrefix) {
-      config.url = `${prefix}${config.url}`;
+      config.url = `${urlPrefix}${config.url}`;
     }
 
     if (apiUrl && isString(apiUrl)) {
@@ -101,10 +99,10 @@ const transform: AxiosTransform = {
     if (config.method?.toUpperCase() === RequestEnum.GET) {
       if (!isString(params)) {
         // 给 get 请求加上时间戳参数，避免从缓存中拿数据。
-        config.params = Object.assign(params || {}, createNow(joinTime, false));
+        config.params = Object.assign(params || {}, joinTimestamp(joinTime, false));
       } else {
         // 兼容restful风格
-        config.url = config.url + params + `${createNow(joinTime, true)}`;
+        config.url = config.url + params + `${joinTimestamp(joinTime, true)}`;
         config.params = undefined;
       }
     } else {
@@ -173,7 +171,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
         // 接口可能会有通用的地址部分，可以统一抽取出来
-        prefixUrl: prefix,
+        urlPrefix: urlPrefix,
         headers: { 'Content-Type': ContentTypeEnum.JSON },
         // 如果是form-data格式
         // headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
-- 
GitLab