From 614360529729233f497a7c07c5c0460bb83288e5 Mon Sep 17 00:00:00 2001
From: Soybean <honghuangdc@gmail.com>
Date: Sat, 16 Jul 2022 00:13:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(projects):=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env-config.ts                             | 18 ++---
 .env.development                           |  2 +-
 .env.production                            |  4 +-
 .eslintrc.js                               | 89 ++++++++++------------
 .gitignore                                 |  2 +
 build/config/proxy.ts                      |  2 +-
 build/plugins/index.ts                     |  4 +-
 build/utils/index.ts                       |  4 +-
 package.json                               |  2 +-
 src/config/service.ts                      |  2 +-
 src/layouts/common/GlobalHeader/index.vue  |  2 +-
 src/layouts/common/SettingDrawer/index.vue |  2 +-
 src/router/index.ts                        |  4 +-
 src/service/request/index.ts               |  2 +-
 src/store/modules/auth/index.ts            |  2 +-
 src/typings/env.d.ts                       | 26 +++----
 src/typings/expose.d.ts                    |  5 ++
 src/typings/system.d.ts                    |  4 +-
 src/utils/common/pattern.ts                |  5 +-
 src/utils/service/error.ts                 |  4 +-
 src/utils/service/msg.ts                   | 19 ++---
 src/utils/service/transform.ts             |  2 +-
 tsconfig.json                              |  3 +-
 vite.config.ts                             |  2 +-
 24 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/.env-config.ts b/.env-config.ts
index 663e6b79..3eddb8b7 100644
--- a/.env-config.ts
+++ b/.env-config.ts
@@ -1,30 +1,30 @@
 /** 请求环境配置 */
-type ServiceEnv = Record<EnvType, EnvConfig>;
+type ServiceEnv = Record<ServiceEnvType, ServiceEnvConfig>;
 
-/** 环境配置 */
-const serviceEnvConfig: ServiceEnv = {
+/** 不同服务的环境配置 */
+const serviceEnv: ServiceEnv = {
   dev: {
     url: 'http://localhost:8080',
-    proxy: '/api'
+    proxy: '/proxy-flag'
   },
   test: {
     url: 'http://localhost:8080',
-    proxy: '/api'
+    proxy: '/proxy-flag'
   },
   prod: {
     url: 'http://localhost:8080',
-    proxy: '/api'
+    proxy: '/proxy-flag'
   }
 };
 
 /**
- * 获取环境配置
- * @param env 环境描述
+ * 获取当前模式的环境配置
+ * @param env 环境
  */
 export function getEnvConfig(env: ImportMetaEnv) {
   const { VITE_ENV_TYPE = 'dev' } = env;
 
-  const envConfig = serviceEnvConfig[VITE_ENV_TYPE];
+  const envConfig = serviceEnv[VITE_ENV_TYPE];
 
   return envConfig;
 }
diff --git a/.env.development b/.env.development
index 8f01027c..84097462 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-VITE_HTTP_PROXY=1
+VITE_HTTP_PROXY=Y
diff --git a/.env.production b/.env.production
index ee2e998c..e7e90ab2 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
-VITE_VISUALIZER=0
+VITE_VISUALIZER=N
 
-VITE_COMPRESS=0
+VITE_COMPRESS=N
 
 # gzip | brotliCompress | deflate | deflateRaw
 VITE_COMPRESS_TYPE=gzip
diff --git a/.eslintrc.js b/.eslintrc.js
index 9331284d..9b8ea61d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,8 +1,7 @@
 module.exports = {
   env: {
     browser: true,
-    es2021: true,
-    'vue/setup-compiler-macros': true
+    es2021: true
   },
   globals: {
     PROJECT_BUILD_TIME: 'readonly',
@@ -26,40 +25,6 @@ module.exports = {
     '@vue/eslint-config-prettier',
     '@vue/typescript/recommended'
   ],
-  overrides: [
-    {
-      files: ['*.vue'],
-      rules: {
-        'no-undef': 'off'
-      }
-    },
-    {
-      files: ['*.html'],
-      rules: {
-        'vue/comment-directive': 'off'
-      }
-    },
-    {
-      files: ['*.json'],
-      rules: {
-        'no-unused-expressions': 'off'
-      }
-    }
-  ],
-  settings: {
-    'import/resolver': {
-      alias: {
-        map: [
-          ['~', '.'],
-          ['@', './src']
-        ],
-        extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.d.ts']
-      },
-      node: {
-        extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.d.ts']
-      }
-    }
-  },
   rules: {
     'import/extensions': [
       'warn',
@@ -69,7 +34,8 @@ module.exports = {
         jsx: 'never',
         mjs: 'never',
         ts: 'never',
-        tsx: 'never'
+        tsx: 'never',
+        mts: 'never'
       }
     ],
     'import/no-extraneous-dependencies': ['error', { devDependencies: true, peerDependencies: true }],
@@ -145,12 +111,12 @@ module.exports = {
             position: 'before'
           },
           {
-            pattern: '@/store',
+            pattern: '@/service',
             group: 'internal',
             position: 'before'
           },
           {
-            pattern: '@/composables',
+            pattern: '@/store',
             group: 'internal',
             position: 'before'
           },
@@ -160,12 +126,12 @@ module.exports = {
             position: 'before'
           },
           {
-            pattern: '@/hooks',
+            pattern: '@/composables',
             group: 'internal',
             position: 'before'
           },
           {
-            pattern: '@/service',
+            pattern: '@/hooks',
             group: 'internal',
             position: 'before'
           },
@@ -183,11 +149,6 @@ module.exports = {
             pattern: '@/**',
             group: 'internal',
             position: 'before'
-          },
-          {
-            pattern: '@/interface',
-            group: 'internal',
-            position: 'before'
           }
         ],
         pathGroupsExcludedImportTypes: ['vue', 'vue-router', 'vuex', 'pinia', 'naive-ui']
@@ -227,5 +188,39 @@ module.exports = {
       { vars: 'all', args: 'all', ignoreRestSiblings: false, varsIgnorePattern: '^_', argsIgnorePattern: '^_' }
     ],
     '@typescript-eslint/no-use-before-define': ['error', { classes: true, functions: false, typedefs: false }]
-  }
+  },
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['~', '.'],
+          ['@', './src']
+        ],
+        extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', 'mts', '.d.ts']
+      },
+      node: {
+        extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', 'mts', '.d.ts']
+      }
+    }
+  },
+  overrides: [
+    {
+      files: ['*.vue'],
+      rules: {
+        'no-undef': 'off'
+      }
+    },
+    {
+      files: ['*.html'],
+      rules: {
+        'vue/comment-directive': 'off'
+      }
+    },
+    {
+      files: ['*.json'],
+      rules: {
+        'no-unused-expressions': 'off'
+      }
+    }
+  ]
 };
