From 11d3f395caf7e2268630090eb34f4e5c114a96b7 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: 星期五, 26 二月 2021 23:30:22 +0800
Subject: [PATCH] fix: ensure to request the interface correctly
---
src/api/sys/menu.ts | 4 +---
src/api/sys/user.ts | 7 +++----
src/api/demo/select.ts | 4 ++--
src/api/demo/account.ts | 4 +---
types/config.d.ts | 2 +-
src/api/demo/error.ts | 4 +---
src/api/demo/table.ts | 4 +---
src/utils/http/axios/Axios.ts | 1 +
8 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/api/demo/account.ts b/src/api/demo/account.ts
index a884fd0..54bed48 100644
--- a/src/api/demo/account.ts
+++ b/src/api/demo/account.ts
@@ -1,12 +1,10 @@
import { defHttp } from '/@/utils/http/axios';
import { GetAccountInfoModel } from './model/accountModel';
-const { get } = defHttp;
-
enum Api {
ACCOUNT_INFO = '/account/getAccountInfo',
}
// Get personal center-basic settings
-export const accountInfoApi = () => get<GetAccountInfoModel>({ url: Api.ACCOUNT_INFO });
+export const accountInfoApi = () => defHttp.get<GetAccountInfoModel>({ url: Api.ACCOUNT_INFO });
diff --git a/src/api/demo/error.ts b/src/api/demo/error.ts
index 14d8e2a..3ce6072 100644
--- a/src/api/demo/error.ts
+++ b/src/api/demo/error.ts
@@ -1,7 +1,5 @@
import { defHttp } from '/@/utils/http/axios';
-const { get } = defHttp;
-
enum Api {
// The address does not exist
Error = '/error',
@@ -11,4 +9,4 @@
* @description: Trigger ajax error
*/
-export const fireErrorApi = () => get({ url: Api.Error });
+export const fireErrorApi = () => defHttp.get({ url: Api.Error });
diff --git a/src/api/demo/select.ts b/src/api/demo/select.ts
index f27aeae..30030ae 100644
--- a/src/api/demo/select.ts
+++ b/src/api/demo/select.ts
@@ -1,6 +1,5 @@
import { defHttp } from '/@/utils/http/axios';
import { DemoOptionsGetResultModel } from './model/optionsModel';
-const { get } = defHttp;
enum Api {
OPTIONS_LIST = '/select/getDemoOptions',
@@ -9,4 +8,5 @@
/**
* @description: Get sample options value
*/
-export const optionsListApi = () => get<DemoOptionsGetResultModel>({ url: Api.OPTIONS_LIST });
+export const optionsListApi = () =>
+ defHttp.get<DemoOptionsGetResultModel>({ url: Api.OPTIONS_LIST });
diff --git a/src/api/demo/table.ts b/src/api/demo/table.ts
index 4f1012e..6a5dcee 100644
--- a/src/api/demo/table.ts
+++ b/src/api/demo/table.ts
@@ -1,8 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { DemoParams, DemoListGetResultModel } from './model/tableModel';
-const { get } = defHttp;
-
enum Api {
DEMO_LIST = '/table/getDemoList',
}
@@ -12,7 +10,7 @@
*/
export const demoListApi = (params: DemoParams) =>
- get<DemoListGetResultModel>({
+ defHttp.get<DemoListGetResultModel>({
url: Api.DEMO_LIST,
params,
headers: {
diff --git a/src/api/sys/menu.ts b/src/api/sys/menu.ts
index b81f72d..bf75745 100644
--- a/src/api/sys/menu.ts
+++ b/src/api/sys/menu.ts
@@ -1,8 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { getMenuListByIdParams, getMenuListByIdParamsResultModel } from './model/menuModel';
-const { get } = defHttp;
-
enum Api {
GetMenuListById = '/getMenuListById',
}
@@ -12,5 +10,5 @@
*/
export const getMenuListById = (params: getMenuListByIdParams) => {
- return get<getMenuListByIdParamsResultModel>({ url: Api.GetMenuListById, params });
+ return defHttp.get<getMenuListByIdParamsResultModel>({ url: Api.GetMenuListById, params });
};
diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index f5b4b1e..3a62315 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -7,7 +7,6 @@
} from './model/userModel';
import { ErrorMessageMode } from '/@/utils/http/axios/types';
-const { post, get } = defHttp;
enum Api {
Login = '/login',
GetUserInfoById = '/getUserInfoById',
@@ -18,7 +17,7 @@
* @description: user login api
*/
export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') {
- return post<LoginResultModel>(
+ return defHttp.post<LoginResultModel>(
{
url: Api.Login,
params,
@@ -33,14 +32,14 @@
* @description: getUserInfoById
*/
export function getUserInfoById(params: GetUserInfoByUserIdParams) {
- return get<GetUserInfoByUserIdModel>({
+ return defHttp.get<GetUserInfoByUserIdModel>({
url: Api.GetUserInfoById,
params,
});
}
export function getPermCodeByUserId(params: GetUserInfoByUserIdParams) {
- return get<string[]>({
+ return defHttp.get<string[]>({
url: Api.GetPermCodeByUserId,
params,
});
diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index 56cc126..377e3e1 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -195,6 +195,7 @@
}
conf = this.supportFormData(conf);
+
return new Promise((resolve, reject) => {
this.axiosInstance
.request<any, AxiosResponse<Result>>(conf)
diff --git a/types/config.d.ts b/types/config.d.ts
index e0f4394..a37d8ee 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -9,7 +9,7 @@
import { CacheTypeEnum } from '/@/enums/cacheEnum';
import type { LocaleType } from '/@/locales/types';
-import { ThemeMode } from '../../build/config/themeConfig';
+import { ThemeMode } from '../build/config/themeConfig';
export interface MenuSetting {
bgColor: string;
--
Gitblit v1.8.0