From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分
---
src/api/http/request.ts | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/src/api/http/request.ts b/src/api/http/request.ts
index d1a0d6f..5d9c1f6 100644
--- a/src/api/http/request.ts
+++ b/src/api/http/request.ts
@@ -1,12 +1,16 @@
import axios from 'axios'
import { uuidv4 } from '/@/utils/uuid'
import { CURRENT_CONFIG } from './config'
+import { message } from 'ant-design-vue'
+import router from '/@/router'
+import { ELocalStorageKey, ERouterName, EUserType } from '/@/types/enums'
export * from './type'
+
const REQUEST_ID = 'X-Request-Id'
function getAuthToken () {
- return localStorage.getItem('x-auth-token')
+ return localStorage.getItem(ELocalStorageKey.Token)
}
-
+console.log(import.meta.env.VITE_API_URL, 'request.ts')
const instance = axios.create({
// withCredentials: true,
headers: {
@@ -17,9 +21,10 @@
instance.interceptors.request.use(
config => {
- config.headers['X-Auth-Token'] = getAuthToken()
+ config.headers[ELocalStorageKey.Token] = localStorage.getItem(ELocalStorageKey.Token)
+ config.baseURL = import.meta.env.VITE_API_URL
// config.headers[REQUEST_ID] = uuidv4()
- config.baseURL = CURRENT_CONFIG.baseURL
+ // config.baseURL = CURRENT_CONFIG.baseURL
return config
},
error => {
@@ -28,10 +33,23 @@
)
instance.interceptors.response.use(
- response => response,
+ response => {
+ // console.info('URL: ' + response.config.baseURL + response.config.url, '\nData: ', response.data, '\nResponse:', response)
+ const whiteList = ['/manage/api/v1/live/streams/stop']
+ if (whiteList.includes(response.config.url)) {
+ return Promise.reject(response.data)
+ }
+ // 处理消息返回
+ // if (response.data.code && !response.data.success) {
+ // message.error(response.data.message)
+ // }
+ if (response.data.code && response.data.code !== 0) {
+ message.error(response.data.message)
+ }
+ return response
+ },
err => {
const requestId = err?.config?.headers && err?.config?.headers[REQUEST_ID]
- console.info('')
if (requestId) {
console.info(REQUEST_ID, '：', requestId)
}
@@ -46,17 +64,27 @@
}
// @See: https://github.com/axios/axios/issues/383
if (!err.response || !err.response.status) {
- console.log('The network is abnormal, please check the network and try again')
- } else if (err.response?.status !== 200) {
- console.log(`ERROR_CODE: ${err.response?.status}`)
+ message.error('The network is abnormal, please check the backend service and try again')
+ return
}
- if (err.response?.status === 403) {
- // window.location.href = '/'
+ if (err.response?.status !== 200) {
+ message.error(`ERROR_CODE: ${err.response?.status}`)
}
+ // if (err.response?.status === 403) {
+ // // window.location.href = '/'
+ // }
if (err.response?.status === 401) {
- console.log(err.response)
+ console.error(err.response)
+ const flag: number = Number(localStorage.getItem(ELocalStorageKey.Flag))
+ switch (flag) {
+ case EUserType.Web:
+ router.push(ERouterName.PROJECT_LIST)
+ break
+ case EUserType.Pilot:
+ router.push(ERouterName.PILOT)
+ break
+ }
}
-
return Promise.reject(err)
},
)
--
Gitblit v1.9.3