From 5a705f9a44bcb105a8621b2e42e727ba2ca715d9 Mon Sep 17 00:00:00 2001
From: h_mo <596417202@qq.com>
Date: Tue, 20 Aug 2024 14:30:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor(http):=20=E5=8D=87=E7=BA=A7alova?=
 =?UTF-8?q?=E5=88=B0v3,=20=E4=BC=98=E5=8C=96=E7=8A=B6=E6=80=81=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vitePlugins.ts                          |  2 +-
 package.json                                  |  6 ++---
 src/pages/about/index.vue                     |  2 +-
 src/pages/index/index.vue                     |  2 +-
 src/pages/log/index.vue                       |  2 +-
 src/router/guard.ts                           |  2 --
 src/stores/modules/user.ts                    |  1 -
 .../{checkStatus.ts => faultTolerance.ts}     | 27 ++++++++++++++++++-
 src/utils/http/index.ts                       | 21 ++++++++++-----
 9 files changed, 48 insertions(+), 17 deletions(-)
 rename src/utils/http/{checkStatus.ts => faultTolerance.ts} (73%)

diff --git a/build/vitePlugins.ts b/build/vitePlugins.ts
index f614f3e..b3b8877 100644
--- a/build/vitePlugins.ts
+++ b/build/vitePlugins.ts
@@ -35,7 +35,7 @@ export function createVitePlugins({ isProd }: VitePluginConfig): PluginOption[]
           'uni-mini-router': ['useRouter', 'useRoute'],
         },
         {
-          alova: ['useRequest'],
+          'alova/client': ['useRequest'],
         },
       ],
       dts: 'typings/auto-imports.d.ts',
