From 12b8d3cdfdf42c6f5f7d2120c2c0a09973af2241 Mon Sep 17 00:00:00 2001
From: yinbangzhong <zhongbangyin@126.com>
Date: 星期二, 13 八月 2024 19:31:57 +0800
Subject: [PATCH] 用户字段调整
---
src/api/interceptor.ts | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index 000000d..a58d192 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,17 +34,15 @@
// 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}`;
}
-
- config.headers.Authorization = 'Ijg3NmFjZjJlNGIzMzExZWY4NzI0MDI0MmFjMTIwMDA2Ig.ZqNvxw.Kgp8PcT4n2cxpzxFrYHttO4i2Eo';
+ // config.headers.Authorization =
+ // 'ImE4NGQ4ZWNjNGVmYjExZWZiZjRkMDI0MmFjMTIwMDA2Ig.ZqnIBw.ZX7_UxnSBKu8x_riQ5FrHLMAS78';
return config;
},
(error) => {
@@ -51,9 +54,11 @@
axios.interceptors.response.use(
(response: AxiosResponse<HttpResponse>) => {
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 && res.code !== 200)
+ ) {
Message.error({
content: res.msg || 'Error',
duration: 5 * 1000,
@@ -70,7 +75,6 @@
okText: 'Re-Login',
async onOk() {
const userStore = useUserStore();
-
await userStore.logout();
window.location.reload();
},
@@ -79,7 +83,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