From 79240a29f847d37f76f3bb6fdf526396d5806fe4 Mon Sep 17 00:00:00 2001
From: h_mo <596417202@qq.com>
Date: Tue, 20 Aug 2024 15:39:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(build):=20=E7=AE=80=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=9B=B4=E6=96=B0HTTP?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=8F=90=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?proxy.ts=E4=B8=AD=E4=BB=A5=E7=AE=80=E5=8C=96vite.config.ts?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BB=A3=E7=A0=81=E3=80=82=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86faultTolerance.ts=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84HTTP=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=85=B7=E4=BD=93=E7=9A=84ResultEnum?=
 =?UTF-8?q?=E6=9B=BF=E4=BB=A3=E7=B1=BB=E5=9E=8B=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E7=9A=84=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/index.ts                   |  3 +++
 build/proxy.ts                   | 19 +++++++++++++++++++
 src/utils/http/faultTolerance.ts |  2 +-
 vite.config.ts                   | 17 ++---------------
 4 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 build/index.ts
 create mode 100644 build/proxy.ts

diff --git a/build/index.ts b/build/index.ts
new file mode 100644
index 0000000..82f2545
--- /dev/null
+++ b/build/index.ts
@@ -0,0 +1,3 @@
+export * from './platform';
+export * from './proxy';
+export * from './vitePlugins';
diff --git a/build/proxy.ts b/build/proxy.ts
new file mode 100644
index 0000000..315f809
--- /dev/null
+++ b/build/proxy.ts
@@ -0,0 +1,19 @@
+/**
+ * Configure according to the proxy list
+ * @param proxyList
+ */
+export function resolveProxy(proxyList: [string, string][] = []) {
+  const proxy: Record<string, ProxyOptions> = {};
+  for (const [prefix, target] of proxyList) {
+    const isHttps = /^https:\/\//.test(target);
+    proxy[prefix] = {
+      target,
+      changeOrigin: true,
+      ws: true,
+      rewrite: path => path.replace(new RegExp(`^${prefix}`), ''),
+      // https is require secure=false
+      ...(isHttps ? { secure: false } : {}),
+    };
+  }
+  return proxy;
+}
diff --git a/src/utils/http/faultTolerance.ts b/src/utils/http/faultTolerance.ts
index a0a23b2..57a0ddc 100644
--- a/src/utils/http/faultTolerance.ts
+++ b/src/utils/http/faultTolerance.ts
@@ -1,5 +1,5 @@
 import { Toast } from '@/utils/uniapi/prompt';
-import type { ResultEnum } from '@/enums/httpEnum';
+import { ResultEnum } from '@/enums/httpEnum';
 
 /**
  * Http错误处理
diff --git a/vite.config.ts b/vite.config.ts
index 8de4160..240169e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,15 +9,13 @@ import type { UserConfig } from 'vite';
 import { defineConfig, loadEnv } from 'vite';
 import TransformPages from 'uni-read-pages-vite';
 import postcssPlugins from './postcss.config';
-import { createVitePlugins } from './build/vitePlugins';
-import { currentPlatform } from './build/platform';
+import { createVitePlugins, currentPlatform, resolveProxy } from './build';
 
 export default defineConfig(async ({ mode }) => {
   const root = process.cwd();
   const env = loadEnv(mode, resolve(root, 'env'));
   const isProd = mode === 'production';
   const { VITE_PROXY_PREFIX, VITE_UPLOAD_PROXY_PREFIX, VITE_BASE_URL, VITE_UPLOAD_URL, VITE_PORT } = env;
-
   return {
     base: './',
     envDir: './env', // 自定义env目录
@@ -50,18 +48,7 @@ export default defineConfig(async ({ mode }) => {
       host: true,
       // open: true,
       port: Number.parseInt(VITE_PORT!, 10),
-      proxy: {
-        [VITE_PROXY_PREFIX!]: {
-          target: VITE_BASE_URL,
-          changeOrigin: true,
-          rewrite: (path: string) => path.replace(new RegExp(`^${VITE_PROXY_PREFIX}`), ''),
-        },
-        [VITE_UPLOAD_PROXY_PREFIX!]: {
-          target: VITE_UPLOAD_URL,
-          changeOrigin: true,
-          rewrite: (path: string) => path.replace(new RegExp(`^${VITE_UPLOAD_PROXY_PREFIX}`), ''),
-        },
-      },
+      proxy: resolveProxy([[VITE_PROXY_PREFIX, VITE_BASE_URL], [VITE_UPLOAD_PROXY_PREFIX, VITE_UPLOAD_URL]]),
     },
     // 构建配置
     build: {