diff --git a/package.json b/package.json
index 986f20d..20a148b 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "postinstall": "weapp-tw patch"
   },
   "dependencies": {
-    "@alova/adapter-uniapp": "^1.2.2",
-    "@alova/mock": "^1.5.2",
+    "@alova/adapter-uniapp": "^2.0.4",
+    "@alova/mock": "^2.0.4",
     "@dcloudio/uni-app": "3.0.0-alpha-4020520240808001",
     "@dcloudio/uni-app-plus": "3.0.0-alpha-4020520240808001",
     "@dcloudio/uni-components": "3.0.0-alpha-4020520240808001",
@@ -52,7 +52,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020520240808001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020520240808001",
     "@multiavatar/multiavatar": "^1.0.7",
-    "alova": "^2.21.4",
+    "alova": "^3.0.9",
     "crypto-js": "^4.2.0",
     "lodash-es": "^4.17.21",
     "pinia": "^2.2.2",
diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index dedd434..1472bf1 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -19,7 +19,7 @@ function handleLoginOut() {
 <template>
   <view class="text-md pt-36">
     <view v-if="loggedIn" class="text-center">
-      <image class="h-56 w-56" :src="userInfo?.avatar" />
+      <image class="h-8 w-8" :src="userInfo?.avatar" />
       <view class="mt-2">
         {{ userInfo?.nickname }}
       </view>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index d719df5..1caa986 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -8,7 +8,7 @@ const appTitle = 'uniapp-vue3';
 
 <template>
   <view class="flex flex-col items-center gap-y-2 pt-36">
-    <image :src="logo" class="h-56 w-56" alt="" mode="widthFix" />
+    <image :src="logo" class="h-8 w-8" alt="" mode="widthFix" />
     <view class="text-xl font-semibold">
       {{ appTitle }}
     </view>
diff --git a/src/pages/log/index.vue b/src/pages/log/index.vue
index 34eff32..774abd3 100644
--- a/src/pages/log/index.vue
+++ b/src/pages/log/index.vue
@@ -12,7 +12,7 @@ const userStore = useUserStore();
     <view class="mt-36 text-center">
       登录后访问log
     </view>
-    <image class="my-4 h-48 w-48" :src="userStore.userInfo?.avatar" mode="aspectFit" lazy-load="false" binderror="" bindload="" />
+    <image class="my-4 h-8 w-8" :src="userStore.userInfo?.avatar" mode="aspectFit" lazy-load="false" binderror="" bindload="" />
     <view>{{ userStore.userInfo?.nickname }}</view>
   </view>
 </template>
diff --git a/src/router/guard.ts b/src/router/guard.ts
index fc82141..7e8fbad 100644
--- a/src/router/guard.ts
+++ b/src/router/guard.ts
@@ -8,7 +8,6 @@ export function createRouterGuard(router: Router) {
 
 function createBeforeEachGuard(router: Router) {
   router.beforeEach((to, _, next) => {
-    console.log('beforeEach', to);
     const _isLogin = isLogin();
     if (to && to?.meta?.ignoreAuth) {
       // 如果目标路由忽略验证直接跳转
@@ -39,6 +38,5 @@ function createAfterEachGuard(router: Router) {
       // 如果已经登录且目标页面是登录页面则跳转至首页
       router.replaceAll({ name: 'Home' });
     }
-    console.log('afterEach', to);
   });
 }
diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts
index cf78510..904e512 100644
--- a/src/stores/modules/user.ts
+++ b/src/stores/modules/user.ts
@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia';
-import { useRequest } from 'alova';
 import { getUserInfoApi } from '@/services/api/user';
 import type { UserInfoModel } from '@/services/model/userModel';
 import { login as loginApi } from '@/services/api/auth';
diff --git a/src/utils/http/checkStatus.ts b/src/utils/http/faultTolerance.ts
similarity index 73%
rename from src/utils/http/checkStatus.ts
rename to src/utils/http/faultTolerance.ts
index 2a0aa65..a0a23b2 100644
--- a/src/utils/http/checkStatus.ts
+++ b/src/utils/http/faultTolerance.ts
@@ -1,6 +1,12 @@
 import { Toast } from '@/utils/uniapi/prompt';
+import type { ResultEnum } from '@/enums/httpEnum';
 
-export function checkStatus(status: number, msg: string): void {
+/**
+ * Http错误处理
+ * @param status
+ * @param msg
+ */
+export function handleHttpStatus(status: number, msg: string): void {
   let errMessage = null;
   switch (status) {
       case 400:
@@ -49,3 +55,22 @@ export function checkStatus(status: number, msg: string): void {
     Toast(errMessage);
   }
 }
+
+/**
+ * 逻辑错误处理
+ */
+export function handleLogicError(errCode: ResultEnum, errMsg?: string) {
+  switch (errCode) {
+      case ResultEnum.ERROR:
+        // TODO ERROR处理
+        // ...
+        break;
+      case ResultEnum.FAIL:
+        // TODO FAIL处理
+        // ...
+        break;
+  }
+  if (errMsg) {
+    Toast(errMsg);
+  }
+}
diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts
index 5ec2d96..7ea9b1d 100644
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -1,7 +1,7 @@
 import { createAlova } from 'alova';
 import AdapterUniapp from '@alova/adapter-uniapp';
 import { assign } from 'lodash-es';
-import { checkStatus } from './checkStatus';
+import { handleHttpStatus, handleLogicError } from './faultTolerance';
 import { getBaseUrl, isUseMock } from '@/utils/env';
 import { mockAdapter } from '@/mock';
 import { ContentTypeEnum, ResultEnum } from '@/enums/httpEnum';
@@ -28,7 +28,7 @@ const alovaInstance = createAlova({
     /* #endif */
   }),
   timeout: 5000,
-  beforeRequest: (method) => {
+  beforeRequest: async (method) => {
     method.config.headers = assign(method.config.headers, ContentType);
     const { config } = method;
     const ignoreAuth = !config.meta?.ignoreAuth;
@@ -57,17 +57,26 @@ const alovaInstance = createAlova({
         if (code === ResultEnum.SUCCESS) {
           return data as any;
         }
-        checkStatus(statusCode, message || '');
+        // 逻辑错误处理，与业务相关
+        handleLogicError(code, message);
         throw new Error(`请求错误[${code}]：${message}`);
       }
-      throw new Error(`请求错误[${statusCode}]：${errMsg}`);
+      // 处理http状态错误
+      handleHttpStatus(statusCode, message || '');
+      throw new Error(`HTTP请求错误[${statusCode}]：${errMsg}`);
     },
 
     /**
      * 请求失败的拦截器，请求错误时将会进入该拦截器。
      */
-    onError: (err) => {
-      throw new Error(`请求错误：${err}`);
+    onError: async (err) => {
+      throw new Error(`请求失败：${err}`);
+    },
+    /**
+     * 请求完成的拦截器, 无论请求成功或失败都会进入该拦截器
+     */
+    onComplete: async () => {
+      // 处理请求完成逻辑
     },
   },
 });