From 6ca18b4bc2af917e9484ed3fcb1c3ad30c24eaa3 Mon Sep 17 00:00:00 2001
From: Huang <596417202@qq.com>
Date: Mon, 19 Sep 2022 16:14:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E5=A4=9A=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AEBASE=5FURL=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development          |  9 +--------
 src/env.d.ts              |  1 -
 src/manifest.json         | 25 ++++++++++++++++++-------
 src/state/modules/auth.ts |  1 -
 src/utils/env.ts          | 26 +++++++++++++++++++++++++-
 src/utils/http/index.ts   |  4 ++--
 vite.config.ts            |  4 ++--
 7 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/.env.development b/.env.development
index ac664ac..05f1b9a 100644
--- a/.env.development
+++ b/.env.development
@@ -3,15 +3,8 @@ VITE_PROD = false
 VITE_DEV = true
 
 # BASE_URL
-VITE_BASE_URL = /api
-
-# PROXY_BASE_URL
-# 仅H5跨域需使用proxy,其他端请直接设置 VITE_BASE_URL 即可
-VITE_PROXY_BASE_URL = https://api-catch.ranesuangyu.top
+VITE_BASE_URL = https://api-catch.ranesuangyu.top
 
 # 上传域名
 VITE_UPLOAD_URL = /upload
 
-# 代理上传域名
-VITE_PROXY_UPLOAD_URL = 'YOUR UPLOAD URL'
-
diff --git a/src/env.d.ts b/src/env.d.ts
index 9be13c6..d22652f 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -11,7 +11,6 @@ interface ImportMetaEnv {
   readonly VITE_ENV: string;
   readonly VITE_APP_TITLE: string;
   readonly VITE_BASE_URL: string;
-  readonly VITE_PROXY_BASE_URL: string;
   readonly VITE_UPLOAD_URL: string;
   readonly VITE_PROD: boolean;
   readonly VITE_DEV: boolean;
diff --git a/src/manifest.json b/src/manifest.json
index c5a9281..5c00015 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -18,8 +18,8 @@
         },
         /* 模块配置 */
         "modules" : {},
-        "optimization": {
-            "subPackages": true
+        "optimization" : {
+            "subPackages" : true
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -62,14 +62,14 @@
         },
         "usingComponents" : true,
         "permission" : {},
-        "optimization": {
-            "subPackages": true
+        "optimization" : {
+            "subPackages" : true
         }
     },
     "mp-alipay" : {
         "usingComponents" : true,
-        "optimization": {
-            "subPackages": true
+        "optimization" : {
+            "subPackages" : true
         }
     },
     "mp-baidu" : {
@@ -90,6 +90,17 @@
         "devServer" : {
             "https" : false
         },
-        "title" : "uniapp_vue3_vite_ts"
+        "title" : "uniapp_vue3_vite_ts",
+        "unipush" : {
+            "enable" : false
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        }
     }
 }
diff --git a/src/state/modules/auth.ts b/src/state/modules/auth.ts
index 0203e2f..6cdfbaf 100644
--- a/src/state/modules/auth.ts
+++ b/src/state/modules/auth.ts
@@ -45,7 +45,6 @@ export const useAuthStore = defineStore({
      * @description 登出
      */
     async loginOut(): Promise<any> {
-      console.log('~~loginOut请求');
       try {
         const res = await logout();
         removeCache(TOKEN_KEY);
diff --git a/src/utils/env.ts b/src/utils/env.ts
index c37881b..2962fac 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -1,6 +1,10 @@
 import pkg from '../../package.json';
+import { judgePlatform } from '@/utils/platform';
+import { PLATFORMS } from '@/enums/platformEnum';
 
-// Generate cache key according to version
+/**
+ * @description: Generate cache key according to version
+ */
 export function getPkgVersion() {
   return `${`__${pkg.version}`}__`.toUpperCase();
 }
@@ -51,3 +55,23 @@ export function isDevMode(): boolean {
 export function isProdMode(): boolean {
   return getEnvValue<boolean>('VITE_PROD');
 }
+
+/**
+ * @description: Get environment VITE_BASE_URL value
+ * @returns:
+ * @example:
+ */
+export function getBaseUrl(): string {
+  if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/api';
+  return getEnvValue<string>('VITE_BASE_URL');
+}
+
+/**
+ * @description: Get environment VITE_UPLOAD_URL value
+ * @returns:
+ * @example:
+ */
+export function getUploadUrl(): string {
+  if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/upload';
+  return getEnvValue<string>('VITE_UPLOAD_URL');
+}
diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts
index 0cc32d1..4a737b9 100644
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -1,11 +1,11 @@
 import Request from 'luch-request';
 import { assign } from 'lodash-es';
 import { Toast } from '@/utils/uniapi/prompt';
-import { getEnvValue } from '@/utils/env';
+import { getBaseUrl } from '@/utils/env';
 import { useAuthStore } from '@/state/modules/auth';
 import { ResultEnum } from '@/enums/httpEnum';
 
-const BASE_URL = getEnvValue<string>('VITE_BASE_URL');
+const BASE_URL = getBaseUrl();
 const HEADER = {
   'Content-Type': 'application/json;charset=UTF-8;',
   Accept: 'application/json, text/plain, */*',
diff --git a/vite.config.ts b/vite.config.ts
index a1d6694..ecf6eed 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -31,12 +31,12 @@ export default ({ mode }: ConfigEnv): UserConfig => {
       host: true,
       proxy: {
         '/api': {
-          target: env.VITE_PROXY_BASE_URL,
+          target: env.VITE_BASE_URL,
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, ''),
         },
         '/upload': {
-          target: env.VITE_PROXY_UPLOAD_URL,
+          target: env.VITE_BASE_URL,
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/upload/, ''),
         },