From 19fb7e7af8464bc88088d8bbc80c481752827994 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 04 八月 2025 14:31:19 +0800
Subject: [PATCH] fix: 修改底层
---
src/utils/request/index.ts | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 3c654d4..6cca864 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -3,7 +3,6 @@
import qs from 'qs';
import NProgress from '../progress';
import { loadEnv } from '@build/index';
-import { getToken, getUserInfo } from '../storage';
import { useUserStoreHook } from '@/store/modules/user';
import { ElLoading as Loading, ElNotification } from 'element-plus';
import { router } from '@/router';
@@ -170,16 +169,15 @@
requestInterceptors: [
[
(config) => {
- console.log('req config: ', config);
const $config = config;
// 寮�鍚繘搴︽潯鍔ㄧ敾
if (config.needNProcess) {
NProgress.start();
}
- const token = getToken();
+ const userStore = useUserStoreHook();
- const userInfo = getUserInfo();
+ const userInfo = userStore.userInfo;
const { showLoading = true, mock } = $config;
@@ -199,31 +197,10 @@
}
return new Promise((resolve) => {
- if (token && $config.withCredentials) {
- if (tokenIsExpired(userInfo)) {
- if (!BoleRequest.refreshTokenPending) {
- const userStore = useUserStoreHook();
- BoleRequest.refreshTokenPending = true;
- // token杩囨湡鍒锋柊
- userStore
- .refreshToken({
- refreshToken: userInfo.refreshToken,
- clientId: userStore.accountInfo.client_id,
- })
- .then((res) => {
- $config.headers['Authorization'] = 'Bearer ' + res.accessToken;
- BoleRequest.requests.forEach((cb) => cb(res.accessToken));
- BoleRequest.requests = [];
- })
- .finally(() => {
- BoleRequest.refreshTokenPending = false;
- });
- }
- resolve(BoleRequest.retryOriginalRequest($config));
- } else {
- $config.headers['Authorization'] = 'Bearer ' + token;
- resolve($config);
- }
+ if (userInfo.accessToken && $config.withCredentials) {
+ $config.headers['Authorization'] = 'Bearer ' + userInfo.accessToken;
+ $config.headers['X-Authorizatio'] = 'Bearer ' + userInfo.refreshToken;
+ resolve($config);
} else {
resolve($config);
}
@@ -247,6 +224,16 @@
NProgress.done();
}
+ const userStore = useUserStoreHook();
+
+ if (response.headers['x-access-token']) {
+ userStore.setToken(response.headers['access-token']);
+ userStore.setUserInfo({
+ accessToken: response.headers['access-token'],
+ refreshToken: response.headers['x-access-token'],
+ });
+ }
+
endLoading();
return getResponse ? response : (response.data as any).result;
--
Gitblit v1.9.1