From 66d33a33b254d9db7a9dfa7c178d0aeb234f4fb8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 08 八月 2025 14:13:43 +0800
Subject: [PATCH] fix: 修改

---
 src/utils/request/index.ts |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 6cca864..e11bb12 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;
@@ -116,6 +120,9 @@
         const errorInfo: ErrorInfo | undefined = (error as any).info;
         if (errorInfo) {
           const { errorMessage, errorCode } = errorInfo;
+          if (Number(errorCode) === 401) {
+            handleLogout();
+          }
           switch (errorInfo.showType) {
             case ErrorShowType.SILENT:
               // do nothing
@@ -141,7 +148,7 @@
       } else if ((error as AxiosError<ResponseStructure, IRequestOptions>).response) {
         // Axios 鐨勯敊璇�
         // 璇锋眰鎴愬姛鍙戝嚭涓旀湇鍔″櫒涔熷搷搴斾簡鐘舵�佺爜锛屼絾鐘舵�佷唬鐮佽秴鍑轰簡 2xx 鐨勮寖鍥�
-        handleAxiosResponseError(error as AxiosError<ErrorResponse, IRequestOptions>);
+        handleAxiosResponseError(error as AxiosError<ResponseStructure, IRequestOptions>);
         // Message.errorMessage(`Response status:${(error as AxiosError).response.status}`);
       } else if ((error as AxiosError).request) {
         // 璇锋眰宸茬粡鎴愬姛鍙戣捣锛屼絾娌℃湁鏀跺埌鍝嶅簲
@@ -156,7 +163,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 +206,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);
@@ -236,7 +243,7 @@
 
         endLoading();
 
-        return getResponse ? response : (response.data as any).result;
+        return getResponse ? response : response.data.data;
       },
       (error) => {
         endLoading();
@@ -260,18 +267,18 @@
   [505]: 'HTTP鐗堟湰涓嶅彈鏀寔',
 };
 
-function handleAxiosResponseError(error: AxiosError<ErrorResponse, IRequestOptions>) {
+function handleAxiosResponseError(error: AxiosError<ResponseStructure, IRequestOptions>) {
   if (error.response.config.url.toLowerCase().includes(RefreshTokenUrl.toLowerCase())) {
     handleLogout();
     return;
   }
   if (error && error.response) {
     let message = ErrorMessageMap[error.response?.status] ?? '璇锋眰閿欒';
-    if (error.response.data?.error?.message) {
-      message = error.response.data?.error?.message;
+    if (error.response.data?.msg) {
+      message = error.response.data?.msg;
     }
 
-    if (error.response?.status === 401) {
+    if (error.response?.status === 401 || error.response.data.code === 401) {
       handleLogout();
     }
     Message.errorMessage(message);

--
Gitblit v1.9.1