From b6107c2cb71fc5216d67bbfa941a3ec115b0dafb Mon Sep 17 00:00:00 2001
From: liudong <liudong>
Date: 星期三, 31 七月 2024 15:41:27 +0800
Subject: [PATCH] 测试页面bug的修改
---
src/api/interceptor.ts | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index 416e246..1dc650c 100644
--- a/src/api/interceptor.ts
+++ b/src/api/interceptor.ts
@@ -2,7 +2,12 @@
import type { AxiosRequestConfig, AxiosResponse } from 'axios';
import { Message, Modal } from '@arco-design/web-vue';
import { useUserStore } from '@/store';
-import { getAuthorization, getToken, setAuthorization } from "@/utils/auth";
+import {
+ getAuthorization,
+ getToken,
+ setAuthorization,
+ setToken,
+} from '@/utils/auth';
export interface HttpResponse<T = unknown> {
status: number;
@@ -12,9 +17,9 @@
}
if (import.meta.env.VITE_API_BASE_URL) {
- axios.defaults.baseURL = import.meta.env.VITE_API_BASE_URL;
+ // axios.defaults.baseURL = import.meta.env.VITE_API_BASE_URL;
}
-
+axios.defaults.withCredentials = true;
axios.interceptors.request.use(
(config: AxiosRequestConfig) => {
// let each request carry token
@@ -29,14 +34,12 @@
// config.headers.Authorization = `Bearer ${token}`;
// }
-
const authorization = getAuthorization();
if (authorization) {
if (!config.headers) {
config.headers = {};
}
- config.headers.Authorization = authorization;
- config.headers.token = getToken();
+ config.headers.Authorization = `${authorization}`;
}
return config;
},
@@ -51,7 +54,10 @@
const res = response.data;
// if the custom code is not 20000, it is judged as an error.
- if ((res.retcode && res.retcode !== 0) || (res.code && res.code !== 20000)) {
+ if (
+ (res.retcode && res.retcode !== 0) ||
+ (res.code && res.code !== 20000)
+ ) {
Message.error({
content: res.msg || 'Error',
duration: 5 * 1000,
@@ -68,7 +74,6 @@
okText: 'Re-Login',
async onOk() {
const userStore = useUserStore();
-
await userStore.logout();
window.location.reload();
},
@@ -77,7 +82,10 @@
return Promise.reject(new Error(res.msg || 'Error'));
}
- if(response.config.url === '/v1/user/login') {
+ if (
+ response.config.url === '/v1/user/login' ||
+ response.config.url === '/base/login'
+ ) {
setAuthorization(response.headers.authorization);
}
return res;
--
Gitblit v1.8.0