From 5a1616f169d75ece07d2d12a8edac3e5f660a920 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 09:36:16 +0800
Subject: [PATCH] 合并
---
src/utils/request.ts | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 14169b4..0c09f3b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,9 @@
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 实例
@@ -18,9 +20,9 @@
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;
},
@@ -40,7 +42,8 @@
} catch (err) {
console.log(err);
// 转换失败返回一个空对象
- return {};
+ return {
+ };
}
}
];
@@ -50,16 +53,21 @@
// 对响应数据做点什么
if (response.data.code && response.data.code === 'A0213') {
ElMessage.error('用户uid不存在');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 1000);
+ useLoginApi()
+ .signOut()
+ .then(() => {
+ Session.clear();
+ window.location.href = '/';
+ });
} else if (response.data.code && response.data.code === 'A0215') {
ElMessage.error('token失效');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 1000);
+ // logOut;
+ useLoginApi()
+ .signOut()
+ .then(() => {
+ Session.clear();
+ window.location.href = '/';
+ });
}
// if(response.data.code && response.data.code !== '200'){
return Promise.resolve(response);
@@ -68,7 +76,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) {
--
Gitblit v1.9.2