From 3a4e0e2208a48c43639cdd4a7ef883a11e747fbf Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 02 十一月 2023 16:51:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/common/utils/request.ts | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/common/utils/request.ts b/src/common/utils/request.ts
index 0522895..48a8aed 100644
--- a/src/common/utils/request.ts
+++ b/src/common/utils/request.ts
@@ -1,8 +1,9 @@
-import axios from 'axios'
+import axiosClient from 'axios'
+import type { AxiosRequestConfig } from 'axios'
import { ElMessage } from 'element-plus'
import { getToken } from '@/common/utils/index'
-const Axios = axios.create({
+const instance = axiosClient.create({
responseType: 'json',
withCredentials: true // 鍏佽鎼哄甫 cookie
})
@@ -10,7 +11,7 @@
/**
* 璇锋眰鎷︽埅鍣�
*/
-Axios.interceptors.request.use(
+instance.interceptors.request.use(
(config) => {
// 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
const token = getToken()
@@ -28,17 +29,17 @@
/**
* 鍝嶅簲鎷︽埅鍣�
*/
-Axios.interceptors.response.use(
+instance.interceptors.response.use(
(res) => {
if (res.data.code == 200) {
- return res.data ?? {}
+ return res.data
} else {
ElMessage({
message: res.data.msg,
type: 'error',
duration: 3 * 1000
})
- return res.data ?? {}
+ return Promise.reject(res?.data)
}
},
(error) => {
@@ -59,4 +60,6 @@
}
)
-export default Axios
+const axios = <T>(cfg: AxiosRequestConfig) => instance.request<any, T>(cfg)
+
+export default axios
--
Gitblit v1.8.0