From 650a84730f4418ebbcdc58bbadd4d56f5dd3c8fd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 14:01:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/utils/request/index.ts | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 3ebb819..eaabecb 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';
@@ -15,7 +14,7 @@
const RefreshTokenUrl = '/GetTokenByRefreshToken';
/** 璇锋眰鐧藉悕鍗曪紝鏀剧疆涓�浜涗笉闇�瑕乼oken鐨勬帴鍙ｏ紙閫氳繃璁剧疆璇锋眰鐧藉悕鍗曪紝闃叉token杩囨湡鍚庡啀璇锋眰閫犳垚鐨勬寰幆闂锛� */
-const whiteList = [RefreshTokenUrl, '/GetToken'];
+const whiteList = [RefreshTokenUrl, '/passwordLogin'];
let loadingInstance: ReturnType<typeof Loading.service>;
@@ -56,9 +55,13 @@
success: boolean;
data: any;
/**
+ * http鐘舵�佸悧
+ */
+ code?: number;
+ /**
* 閿欒鐮�
*/
- error?: number;
+ errorCode?: string;
/**
* 閿欒淇℃伅
*/
@@ -75,7 +78,7 @@
}
interface ErrorInfo {
- errorCode?: number;
+ errorCode?: string;
errorMessage?: string;
showType?: ErrorShowType;
data: any;
@@ -157,7 +160,7 @@
// 閿欒鎶涘嚭
errorThrower: (res) => {
- const { success, data, error: errorCode, msg, showType } = res;
+ const { success, data, errorCode, msg, showType } = res;
if (!success) {
const error: any = new Error(msg);
error.name = 'BizError';
@@ -176,9 +179,9 @@
NProgress.start();
}
- const token = getToken();
+ const userStore = useUserStoreHook();
- const userInfo = getUserInfo();
+ const userInfo = userStore.userInfo;
const { showLoading = true, mock } = $config;
@@ -198,31 +201,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-Authorization'] = 'Bearer ' + userInfo.refreshToken;
+ resolve($config);
} else {
resolve($config);
}
@@ -246,9 +228,19 @@
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;
+ return getResponse ? response : response.data.data;
},
(error) => {
endLoading();
--
Gitblit v1.9.1