From caaac5ce0c884c03c5d35a9ebc36780be2973fff Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Thu, 13 Jun 2024 08:55:53 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82=E9=83=A8=E5=88=86=E6=94=BE=E5=9C=A8=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E9=A1=B9=E4=B8=AD=EF=BC=8CUUID=E7=94=9F=E6=88=90=E6=8A=A5?=
=?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 6 +++++-
.env.development | 6 +++++-
.env.production | 8 --------
build/utils.ts | 4 +++-
src/App.vue | 23 ++++++++++-----------
src/main.ts | 22 +++++++++-----------
src/service/config/servicePort.ts | 4 ----
src/service/request-mock.ts | 25 +++++++++++------------
src/service/request.ts | 34 +++++++++++++++----------------
src/utils/util.ts | 3 +--
src/vite-env.d.ts | 6 ------
11 files changed, 64 insertions(+), 77 deletions(-)
delete mode 100644 .env.production
delete mode 100644 src/service/config/servicePort.ts
diff --git a/.env b/.env
index c164e22..c4c5896 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,12 @@
+# 基础请求路径
+VITE_BASE_API="/api"
+# 模拟请求路径
+VITE_MOCK_BASE_API="/mock"
# 线上环境接口地址
VITE_APP_URL="http://localhost:8800"
# 线上环境接口地址
VITE_APP_MOCK_URL="http://localhost:8800"
# 端口号
-VITE_APP_PORT=6262
+VITE_PORT=6262
# 是否使用CDN加速
VITE_CDN=true
\ No newline at end of file
diff --git a/.env.development b/.env.development
index c164e22..315ca2c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,12 @@
+# 基础请求路径
+VITE_BASE_API="/api"
+# 模拟请求路径
+VITE_MOCK_BASE_API=/mock
# 线上环境接口地址
VITE_APP_URL="http://localhost:8800"
# 线上环境接口地址
VITE_APP_MOCK_URL="http://localhost:8800"
# 端口号
-VITE_APP_PORT=6262
+VITE_PORT=6262
# 是否使用CDN加速
VITE_CDN=true
\ No newline at end of file
diff --git a/.env.production b/.env.production
deleted file mode 100644
index c164e22..0000000
--- a/.env.production
+++ /dev/null
@@ -1,8 +0,0 @@
-# 线上环境接口地址
-VITE_APP_URL="http://localhost:8800"
-# 线上环境接口地址
-VITE_APP_MOCK_URL="http://localhost:8800"
-# 端口号
-VITE_APP_PORT=6262
-# 是否使用CDN加速
-VITE_CDN=true
\ No newline at end of file
diff --git a/build/utils.ts b/build/utils.ts
index d6af4a0..c3dda42 100644
--- a/build/utils.ts
+++ b/build/utils.ts
@@ -60,7 +60,9 @@ const pathResolve = (dir = '.', metaUrl = import.meta.url) => {
const wrapperEnv = (envConf: Recordable): any => {
// TODO 默认值
const ret: any = {
- VITE_APP_PORT: 6262,
+ VITE_BASE_API: '',
+ VITE_MOCK_BASE_API: '',
+ VITE_PORT: 6262,
VITE_APP_URL: '',
VITE_APP_MOCK_URL: '',
VITE_CDN: false,
diff --git a/src/App.vue b/src/App.vue
index 0b34933..eee671b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,30 +1,29 @@
-
+
diff --git a/src/main.ts b/src/main.ts
index d8d010a..b6c235d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,19 +1,17 @@
-import directives from "@/directives";
-import i18n from "@/i18n/index.ts";
-import { createPinia } from "pinia";
-import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
-import { createApp } from "vue";
-import App from "./App.vue";
-import "./assets/css/index.scss";
-import "./assets/css/reset.css";
-import router from "./router";
+import directives from '@/directives';
+import i18n from '@/i18n/index.ts';
+import { createPinia } from 'pinia';
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
+import { createApp } from 'vue';
+import App from './App.vue';
+import './assets/css/index.scss';
+import './assets/css/reset.css';
+import router from './router';
const pinia = createPinia();
const app = createApp(App);
// ? pinia 持久化存储
pinia.use(piniaPluginPersistedstate);
-
app.use(router).use(pinia).use(i18n).use(directives);
-app.mount("#app");
-
+app.mount('#app');
diff --git a/src/service/config/servicePort.ts b/src/service/config/servicePort.ts
deleted file mode 100644
index 5a92373..0000000
--- a/src/service/config/servicePort.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// 基础请求
-export const BASE_API: string = '/api';
-// mock数据
-export const BASE_MOCK: string = '/mock';
diff --git a/src/service/request-mock.ts b/src/service/request-mock.ts
index d072275..6553b31 100644
--- a/src/service/request-mock.ts
+++ b/src/service/request-mock.ts
@@ -1,26 +1,25 @@
-import { ResultEnum } from "@/enums/httpEnum";
-import axios from "axios";
-import { BASE_MOCK } from "./config/servicePort";
+import { ResultEnum } from '@/enums/httpEnum';
+import axios from 'axios';
const request = axios.create({
- baseURL: BASE_MOCK,
- timeout: ResultEnum.TIMEOUT as number
+ baseURL: import.meta.env.VITE_MOCK_BASE_API,
+ timeout: ResultEnum.TIMEOUT as number,
});
// 请求拦截器
request.interceptors.request.use(config => {
- return config;
+ return config;
});
// 响应拦截器
request.interceptors.response.use(
- response => {
- return response.data;
- },
- error => {
- console.log(error);
- return Promise.reject(new Error("网络错误"));
- }
+ response => {
+ return response.data;
+ },
+ error => {
+ console.log(error);
+ return Promise.reject(new Error('网络错误'));
+ },
);
export default request;
diff --git a/src/service/request.ts b/src/service/request.ts
index 6a58bbe..3db757b 100644
--- a/src/service/request.ts
+++ b/src/service/request.ts
@@ -1,30 +1,30 @@
-import { ResultEnum } from "@/enums/httpEnum";
-import axios from "axios";
-import { BASE_API } from "./config/servicePort";
+import { ResultEnum } from '@/enums/httpEnum';
+import axios from 'axios';
const request = axios.create({
- // 默认请求地址
- baseURL: BASE_API,
- // 设置超时时间
- timeout: ResultEnum.TIMEOUT as number
- // 跨域允许携带凭证
- // withCredentials: true,
+ // 默认请求地址
+ baseURL: import.meta.env.VITE_BASE_API,
+ // 设置超时时间
+ timeout: ResultEnum.TIMEOUT as number,
+ // 跨域允许携带凭证
+ // withCredentials: true,
});
// 请求拦截器
request.interceptors.request.use(config => {
- return config;
+ return config;
});
// 响应拦截器
request.interceptors.response.use(
- response => {
- return response.data;
- },
- error => {
- console.log(error);
- return Promise.reject(new Error("网络错误"));
- }
+ response => {
+ // 返回相应数据
+ return response.data;
+ },
+ error => {
+ console.log(error);
+ return Promise.reject(new Error('网络错误'));
+ },
);
export default request;
diff --git a/src/utils/util.ts b/src/utils/util.ts
index fff09c0..acea132 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto';
/**
* @description 获取localStorage
* @param {String} key Storage名称
@@ -56,5 +55,5 @@ export const isType = (val: any) => {
* @returns UUID
*/
export const getUUID = () => {
- return randomUUID();
+ return crypto.randomUUID();
};
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 64f3bdd..2a599c5 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1,11 +1,5 @@
///
-interface ImportMetaEnv {
- readonly VITE_GLOB_APP_TITLE: string; // 定义标题
- readonly VITE_PORT: number; // 定义端口号
- readonly VITE_OPEN: boolean; // 运行 npm run dev 时自动打开浏览器
-}
-
declare module '*.vue' {
import type { DefineComponent } from 'vue';
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types