From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/api/http/request.ts | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/src/api/http/request.ts b/src/api/http/request.ts
index d1a0d6f..04dde7e 100644
--- a/src/api/http/request.ts
+++ b/src/api/http/request.ts
@@ -1,10 +1,14 @@
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)
}
const instance = axios.create({
@@ -17,9 +21,9 @@
instance.interceptors.request.use(
config => {
- config.headers['X-Auth-Token'] = getAuthToken()
+ config.headers[ELocalStorageKey.Token] = getAuthToken()
// config.headers[REQUEST_ID] = uuidv4()
- config.baseURL = CURRENT_CONFIG.baseURL
+ // config.baseURL = CURRENT_CONFIG.baseURL
return config
},
error => {
@@ -28,35 +32,58 @@
)
instance.interceptors.response.use(
- response => response,
+ response => {
+
+
+ // console.info('URL: ' + response.config.baseURL + response.config.url, '\nData: ', response.data, '\nResponse:', response)
+
+ //处理消息返回
+ // if (response.data.code && !response.data.success) {
+ // message.error(response.data.message)
+ // }
+ if (response.data.code != 5000) {
+ 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)
- }
- console.info('url: ', err?.config?.url, `【${err?.config?.method}】 \n>>>> err: `, err)
+ message.error(`ERROR_INFO: ${err}`)
+ // const requestId = err?.config?.headers && err?.config?.headers[REQUEST_ID]
+ // if (requestId) {
+ // console.info(REQUEST_ID, '：', requestId)
+ // }
+ // console.info('url: ', err?.config?.url, `【${err?.config?.method}】 \n>>>> err: `, err)
- let description = '-'
- if (err.response?.data && err.response.data.message) {
- description = err.response.data.message
- }
- if (err.response?.data && err.response.data.result) {
- description = err.response.data.result.message
- }
- // @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}`)
- }
- if (err.response?.status === 403) {
- // window.location.href = '/'
- }
- if (err.response?.status === 401) {
- console.log(err.response)
- }
-
+ // let description = '-'
+ // if (err.response?.data && err.response.data.message) {
+ // description = err.response.data.message
+ // }
+ // if (err.response?.data && err.response.data.result) {
+ // description = err.response.data.result.message
+ // }
+ // // @See: https://github.com/axios/axios/issues/383
+ // if (!err.response || !err.response.status) {
+ // message.error('The network is abnormal, please check the backend service and try again')
+ // return
+ // }
+ // 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.error(err.response)
+ // const flag: number = Number(localStorage.getItem(ELocalStorageKey.Flag))
+ // switch (flag) {
+ // case EUserType.Web:
+ // router.push(ERouterName.LOGIN)
+ // break
+ // case EUserType.Pilot:
+ // router.push(ERouterName.PILOT)
+ // break
+ // }
+ // }
return Promise.reject(err)
},
)
--
Gitblit v1.9.3