From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/utils/request.ts | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 62a638f..72c5505 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,12 +1,14 @@
import axios from 'axios';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { Session } from '/@/utils/storage';
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' }
});
@@ -14,13 +16,13 @@
service.interceptors.request.use(
(config) => {
for (let key in config.data) {
- if (config.data[key] == '') {
+ if (config.data[key] == '' && config.data[key] !== 0) {
config.data[key] = null;
}
}
- if (Session.get('token')) {
- (<any>config.headers).common['Authorization'] = `${Session.get('token')}`;
- (<any>config.headers).common['uid'] = `${Session.get('uid')}`;
+ if (Cookies.get('token')) {
+ (<any>config.headers).common['Authorization'] = `${Cookies.get('token')}`;
+ (<any>config.headers).common['uid'] = `${Cookies.get('uid')}`;
}
return config;
},
@@ -50,12 +52,15 @@
// 对响应数据做点什么
if (response.data.code && response.data.code === 'A0213') {
ElMessage.error('用户uid不存在');
- Session.clear();
- window.location.href = '/';
+ 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);
@@ -83,8 +88,16 @@
// 对响应错误做点什么
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.data.error);
else ElMessage.error('接口路径找不到');
--
Gitblit v1.9.2