From 23412e0effa27d5d0f79f5796bc4e738cf8cd1fc Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Fri, 03 Mar 2023 16:08:49 +0800
Subject: [PATCH] 更新
---
src/utils/request.ts | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f8844cb..ed8cf58 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,22 +1,28 @@
import axios from 'axios';
-import { ElMessage } from 'element-plus';
-import { Session } from '/@/utils/storage';
+import { ElMessage, ElMessageBox } from 'element-plus';
import JSONbig from 'json-bigint';
+import Cookies from 'js-cookie';
+import { useLoginApi } from '/@/api/login';
+import { Session } from '/@/utils/storage';
// var jsonBig = require('json-bigint')({ "storeAsString": true });
// 配置新建一个 axios 实例
const service = axios.create({
- baseURL: import.meta.env.VITE_API_URL as any,
+ // baseURL: import.meta.env.VITE_API_URL as any,
timeout: 50000,
headers: { 'Content-Type': 'application/json' }
});
service.interceptors.request.use(
(config) => {
- // 在发送请求之前做些什么 token
- if (Session.get('token')) {
- (<any>config.headers).common['Authorization'] = `${Session.get('token')}`;
- (<any>config.headers).common['uid'] = `${Session.get('uid')}`;
+ for (let key in config.data) {
+ if (config.data[key] == '' && config.data[key] !== 0) {
+ config.data[key] = null;
+ }
+ }
+ if (Cookies.get('token')) {
+ (<any>config.headers).common['Authorization'] = `${Cookies.get('token')}`;
+ (<any>config.headers).common['uid'] = `${Cookies.get('uid')}`;
}
return config;
},
@@ -28,15 +34,20 @@
service.defaults.transformResponse = [
function (data) {
- try {
+ try {
// 正常同通过return JSON.parse(data)对数据进行转换
// 但是转化完成的数据可能超出安全数据长度
// 因此我们定制使用第三包来转化
+ // if(data.indexOf('http://') === -1){
+ // return data
+ // }else{
+ // if(typeof JSON.parse(data) === 'object'){
+ // return JSONbig.parse(data);
+ // };
return JSONbig.parse(data);
} catch (err) {
- console.log(err);
// 转换失败返回一个空对象
- return {};
+ return data
}
}
];
@@ -46,14 +57,21 @@
// 对响应数据做点什么
if (response.data.code && response.data.code === 'A0213') {
ElMessage.error('用户uid不存在');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 2000);
+ useLoginApi()
+ .signOut()
+ .then(() => {
+ Session.clear();
+ window.location.href = '/';
+ });
} else if (response.data.code && response.data.code === 'A0215') {
ElMessage.error('token失效');
- Session.clear();
- window.location.href = '/';
+ // logOut;
+ useLoginApi()
+ .signOut()
+ .then(() => {
+ Session.clear();
+ window.location.href = '/';
+ });
}
// if(response.data.code && response.data.code !== '200'){
return Promise.resolve(response);
@@ -62,7 +80,6 @@
// window.location.href = '/'
// return Promise.reject(response)
// const res = response.data;
- // debugger
// if (res.code && res.code !== 0) {
// // `token` 过期或者账号已在别处登录
// if (res.code === 401 || res.code === 4001) {
@@ -81,10 +98,18 @@
// 对响应错误做点什么
if (error.message.indexOf('timeout') != -1) {
ElMessage.error('网络超时');
+ setTimeout(() => {
+ Session.clear();
+ window.location.href = '/';
+ }, 1000);
} else if (error.message == 'Network Error') {
ElMessage.error('网络连接错误');
+ setTimeout(() => {
+ Session.clear();
+ window.location.href = '/';
+ }, 1000);
} else {
- if (error.response.data) ElMessage.error(error.response.statusText);
+ if (error.response.data) ElMessage.error(error.response.data.error);
else ElMessage.error('接口路径找不到');
}
return Promise.reject(error);
--
Gitblit v1.9.2