From 20459fe59f680031bfc7c1012be860e0727cb016 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 05 八月 2025 17:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/utils/request/index.ts | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 6cca864..b48c7ce 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -14,7 +14,7 @@
const RefreshTokenUrl = '/GetTokenByRefreshToken';
/** 璇锋眰鐧藉悕鍗曪紝鏀剧疆涓�浜涗笉闇�瑕乼oken鐨勬帴鍙ｏ紙閫氳繃璁剧疆璇锋眰鐧藉悕鍗曪紝闃叉token杩囨湡鍚庡啀璇锋眰閫犳垚鐨勬寰幆闂锛� */
-const whiteList = [RefreshTokenUrl, '/GetToken'];
+const whiteList = [RefreshTokenUrl, '/passwordLogin'];
let loadingInstance: ReturnType<typeof Loading.service>;
@@ -55,9 +55,13 @@
success: boolean;
data: any;
/**
+ * http鐘舵�佸悧
+ */
+ code?: number;
+ /**
* 閿欒鐮�
*/
- error?: number;
+ errorCode?: string;
/**
* 閿欒淇℃伅
*/
@@ -74,7 +78,7 @@
}
interface ErrorInfo {
- errorCode?: number;
+ errorCode?: string;
errorMessage?: string;
showType?: ErrorShowType;
data: any;
@@ -156,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';
@@ -199,7 +203,7 @@
return new Promise((resolve) => {
if (userInfo.accessToken && $config.withCredentials) {
$config.headers['Authorization'] = 'Bearer ' + userInfo.accessToken;
- $config.headers['X-Authorizatio'] = 'Bearer ' + userInfo.refreshToken;
+ $config.headers['X-Authorization'] = 'Bearer ' + userInfo.refreshToken;
resolve($config);
} else {
resolve($config);
@@ -227,6 +231,7 @@
const userStore = useUserStoreHook();
if (response.headers['x-access-token']) {
+ console.log('response: ', response);
userStore.setToken(response.headers['access-token']);
userStore.setUserInfo({
accessToken: response.headers['access-token'],
@@ -236,7 +241,7 @@
endLoading();
- return getResponse ? response : (response.data as any).result;
+ return getResponse ? response : response.data.data;
},
(error) => {
endLoading();
--
Gitblit v1.9.1