From 5d11297d2368760e77a5494008b0a821ae507b97 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 05 十月 2026 06:54:23 +0800
Subject: [PATCH] fix(deploy): -NoFrontendDist 保留 backend/web，单端口瘦包改用 -SkipServiceWrapper

---
 HANDOFF.md      |   11 ++++++-----
 pack-deploy.ps1 |   30 ++++++++++++++----------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/HANDOFF.md b/HANDOFF.md
index a8b4f6d..d04e7b3 100644
--- a/HANDOFF.md
+++ b/HANDOFF.md
@@ -17,13 +17,14 @@
 - **鍏朵綑楠岃瘉**锛歚mvn compile`/`mvn test` 閫氳繃锛堟棤缂栬瘧鍛婅閬楃暀锛夛紱Word COM 8 椤� 15 鍥撅紙1+2脳7锛夛紱RapidOCR 澶嶆 12 寮犳姌绾垮浘鏁板�兼爣绛惧寘鍥存閲嶅彔鏁� = 0锛沗label_affinity` 澶嶆鍥� 11 姣忎釜鏁版嵁鏍囩鍒版湰绾� 3~8px 涓旀湰绾挎槸鏈�杩戠嚎锛堟棤銆孋LOSER TO 鍏朵粬鑹层�嶏級锛涙斁澶� 6脳 澶嶆牳鍥� 11 宸︿笂鏍囩纭负 `630.99`锛堜綆鍒嗚鲸鐜� OCR 鏇捐璇讳负 `1630.99`锛夈�倂27鈫攙35 鍍忕礌宸害 1%锛岄泦涓湪鏍囩澶勶紝鍗崇櫧鎻忚竟鐢熸晥涓旀湭鐮村潖鎶樼嚎銆�
 - **浜х墿涓庣姸鎬�**锛歚_tmp_holiday_verify/holiday_trend_2026-10-04_v35.docx`锛涗笅杞藉壇鏈� `C:\Users\jcxiong\Downloads\2026骞村崄涓�鍋囨湡鍏ㄧ渷缁煎悎杩愯緭瀹㈡祦閲忚蛋鍔垮浘锛堜慨鏀圭増-鏁板瓧璐磋繎鎶樼嚎-鐧借竟娓呮櫚锛�.docx`銆傛湭瀵煎叆銆佽鐩栨垨閲嶅浠讳綍鏁版嵁銆傚緟鐢ㄦ埛楠屾敹锛涢獙鏀跺墠涓嶆彁浜ゃ�佷笉鎺ㄩ�侊紱鐜版湁 `deploy/traffic-audit-deploy-20261004.zip` 浠嶆槸 v24 琛屼负锛岄獙鏀跺悗闇�閲嶅缓銆�
 
-### 10-05锛氳蛋鍔垮浘 v35 楠屾敹閫氳繃 + 鍗曠鍙ｇ槮鍖呭彂甯冿紙 -NoFrontend 锛�
+### 10-05锛氳蛋鍔垮浘 v35 楠屾敹閫氳繃 + 鍗曠鍙ｅ彂甯冨寘锛�-NoFrontendDist -SkipServiceWrapper锛�
 
 - **楠屾敹**锛歷35锛堟姌绾挎暟鍊兼爣绛惧洖鍒拌创杩戞湰鐐� + 鐧芥弿杈癸級2026-10-05 鐢ㄦ埛楠屾敹閫氳繃銆�
-- **鎵撳寘闇�姹�**锛氭湇鍔″櫒鍗曠鍙ｉ儴缃诧紝鍓嶇鏈鏈彉鍔紝瑕佹眰鍙戝竷鍖呬笉鍚墠绔互缂╁皬浣撶Н銆�
-- **鎵撳寘宸ュ叿**锛歚pack-deploy.ps1` 鏂板 `-NoFrontend`銆傚紑鍚悗涓嶆墽琛� npm 鏋勫缓銆佷笉瑕佹眰 `traffic-audit-web\dist`銆佷笉鐢熸垚 `frontend\`銆佷笉澶嶅埗 `backend\web`锛涘叾浣欙紙鍗犱綅绗︽瀯寤� + 鍘诲瘑鑷 + db + docs + README + WinSW锛夌収鏃с�傞儴缃叉満淇濈暀涓婁竴鐗� `backend\web`锛屾湰娆″彧鏇挎崲 jar銆�
-- **鍙戝竷鍖�**锛歚deploy/traffic-audit-deploy-20261005/`锛�311 鏂囦欢 / 105.71 MB锛泎ip 83.60 MB锛夈�傚凡鏍稿锛氭棤 `frontend/`銆佹棤 `backend\web`锛沯ar 鍐呯疆閰嶇疆鍏ㄥ崰浣嶇锛堝幓瀵嗚嚜妫�閫氳繃锛夛紱鍖呭唴 `HolidayTrendChartService.class` 涓� `target/classes` 涓�鑷达紙鍗冲惈 v35 浠ｇ爜锛夈�備綋绉鏄庯細鍓嶇 dist 浠呯害 4.8 MB锛屽寘浣撲富瑕佹潵鑷� jar锛�56.3 MB锛変笌 WinSW锛�17.4 MB锛夈��
-- **閮ㄧ讲娉ㄦ剰**锛氭湰鍖呬笉鍚墠绔紝閮ㄧ讲鏃朵笉瑕佸垹闄ら儴缃叉満鍘熸湁 `backend\web\`锛屽惁鍒欓〉闈� 404锛涘彧瑕嗙洊 jar锛堝強鎸夐渶 application.yml锛夈��
+- **鎵撳寘闇�姹傦紙鐢ㄦ埛婢勬竻锛�**锛氭湇鍔″櫒鍗曠鍙ｏ紝鍙渶瑕� `backend\web`锛屼笉瑕佺嫭绔嬬殑 `frontend/dist`锛涗负淇濊瘉鍖呭畬鏁达紝`backend\web` + jar + docs 閮借銆傛湇鍔″櫒闈為娆″彂甯冦�佹湇鍔″凡瑁咃紝鍙姞 `-SkipServiceWrapper` 鍘绘帀鏈嶅姟娉ㄥ唽鍣ㄣ��
+- **鎵撳寘宸ュ叿淇**锛氬厛鍓嶅姞鐨� `-NoFrontend` 璇箟閿欎簡锛堟妸 `backend\web` 涔熷幓鎺変簡锛夛紝鐜版敼涓� `-NoFrontendDist`銆傚畠鍙烦杩囩嫭绔� `frontend\` 鐩綍锛堜笉澶嶅埗 dist / nginx 绀轰緥锛夛紝**浠嶆瀯寤猴紙鎴栬姹傦級dist 骞跺悓姝� `backend\web`**锛堝崟绔彛蹇呴渶锛屽惁鍒欓〉闈� 404锛夈�俙-SkipFrontend` 浠嶄负鈥滀笉閲嶅缓銆佸鐢ㄧ幇鏈� dist鈥濄��
+- **鍙戝竷鍖�**锛歚deploy/traffic-audit-deploy-20261005-2/`锛�351 鏂囦欢 / 94.55 MB锛泎ip **77.78 MB**锛夈�傚凡鏍稿锛氭棤 `frontend/`銆佹棤 `trafficAudit.exe/.xml/install-service*`锛堟湇鍔″寘瑁呭櫒宸叉帓闄わ級锛沗backend\web` 44 鏂囦欢涓� `frontend\dist` 閫愭枃浠跺搱甯屼竴鑷达紱jar 鍐呯疆閰嶇疆鍏ㄥ崰浣嶇锛堝幓瀵嗚嚜妫�閫氳繃锛夛紱鍖呭唴 `HolidayTrendChartService.class` 涓� `target/classes` 涓�鑷达紙鍚� v35 浠ｇ爜锛夈�傝緝涓婁竴瀹屾暣鍖咃紙110.49 MB / zip 83.77 MB锛夌渷绾� 16 MB 瑙ｅ帇 / 6 MB 鍘嬬缉銆�
+- **浣滃簾**锛歚deploy/traffic-audit-deploy-20261005/`锛堥敊璇涔変笅鐨勪骇鐗╋紝缂� `backend\web`锛夊凡琚� `-2` 鍙栦唬锛屽嬁鐢ㄣ��
+- **閮ㄧ讲娉ㄦ剰**锛氳鐩� jar锛堝強鎸夐渶 `application.yml`锛夊嵆鍙紱`backend\web` 宸查殢鍖呮彁渚涖�傛湇鍔″凡瑁咃紝鏃犻渶閲嶆柊娉ㄥ唽銆�
 - **鐘舵��**锛氬凡鎵撳寘锛屽緟鐢ㄦ埛涓婁紶鍒版湇鍔″櫒銆�
 
 ### 10-04 娣卞锛氭姌绾挎暟鍊兼爣绛鹃伩寮�鎶樼嚎骞惰创杩戞湰绾匡紙v31锛屽緟鐢ㄦ埛楠屾敹锛�
diff --git a/pack-deploy.ps1 b/pack-deploy.ps1
index ca4d065..c0bd2cb 100644
--- a/pack-deploy.ps1
+++ b/pack-deploy.ps1
@@ -3,16 +3,16 @@
   鐢ㄦ硶锛�
     powershell -NoProfile -ExecutionPolicy Bypass -File pack-deploy.ps1
     powershell -NoProfile -ExecutionPolicy Bypass -File pack-deploy.ps1 -OutRoot "E:\璇曢獙" -SkipFrontend
-    powershell -NoProfile -ExecutionPolicy Bypass -File pack-deploy.ps1 -NoFrontend
-      鈥斺�� 鍗曠鍙ｇ槮鍖咃細瀹屽叏涓嶆墦鍖呭墠绔紙涓嶆瀯寤� npm銆佷笉澶嶅埗 frontend/dist 涓� backend/web锛夛紝
-         閮ㄧ讲鏈轰繚鐣欏師鏈� backend\web锛屼粎鏇挎崲 jar锛屽彲鏄捐憲鍑忓皬鍖呬綋绉��
+    powershell -NoProfile -ExecutionPolicy Bypass -File pack-deploy.ps1 -NoFrontendDist -SkipServiceWrapper
+      鈥斺�� 鍗曠鍙ｅ彂甯冿細涓嶇敓鎴愮嫭绔嬬殑 frontend\dist 鐩綍锛堜粛鏋勫缓骞跺悓姝� backend\web锛屽崟绔彛蹇呴渶锛夛紱
+         鏈嶅姟鍣ㄥ凡瑁呮湇鍔℃椂閰嶅悎 -SkipServiceWrapper 鍘绘帀绾� 17 MB 鐨� WinSW锛屽彲鏄捐憲鍑忓皬鍖呬綋绉��
 
   鍋氫簲浠朵簨锛�
     1) 鐢� deploy-templates\jar-application.yml锛堝叏鍗犱綅绗︼級涓存椂鏇挎崲婧愮爜 application.yml锛�
        鎵ц mvn clean package锛涙棤璁烘垚璐ラ兘杩樺師寮�鍙戞満鐪熷疄閰嶇疆
     2) 瑙ｅ帇 jar 妫�鏌ュ唴缃� application.yml锛氬繀椤诲叏鏄崰浣嶇锛堢姝� sk- 瀵嗛挜 / 鏄庢枃鍙ｄ护锛夛紝涓嶅悎鏍肩洿鎺ヤ腑姝�
     3) npm run build 閲嶅缓鍓嶇 dist锛堝彲 -SkipFrontend锛�
-    4) 缁勮瀹屾暣閮ㄧ讲鍖咃細backend(jar + application.yml + 鍚姩鑴氭湰 + 鏈嶅姟鍖呰鍣� + docs + web) / frontend/dist / db / README
+    4) 缁勮瀹屾暣閮ㄧ讲鍖咃細backend(jar + application.yml + 鍚姩鑴氭湰 + 鏈嶅姟鍖呰鍣� + docs + web) / frontend/dist(鍙�夛紝-NoFrontendDist 涓嶆墦) / db / README
        Windows 鏈嶅姟鍖呰鍣� WinSW锛氫紭鍏堢敤 deploy-templates\tools\winsw.exe 缂撳瓨锛堟牎楠� SHA-256锛夛紝
        缂哄け鏃惰嚜鍔ㄤ笅杞� v2.12.0 x64 鍒拌缂撳瓨鐩綍锛涢殢鍖呰緭鍑轰负 backend\trafficAudit.exe
     5) 瀵圭粍瑁呭悗鐨勬暣鍖呭啀鎵竴閬嶆槑鏂囧瘑閽�
@@ -25,7 +25,7 @@
 param(
   [string]$OutRoot = '',
   [switch]$SkipFrontend,
-  [switch]$NoFrontend,      # 鍗曠鍙ｇ槮鍖咃細瀹屽叏涓嶆墦鍖呭墠绔紙涓嶆瀯寤�/涓嶅鍒� dist 涓� backend\web锛夛紝閮ㄧ讲鏈轰繚鐣欏師鏈� web/
+  [switch]$NoFrontendDist,  # 鍗曠鍙ｅ彂甯冿細涓嶆墦鐙珛鐨� frontend\dist 鐩綍锛屼絾浠嶆瀯寤�/鍚屾 backend\web锛堝崟绔彛蹇呴渶锛�
   [switch]$SkipBackend,     # 澶嶇敤宸插瓨鍦ㄧ殑 jar锛堜笉閲嶇紪璇戙�佷笉鍔ㄦ簮鐮侀厤缃級锛屼粎鐢ㄤ簬琛ュ叏/閲嶇粍鍙戝竷鍖�
   [switch]$SkipServiceWrapper   # 涓嶆妸 WinSW 鏈嶅姟鍖呰鍣ㄦ墦杩涘寘锛堝嵆涓嶆彁渚涒�滄敞鍐屾垚 Windows 鏈嶅姟鈥濈殑寮�鏈鸿嚜鍚級
 )
@@ -110,10 +110,9 @@
 Write-Host '      閫氳繃锛歫ar 鍐呯疆閰嶇疆鍏ㄩ儴涓哄崰浣嶇锛屾棤鏄庢枃瀵嗛挜/鍙ｄ护銆�'
 
 # ---------- [3/5] 鍓嶇鏋勫缓 ----------
-Write-Host '[3/5] 鏋勫缓鍓嶇锛坣pm run build锛屽彲 -SkipFrontend / -NoFrontend 璺宠繃锛�...'
-if ($NoFrontend) {
-  Write-Host '      宸叉寜 -NoFrontend 璺宠繃锛氭湰娆′笉鎵撳墠绔紙鍗曠鍙ｇ槮鍖咃紝閮ㄧ讲鏈轰繚鐣欏師鏈� backend\web锛�'
-} elseif (-not $SkipFrontend) {
+# 鍗曠鍙ｉ儴缃插繀椤绘湁 backend\web锛屾墍浠ュ嵆浣� -NoFrontendDist 涔熼渶瑕� dist锛涘彧鏈� -SkipFrontend 鎵嶅鐢ㄧ幇鏈� dist銆�
+Write-Host '[3/5] 鏋勫缓鍓嶇锛坣pm run build锛屽彲 -SkipFrontend 璺宠繃锛�...'
+if (-not $SkipFrontend) {
   Push-Location (Join-Path $root 'traffic-audit-web')
   try {
     cmd /c "npm.cmd run build > ..\pack-front.log 2>&1"
@@ -124,7 +123,7 @@
 } else {
   Write-Host '      宸叉寜 -SkipFrontend 璺宠繃锛屼娇鐢ㄧ幇鏈� dist'
 }
-if (-not $NoFrontend -and -not (Test-Path $webDist)) { throw "鏈壘鍒板墠绔骇鐗╋細$webDist锛堝幓鎺� -SkipFrontend 閲嶆柊鏋勫缓锛�" }
+if (-not (Test-Path $webDist)) { throw "鏈壘鍒板墠绔骇鐗╋細$webDist锛堝幓鎺� -SkipFrontend 閲嶆柊鏋勫缓锛�" }
 
 # ---------- WinSW锛圵indows 鏈嶅姟鍖呰鍣級鍑嗗锛氭湰鍦扮紦瀛樹紭鍏堬紝缂哄け鏃朵粠瀹樻柟鍙戝竷椤典笅杞藉苟鏍￠獙 SHA-256 ----------
 # WinSW v2.12.0 瀹樻柟浜х墿鏈仛 Authenticode 绛惧悕锛屾墍浠ヤ互鍥哄畾 SHA-256 浣滀负瀹屾暣鎬ф牎楠屻��
@@ -166,7 +165,7 @@
 $dest = Join-Path $OutRoot ("traffic-audit-deploy-" + $stamp)
 $n = 2
 while (Test-Path $dest) { $dest = Join-Path $OutRoot ("traffic-audit-deploy-" + $stamp + "-" + $n); $n++ }
-if ($NoFrontend) {
+if ($NoFrontendDist) {
   New-Item -ItemType Directory -Force -Path (Join-Path $dest 'backend'), (Join-Path $dest 'db') | Out-Null
 } else {
   New-Item -ItemType Directory -Force -Path (Join-Path $dest 'backend'), (Join-Path $dest 'frontend'), (Join-Path $dest 'db') | Out-Null
@@ -185,16 +184,15 @@
   Copy-Item (Join-Path $tplDir 'backend\install-service.ps1') (Join-Path $dest 'backend') -Force
   Copy-Item (Join-Path $tplDir 'backend\install-service.cmd') (Join-Path $dest 'backend') -Force
 }
-if (-not $NoFrontend) {
+if (-not $NoFrontendDist) {
   Copy-Item $webDist (Join-Path $dest 'frontend') -Recurse -Force
   Copy-Item (Join-Path $tplDir 'frontend\nginx.conf.example') (Join-Path $dest 'frontend') -Force
 }
 Copy-Item (Join-Path $tplDir 'db\*.sql') (Join-Path $dest 'db') -Force
 
-# 鍗曠鍙� 8090 妯″紡锛氬悗绔粠 jar 鍚岀骇 web\ 璇诲墠绔潤鎬佹枃浠讹紝蹇呴』鍜� dist 鍐呭涓�鑷�
-if (-not $NoFrontend) {
-  Copy-Item $webDist (Join-Path $dest 'backend\web') -Recurse -Force
-}
+# 鍗曠鍙� 8090 妯″紡锛氬悗绔粠 jar 鍚岀骇 web\ 璇诲墠绔潤鎬佹枃浠讹紝蹇呴』鍜� dist 鍐呭涓�鑷淬��
+# 鍗曠鍙ｅ彂甯冿紙-NoFrontendDist锛夊悓鏍峰繀椤诲悓姝ワ紝鍚﹀垯椤甸潰 404銆�
+Copy-Item $webDist (Join-Path $dest 'backend\web') -Recurse -Force
 
 # docs锛氳繍琛屾椂妯℃澘 + 鐢ㄦ埛鏂囨。锛涙帓闄ゅ紑鍙戣繃绋嬫枃妗ｄ笌缂撳瓨/澶囦唤锛堝噺灏忎綋绉�侀伩鍏嶆妸鍐呴儴娓呭崟甯﹀嚭鍘伙級
 $docsDest = Join-Path $dest 'backend\docs'

--
Gitblit v1.9.1