From 9c13c069fe0858736ab4741d216207c1e5ca4174 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Thu, 27 Jun 2024 12:38:17 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/info.ts                         | 25 ++++++++++++++++---------
 build/server.ts                       | 13 ++++++++-----
 build/utils.ts                        |  4 ++--
 src/api/mock/i18n.ts                  | 11 +++++------
 src/{ => api}/service/request-mock.ts |  2 +-
 src/{ => api}/service/request.ts      |  2 +-
 src/api/test.ts                       |  8 --------
 src/api/v1/test.ts                    |  2 +-
 8 files changed, 34 insertions(+), 33 deletions(-)
 rename src/{ => api}/service/request-mock.ts (90%)
 rename src/{ => api}/service/request.ts (91%)
 delete mode 100644 src/api/test.ts

diff --git a/build/info.ts b/build/info.ts
index 75d477c..40cb096 100644
--- a/build/info.ts
+++ b/build/info.ts
@@ -1,18 +1,18 @@
-import type { Plugin } from 'vite';
-import { getPackageSize } from './utils';
+import boxen, { type Options as BoxenOptions } from 'boxen';
 import dayjs, { type Dayjs } from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import gradientString from 'gradient-string';
-import boxen, { type Options as BoxenOptions } from 'boxen';
+import type { Plugin } from 'vite';
+import { loadEnv } from 'vite';
+import { getPackageSize, root, wrapperEnv } from './utils';
 
 dayjs.extend(duration);
+const { VITE_PORT } = wrapperEnv(loadEnv('dev', root));
 
 const welcomeMessage = gradientString('cyan', 'magenta').multiline(
-	`您好! 欢迎使用 bunny-admin 后台管理 
-项目开发访问地址如下：
-http://localhost:6262/
-项目生产访问地址如下：
-http://localhost:6262/`,
+	`您好! 欢迎使用 bunny 系列开发模板 
+项目访问地址如下：
+http://localhost:${VITE_PORT}`,
 );
 
 const boxenOptions: BoxenOptions = {
@@ -44,7 +44,14 @@ export function viteBuildInfo(): Plugin {
 				getPackageSize({
 					folder: outDir,
 					callback: (size: string) => {
-						console.log(boxen(gradientString('cyan', 'magenta').multiline(`🎉 恭喜打包完成（总用时${dayjs.duration(endTime.diff(startTime)).format('mm分ss秒')}，打包后的大小为${size}）`), boxenOptions));
+						console.log(
+							boxen(
+								gradientString('cyan', 'magenta').multiline(
+									`🎉 恭喜打包完成（总用时${dayjs.duration(endTime.diff(startTime)).format('mm分ss秒')}，打包后的大小为${size}）`,
+								),
+								boxenOptions,
+							),
+						);
 					},
 				});
 			}
diff --git a/build/server.ts b/build/server.ts
index fd73674..46bee52 100644
--- a/build/server.ts
+++ b/build/server.ts
@@ -1,19 +1,22 @@
-import { type ServerOptions } from 'vite';
+import { loadEnv, type ServerOptions } from 'vite';
+import { root, wrapperEnv } from './utils';
+
+export const serverOptions = (mode: string) => {
+	const { VITE_APP_URL, VITE_APP_MOCK_URL, VITE_PORT } = wrapperEnv(loadEnv(mode, root));
 
-export const serverOptions = () => {
 	const options: ServerOptions = {
-		port: 6261,
+		port: VITE_PORT,
 		host: '0.0.0.0',
 		open: true,
 		cors: true,
 		proxy: {
 			'/api': {
-				target: process.env.VITE_APP_URL,
+				target: VITE_APP_URL,
 				changeOrigin: true,
 				rewrite: (path: string) => path.replace(/^\/api/, '/api'),
 			},
 			'/mock': {
-				target: process.env.VITE_APP_MOCK_URL,
+				target: VITE_APP_MOCK_URL,
 				changeOrigin: true,
 				rewrite: (path: string) => path.replace(/^\/mock/, '/mock'),
 			},
diff --git a/build/utils.ts b/build/utils.ts
index c3dda42..53ee839 100644
--- a/build/utils.ts
+++ b/build/utils.ts
@@ -1,7 +1,7 @@
+import { Recordable, formatBytes, sum } from '@pureadmin/utils';
 import { readdir, stat } from 'node:fs';
-import { formatBytes, Recordable, sum } from '@pureadmin/utils';
-import { fileURLToPath } from 'node:url';
 import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 /** 启动`node`进程时所在工作目录的绝对路径 */
 const root: string = process.cwd();
diff --git a/src/api/mock/i18n.ts b/src/api/mock/i18n.ts
index eadd323..025136b 100644
--- a/src/api/mock/i18n.ts
+++ b/src/api/mock/i18n.ts
@@ -1,9 +1,8 @@
-import Request from "@/service/request-mock.ts";
+import Request from '@/api/service/request-mock.ts';
 
 export const fetchGetI18n = () => {
-  return Request({
-    url: "/getI18n",
-    method: "GET"
-  });
+	return Request({
+		url: '/getI18n',
+		method: 'GET',
+	});
 };
-
diff --git a/src/service/request-mock.ts b/src/api/service/request-mock.ts
similarity index 90%
rename from src/service/request-mock.ts
rename to src/api/service/request-mock.ts
index 6553b31..f115d02 100644
--- a/src/service/request-mock.ts
+++ b/src/api/service/request-mock.ts
@@ -1,4 +1,4 @@
-import { ResultEnum } from '@/enums/httpEnum';
+import { ResultEnum } from '@/enums/httpEnum.ts';
 import axios from 'axios';
 
 const request = axios.create({
diff --git a/src/service/request.ts b/src/api/service/request.ts
similarity index 91%
rename from src/service/request.ts
rename to src/api/service/request.ts
index 3db757b..26ed639 100644
--- a/src/service/request.ts
+++ b/src/api/service/request.ts
@@ -1,4 +1,4 @@
-import { ResultEnum } from '@/enums/httpEnum';
+import { ResultEnum } from '@/enums/httpEnum.ts';
 import axios from 'axios';
 
 const request = axios.create({
diff --git a/src/api/test.ts b/src/api/test.ts
deleted file mode 100644
index 15035da..0000000
--- a/src/api/test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Request from '@/service/request';
-
-export const reqGetLoadBoard = () => {
-	return Request({
-		url: '/board/loadBoard',
-		method: 'GET',
-	});
-};
diff --git a/src/api/v1/test.ts b/src/api/v1/test.ts
index 15035da..83d1577 100644
--- a/src/api/v1/test.ts
+++ b/src/api/v1/test.ts
@@ -1,4 +1,4 @@
-import Request from '@/service/request';
+import Request from '@/api/service/request';
 
 export const reqGetLoadBoard = () => {
 	return Request({