From 604d77049b2d174a5647ac0e6159418a35c67e1c Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Tue, 8 Sep 2026 18:37:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(build):=20=E4=BA=A7=E7=89=A9=E7=9B=B4?=
 =?UTF-8?q?=E5=87=BA=20dist-=E5=8E=BB=E6=8E=89=20dist/base=20=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E5=B1=82(outDir=20=E7=BB=9F=E4=B8=80=20dist,=E4=B8=8E?=
 =?UTF-8?q?=20UserBase=20=E5=90=8C=E9=A3=8E=E6=A0=BC),CI=20zip=20=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E5=9B=9E=E5=BD=92=20cd=20dist,=E6=A0=B9=E6=B2=BB?=
 =?UTF-8?q?=E4=B8=8A=E6=8F=90=E4=BA=A4=204b93b13=20=E7=9A=84=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=B7=AF=E5=BE=84=E7=BB=95=E6=B3=95,vitest=2056/56+?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=20build=20dist=20=E6=A0=B9=20index.html=20?=
 =?UTF-8?q?=E5=AE=9E=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build.yml | 9 +++++----
 vite.config.ts             | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 46a60ff..c6156a1 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -49,19 +49,20 @@ jobs:
             npm run build
           '
           echo "=== dist 产物 ==="
-          docker exec frontbuild sh -c 'ls -la /build/dist/base/ | head -20'
+          docker exec frontbuild sh -c 'ls -la /build/dist/ | head -20'
           # 从容器 cp dist 到宿主工作目录
           docker cp frontbuild:/build/dist ./dist
           docker rm -f frontbuild
           echo "BUILD CHECK OK"
 
-      # 打包 dist/base → zip（vite outDir=dist/base；进入该目录打包，zip 根目录直接是 index.html/css/js。
-      # 曾误打 dist/ 整层——zip 根只有 base/ 目录无 index.html，projman 前端发布校验报「zip 根目录缺少 html 文件」）
+      # 打包 dist → zip（vite outDir 已简化为直出 dist/，无中间层；进入 dist 打包，
+      # zip 根目录直接是 index.html/css/js。此前 outDir=dist/base 时曾误打 dist/ 整层，
+      # zip 根只有 base/ 目录，projman 前端发布校验报「zip 根目录缺少 html 文件」）
       - name: 打包产物
         run: |
           TAG=$(echo "$GITHUB_SHA" | cut -c1-8)
           ZIP_FILE="yschcms-front-${TAG}.zip"
-          cd dist/base && zip -r "../../${ZIP_FILE}" . && cd ../..
+          cd dist && zip -r "../${ZIP_FILE}" . && cd ..
           echo "ZIP_FILE=${ZIP_FILE}" >> "$GITHUB_ENV"
           echo "TAG=${TAG}" >> "$GITHUB_ENV"
           ls -la "${ZIP_FILE}"
diff --git a/vite.config.ts b/vite.config.ts
index c4cca51..707b18b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,7 +11,9 @@ import { cmsMockPlugin } from "./mock";
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command, mode }) => {
-    const outDir = command === "build" ? "dist/base" : "dist";
+    // 构建产物直出 dist/（与 UserBase 同风格）：zip 打包/static/admin 拷贝都取 dist 根，
+    // 不再有 dist/base 中间层；dev(serve) 不写产物，两者共用该值无冲突
+    const outDir = "dist";
     // VITE_IS_MOCK=true 时启用本地 mock 中间件（拦截 /api、/portal 等，无需后端）
     const mockEnabled = loadEnv(mode, process.cwd(), "VITE_").VITE_IS_MOCK === "true";
     return {