From 5773bf718397e8a7073b935d989259ef0cb29219 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 05 二月 2024 19:20:34 +0800
Subject: [PATCH] Merge branch 'reportWorkAppFile/reportWorkApp' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into reportWorkAppFile/reportWorkApp
---
src/common/utils/request.ts | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/common/utils/request.ts b/src/common/utils/request.ts
index 0522895..4e350ed 100644
--- a/src/common/utils/request.ts
+++ b/src/common/utils/request.ts
@@ -1,8 +1,10 @@
-import axios from 'axios'
+import axiosClient from 'axios'
+import type { AxiosRequestConfig } from 'axios'
import { ElMessage } from 'element-plus'
import { getToken } from '@/common/utils/index'
+import router from '../../router/index'
-const Axios = axios.create({
+const instance = axiosClient.create({
responseType: 'json',
withCredentials: true // 鍏佽鎼哄甫 cookie
})
@@ -10,11 +12,15 @@
/**
* 璇锋眰鎷︽埅鍣�
*/
-Axios.interceptors.request.use(
+instance.interceptors.request.use(
(config) => {
// 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
const token = getToken()
- if (token) {
+ if ((token == null || token == '' || token == 'undefined') && config.url != '/api/base/login') {
+ router.push('/login')
+ return config
+ // window.location = `//${window.location.hostname}:9080`+'/login'
+ } else if (token) {
config.headers.Authorization = 'Bearer ' + token
}
@@ -28,17 +34,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 +65,6 @@
}
)
-export default Axios
+const axios = <T>(cfg: AxiosRequestConfig) => instance.request<any, T>(cfg)
+
+export default axios
--
Gitblit v1.8.0