diff --git a/.gitignore b/.gitignore
index b9e10d83..77e8507e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@ stats.html
 
 /src/typings/components.d.ts
 pnpm-lock.yaml
+package-lock.json
+yarn.lock
diff --git a/build/config/proxy.ts b/build/config/proxy.ts
index 07852805..86dbc0bd 100644
--- a/build/config/proxy.ts
+++ b/build/config/proxy.ts
@@ -5,7 +5,7 @@ import type { ProxyOptions } from 'vite';
  * @param isOpenProxy - 是否开启代理
  * @param envConfig - env环境配置
  */
-export function createViteProxy(isOpenProxy: boolean, envConfig: EnvConfig) {
+export function createViteProxy(isOpenProxy: boolean, envConfig: ServiceEnvConfig) {
   if (!isOpenProxy) return undefined;
 
   const proxy: Record<string, string | ProxyOptions> = {
diff --git a/build/plugins/index.ts b/build/plugins/index.ts
index 228fcc13..2a23f808 100644
--- a/build/plugins/index.ts
+++ b/build/plugins/index.ts
@@ -14,10 +14,10 @@ import compress from './compress';
 export function setupVitePlugins(viteEnv: ImportMetaEnv): (PluginOption | PluginOption[])[] {
   const plugins = [...vue, html(viteEnv), ...unplugin, unocss, mock];
 
-  if (viteEnv.VITE_VISUALIZER === '1') {
+  if (viteEnv.VITE_VISUALIZER === 'Y') {
     plugins.push(visualizer);
   }
-  if (viteEnv.VITE_COMPRESS === '1') {
+  if (viteEnv.VITE_COMPRESS === 'Y') {
     plugins.push(compress(viteEnv));
   }
 
diff --git a/build/utils/index.ts b/build/utils/index.ts
index de3aac7e..ccfd4ab0 100644
--- a/build/utils/index.ts
+++ b/build/utils/index.ts
@@ -2,7 +2,7 @@ import path from 'path';
 
 /**
  * 获取项目根路径
- * @descrition 结尾不带斜杠
+ * @descrition 末尾不带斜杠
  */
 export function getRootPath() {
   return path.resolve(process.cwd());
@@ -11,7 +11,7 @@ export function getRootPath() {
 /**
  * 获取项目src路径
  * @param srcName - src目录名称(默认: "src")
- * @descrition 结尾不带斜杠
+ * @descrition 末尾不带斜杠
  */
 export function getSrcPath(srcName = 'src') {
   const rootPath = getRootPath();
diff --git a/package.json b/package.json
index 87731699..010cd62f 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build": "npm run typecheck && cross-env VITE_ENV_TYPE=prod vite build",
     "build:dev": "npm run typecheck && cross-env VITE_ENV_TYPE=dev vite build",
     "build:test": "npm run typecheck && cross-env VITE_ENV_TYPE=test vite build",
-    "build:vercel": "cross-env VITE_HASH_ROUTE=1 VITE_VERCEL=1 vite build",
+    "build:vercel": "cross-env VITE_HASH_ROUTE=Y VITE_VERCEL=Y vite build",
     "preview": "vite preview",
     "typecheck": "vue-tsc --noEmit --skipLibCheck",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts,.json --fix",
diff --git a/src/config/service.ts b/src/config/service.ts
index 07f0d926..f4695463 100644
--- a/src/config/service.ts
+++ b/src/config/service.ts
@@ -42,5 +42,5 @@ export const ERROR_STATUS = {
 /** 不弹出错误信息的code */
 export const NO_ERROR_MSG_CODE: (string | number)[] = [];
 
-/** token失效需要刷新token的code */
+/** token失效需要刷新token的code(这里的66666只是个例子，需要将后端表示token过期的code填进来) */
 export const REFRESH_TOKEN_CODE: (string | number)[] = [66666];
diff --git a/src/layouts/common/GlobalHeader/index.vue b/src/layouts/common/GlobalHeader/index.vue
index 10ddf789..b13db96a 100644
--- a/src/layouts/common/GlobalHeader/index.vue
+++ b/src/layouts/common/GlobalHeader/index.vue
@@ -51,7 +51,7 @@ defineProps<Props>();
 const theme = useThemeStore();
 const { isMobile } = useBasicLayout();
 
-const showButton = import.meta.env.PROD && import.meta.env.VITE_VERCEL !== '1';
+const showButton = import.meta.env.PROD && import.meta.env.VITE_VERCEL !== 'Y';
 </script>
 
 <style scoped>
diff --git a/src/layouts/common/SettingDrawer/index.vue b/src/layouts/common/SettingDrawer/index.vue
index e26699ba..e8dfa238 100644
--- a/src/layouts/common/SettingDrawer/index.vue
+++ b/src/layouts/common/SettingDrawer/index.vue
@@ -20,7 +20,7 @@ defineOptions({ name: 'SettingDrawer' });
 
 const app = useAppStore();
 
-const showButton = import.meta.env.DEV || import.meta.env.VITE_VERCEL === '1';
+const showButton = import.meta.env.DEV || import.meta.env.VITE_VERCEL === 'Y';
 </script>
 
 <style scoped></style>
diff --git a/src/router/index.ts b/src/router/index.ts
index 647edd7e..cf406d52 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,10 +5,10 @@ import { constantRoutes } from './routes';
 import { scrollBehavior } from './helpers';
 import { createRouterGuard } from './guard';
 
-const { VITE_HASH_ROUTE = '0', VITE_BASE_URL } = import.meta.env;
+const { VITE_HASH_ROUTE = 'N', VITE_BASE_URL } = import.meta.env;
 
 export const router = createRouter({
-  history: VITE_HASH_ROUTE === '1' ? createWebHashHistory(VITE_BASE_URL) : createWebHistory(VITE_BASE_URL),
+  history: VITE_HASH_ROUTE === 'Y' ? createWebHashHistory(VITE_BASE_URL) : createWebHistory(VITE_BASE_URL),
   routes: transformAuthRoutesToVueRoutes(constantRoutes),
   scrollBehavior
 });
diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 0c34b7c0..39ccf389 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -2,7 +2,7 @@ import { getEnvConfig } from '~/.env-config';
 import { createRequest } from './request';
 
 const envConfig = getEnvConfig(import.meta.env);
-const isHttpProxy = import.meta.env.VITE_HTTP_PROXY === '1';
+const isHttpProxy = import.meta.env.VITE_HTTP_PROXY === 'Y';
 
 export const request = createRequest({ baseURL: isHttpProxy ? envConfig.proxy : envConfig.url });
 
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index 6fea9393..ee75131b 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -1,8 +1,8 @@
 import { unref } from 'vue';
 import { defineStore } from 'pinia';
 import { router } from '@/router';
-import { useRouterPush } from '@/composables';
 import { fetchLogin, fetchUserInfo } from '@/service';
+import { useRouterPush } from '@/composables';
 import { getUserInfo, getToken, setUserInfo, setToken, setRefreshToken, clearAuthStorage } from '@/utils';
 import { useTabStore } from '../tab';
 import { useRouteStore } from '../route';
diff --git a/src/typings/env.d.ts b/src/typings/env.d.ts
index 0f2e2ad7..db9dedef 100644
--- a/src/typings/env.d.ts
+++ b/src/typings/env.d.ts
@@ -1,17 +1,17 @@
 /**
- * env环境类型
+ *后台服务的环境类型
  * - dev: 后台开发环境
  * - test: 后台测试环境
  * - prod: 后台生产环境
  */
-type EnvType = 'dev' | 'test' | 'prod';
+type ServiceEnvType = 'dev' | 'test' | 'prod';
 
-/** env环境配置 */
-interface EnvConfig {
-  /** 后端的请求地址 */
+/** 后台服务的环境配置 */
+interface ServiceEnvConfig {
+  /** 请求地址 */
   url: string;
-  /** 代理标识, 用于拦截地址转发代理(如："/api"，这个和后端路径有无 "/api" 路径没有任何关系) */
-  proxy: string;
+  /** 代理标识, 用于拦截地址转发代理(和后端请求路径中有无该路径没有关系) */
+  proxy: '/proxy-flag';
 }
 
 interface ImportMetaEnv {
@@ -32,19 +32,19 @@ interface ImportMetaEnv {
   /** 路由首页的路径 */
   readonly VITE_ROUTE_HOME_PATH: Exclude<AuthRoute.RoutePath, '/' | '/not-found-page' | '/:pathMatch(.*)*'>;
   /** vite环境类型 */
-  readonly VITE_ENV_TYPE?: EnvType;
+  readonly VITE_ENV_TYPE?: ServiceEnvType;
   /** 开启请求代理 */
-  readonly VITE_HTTP_PROXY?: '1' | '0';
+  readonly VITE_HTTP_PROXY?: 'Y' | 'N';
   /** 是否开启打包文件大小结果分析 */
-  readonly VITE_VISUALIZER?: '1' | '0';
+  readonly VITE_VISUALIZER?: 'Y' | 'N';
   /** 是否开启打包压缩 */
-  readonly VITE_COMPRESS?: '1' | '0';
+  readonly VITE_COMPRESS?: 'Y' | 'N';
   /** 压缩算法类型 */
   readonly VITE_COMPRESS_TYPE?: 'gzip' | 'brotliCompress' | 'deflate' | 'deflateRaw';
   /** hash路由模式 */
-  readonly VITE_HASH_ROUTE?: '1' | '0';
+  readonly VITE_HASH_ROUTE?: 'Y' | 'N';
   /** 是否是部署的vercel */
-  readonly VITE_VERCEL?: '1' | '0';
+  readonly VITE_VERCEL?: 'Y' | 'N';
 }
 
 interface ImportMeta {
diff --git a/src/typings/expose.d.ts b/src/typings/expose.d.ts
index c83b28eb..0cf5b173 100644
--- a/src/typings/expose.d.ts
+++ b/src/typings/expose.d.ts
@@ -3,4 +3,9 @@ declare namespace Expose {
   interface BetterScroll {
     instance: import('@better-scroll/core').BScrollInstance;
   }
+
+  interface ImageVerify {
+    /** 获取图片验证码 */
+    getImgCode(): void;
+  }
 }
diff --git a/src/typings/system.d.ts b/src/typings/system.d.ts
index d2917b5f..55d60dba 100644
--- a/src/typings/system.d.ts
+++ b/src/typings/system.d.ts
@@ -24,8 +24,8 @@ declare namespace Service {
   /**
    * 请求的错误类型：
    * - axios: axios错误：网络错误, 请求超时, 默认的兜底错误
-   * - http: 请求成功，响应的状态码非200的错误
-   * - backend: 请求成功，响应的状态码为200，由后端定义的业务错误
+   * - http: 请求成功，响应的http状态码非200的错误
+   * - backend: 请求成功，响应的http状态码为200，由后端定义的业务错误
    */
   type RequestErrorType = 'axios' | 'http' | 'backend';
 
diff --git a/src/utils/common/pattern.ts b/src/utils/common/pattern.ts
index 6afdda48..d2f82a41 100644
--- a/src/utils/common/pattern.ts
+++ b/src/utils/common/pattern.ts
@@ -1,4 +1,7 @@
-/** 执行策略模式 */
+/**
+ * 策略模式
+ * @param actions 每一种可能执行的操作
+ */
 export function exeStrategyActions(actions: Common.StrategyAction[]) {
   actions.some(item => {
     const [flag, action] = item;
diff --git a/src/utils/service/error.ts b/src/utils/service/error.ts
index 3f1e3c2a..41cb41d9 100644
--- a/src/utils/service/error.ts
+++ b/src/utils/service/error.ts
@@ -15,7 +15,7 @@ type ErrorStatus = keyof typeof ERROR_STATUS;
 
 /**
  * 处理axios请求失败的错误
- * @param error - 错误
+ * @param axiosError - 错误
  */
 export function handleAxiosError(axiosError: AxiosError) {
   const error: Service.RequestError = {
@@ -75,7 +75,7 @@ export function handleResponseError(response: AxiosResponse) {
     // 请求成功的状态码非200的错误
     const errorCode: ErrorStatus = response.status as ErrorStatus;
     const msg = ERROR_STATUS[errorCode] || DEFAULT_REQUEST_ERROR_MSG;
-    Object.assign(error, { type: 'backend', code: errorCode, msg });
+    Object.assign(error, { type: 'http', code: errorCode, msg });
   }
 
   showErrorMsg(error);
diff --git a/src/utils/service/msg.ts b/src/utils/service/msg.ts
index c9ec0c6b..1310dcc1 100644
--- a/src/utils/service/msg.ts
+++ b/src/utils/service/msg.ts
@@ -18,15 +18,12 @@ function hasErrorMsg(error: Service.RequestError) {
  * @param error
  */
 export function showErrorMsg(error: Service.RequestError) {
-  if (!error.msg) return;
-  if (!NO_ERROR_MSG_CODE.includes(error.code)) {
-    if (!hasErrorMsg(error)) {
-      addErrorMsg(error);
-      window.console.warn(error.code, error.msg);
-      window.$message?.error(error.msg, { duration: ERROR_MSG_DURATION });
-      setTimeout(() => {
-        removeErrorMsg(error);
-      }, ERROR_MSG_DURATION);
-    }
-  }
+  if (!error.msg || NO_ERROR_MSG_CODE.includes(error.code) || hasErrorMsg(error)) return;
+
+  addErrorMsg(error);
+  window.console.warn(error.code, error.msg);
+  window.$message?.error(error.msg, { duration: ERROR_MSG_DURATION });
+  setTimeout(() => {
+    removeErrorMsg(error);
+  }, ERROR_MSG_DURATION);
 }
diff --git a/src/utils/service/transform.ts b/src/utils/service/transform.ts
index d40b9702..aeca0233 100644
--- a/src/utils/service/transform.ts
+++ b/src/utils/service/transform.ts
@@ -56,6 +56,6 @@ async function transformFile(formData: FormData, key: string, file: File[] | Fil
     );
   } else {
     // 单文件
-    await formData.append(key, file);
+    formData.append(key, file);
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 678ba98b..f06bc912 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,6 +6,7 @@
     "lib": ["DOM", "ESNext"],
     "strict": true,
     "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "jsx": "preserve",
     "moduleResolution": "node",
     "resolveJsonModule": true,
@@ -16,7 +17,7 @@
       "~/*": ["./*"],
       "@/*": ["./src/*"]
     },
-    "types": ["vite/client", "node", "unplugin-icons/types/vue", "naive-ui/volar"]
+    "types": ["node", "vite/client", "unplugin-icons/types/vue", "naive-ui/volar"]
   },
   "exclude": ["node_modules", "dist"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index f2a8b372..4ba18418 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,7 +8,7 @@ export default defineConfig(configEnv => {
   const rootPath = getRootPath();
   const srcPath = getSrcPath();
 
-  const isOpenProxy = viteEnv.VITE_HTTP_PROXY === '1';
+  const isOpenProxy = viteEnv.VITE_HTTP_PROXY === 'Y';
   const envConfig = getEnvConfig(viteEnv);
 
   return {