From fbacc121df810f01e5b6ed43e6431dea6df270fd Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 十月 2026 10:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
docs/打包部署说明.md | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git "a/docs/\346\211\223\345\214\205\351\203\250\347\275\262\350\257\264\346\230\216.md" "b/docs/\346\211\223\345\214\205\351\203\250\347\275\262\350\257\264\346\230\216.md"
index 05c977c..3a99c6d 100644
--- "a/docs/\346\211\223\345\214\205\351\203\250\347\275\262\350\257\264\346\230\216.md"
+++ "b/docs/\346\211\223\345\214\205\351\203\250\347\275\262\350\257\264\346\230\216.md"
@@ -63,7 +63,10 @@
鈹� 鈹溾攢 init.sql 寤哄簱寤鸿〃 + 棰勭疆璐﹀彿锛堝繀椤绘墽琛岋級
鈹� 鈹溾攢 sql_city_bus.sql 鍩庡競瀹㈣繍-鍏氦鏈堝害琛紙蹇呴』鎵ц锛�
鈹� 鈹溾攢 sql_city_taxi.sql 鍩庡競瀹㈣繍-鍑虹鏈堝害琛�/鎺堟潈琛紙蹇呴』鎵ц锛�
-鈹� 鈹斺攢 sql_wyc.sql 缃戠害杞﹀叏鐪佹�婚噺/璁㈠崟鍒嗗競宸炶〃锛堝繀椤绘墽琛岋級
+鈹� 鈹溾攢 sql_wyc.sql 缃戠害杞﹀叏鐪佹�婚噺/璁㈠崟鍒嗗競宸炶〃锛堝繀椤绘墽琛岋級
+鈹� 鈹溾攢 sql_holiday.sql 涓撻」缁熻-閲嶈鑺傚亣鏃ヨ〃锛堟棫搴撹ˉ寤烘椂鎵ц锛�
+鈹� 鈹溾攢 sql_holiday_decimal_migration.sql 鑺傚亣鏃ユ暟鍊煎垪绮惧害杩佺Щ锛堟棫搴撳崌绾э級
+鈹� 鈹斺攢 sql_holiday_comparison_base_migration.sql 鑺傚亣鏃ョ幆姣斿熀鏈熷瓧娈佃縼绉伙紙鏃у簱鍗囩骇锛�
鈹斺攢 README-閮ㄧ讲璇存槑.txt
```
@@ -77,14 +80,15 @@
```bash
cd db
-mysql --default-character-set=utf8mb4 -u root -p < init.sql # 寤哄簱 + 24 寮犲熀纭�琛� + 棰勭疆璐﹀彿
+mysql --default-character-set=utf8mb4 -u root -p < init.sql # 寤哄簱 + 28 寮犲熀纭�琛� + 棰勭疆璐﹀彿
mysql --default-character-set=utf8mb4 -u root -p -D traffic_audit < sql_city_bus.sql
mysql --default-character-set=utf8mb4 -u root -p -D traffic_audit < sql_city_taxi.sql
mysql --default-character-set=utf8mb4 -u root -p -D traffic_audit < sql_wyc.sql
```
> 鈿狅笍 **`init.sql` 鏄牬鍧忔�х殑**锛氶噷闈㈢殑鍩虹琛ㄩ兘甯� `DROP TABLE IF EXISTS`銆�**宸叉湁鏁版嵁鐨勫簱涓婂崈涓囦笉瑕佸啀璺� init.sql**锛屽惁鍒欒〃鏁版嵁浼氳娓呯┖閲嶅缓銆�
-> 4 涓剼鏈叡瑕嗙洊 29 寮犺〃锛坕nit.sql 24 寮� + 鍩庡競瀹㈣繍 3 寮� + 缃戠害杞� 2 寮狅級銆�
+> 鏃╂湡鐗堟湰搴撹嫢娌℃湁鑺傚亣鏃� 4 寮犺〃锛屾墽琛� `sql_holiday.sql`锛涜嫢宸叉湁鑺傚亣鏃ヨ〃浣嗙己绮惧害鎴栫幆姣斿熀鏈熷瓧娈碉紝鎸夐渶鎵ц涓や釜杩佺Щ鑴氭湰銆�
+> 4 涓剼鏈叡瑕嗙洊 33 寮犺〃锛坕nit.sql 28 寮狅紝鍏朵腑鍚妭鍋囨棩 4 寮� + 鍩庡競瀹㈣繍 3 寮� + 缃戠害杞� 2 寮狅級銆�
#### 璺嚎 B锛氭妸鐜扮綉/寮�鍙戞満鐨勬暟鎹暣濂楁惉杩囧幓锛堟帹鑽愶紝涓嶇敤璺戣剼鏈級
@@ -107,9 +111,9 @@
- `--databases` 浼氭妸 `CREATE DATABASE` + `USE` 涓�璧峰啓杩涘浠斤紝鎵�浠ョ洰鏍囨満鍣�**涓嶇敤鍏堝缓搴撱�佷篃涓嶇敤璺戦偅 4 涓剼鏈�**銆�
- 澶囦唤閲屽寘鍚� `sys_user`锛岃处鍙峰瘑鐮佷笌婧愭満鍣ㄥ畬鍏ㄤ竴鑷达紙鏈満鏄� `admin / 123456`锛夛紝涓嶄細琚噸缃垚 `admin/admin123`銆�
-- 鈿狅笍 澶囦唤閲屾瘡寮犺〃閮藉甫 `DROP TABLE IF EXISTS`锛堝叡 29 寮狅級锛�**鐩爣搴撹鏄凡鏈夋暟鎹紝浼氳鐩存帴瑕嗙洊**銆傝杩樺師鍒扮┖搴擄紝鎴栧厛鑷繁澶囦唤鐩爣搴撱��
+- 鈿狅笍 澶囦唤閲屾瘡寮犺〃閮藉甫 `DROP TABLE IF EXISTS`锛堜互瀹為檯澶囦唤涓哄噯锛屾渶鏂颁负 33 寮狅級锛�**鐩爣搴撹鏄凡鏈夋暟鎹紝浼氳鐩存帴瑕嗙洊**銆傝杩樺師鍒扮┖搴擄紝鎴栧厛鑷繁澶囦唤鐩爣搴撱��
- 鏈宸茬敓鎴愬苟**楠岃瘉杩�**澶囦唤锛歚traffic_audit_full_20260913.sql`锛�45.5 MB锛�8.0.29 瀹㈡埛绔鍑猴級銆�
- 楠岃瘉鏂瑰紡锛氭妸澶囦唤搴撳悕鏀规垚涓存椂搴撳鍏ワ紝閫愯〃姣斿 `SHOW CREATE TABLE`锛堣〃缁撴瀯锛変笌 `COUNT(*)`锛堣鏁帮級鈥斺��**29 寮犺〃缁撴瀯涓庤鏁板潎 0 宸紓**锛屾娊鏌� `wyc_order_monthly` 2026-08 鏁版嵁涓�鑷达紝楠岃瘉鍚庡凡鍒犻櫎涓存椂搴撱��
+ 楠岃瘉鏂瑰紡锛氭妸澶囦唤搴撳悕鏀规垚涓存椂搴撳鍏ワ紝閫愯〃姣斿 `SHOW CREATE TABLE`锛堣〃缁撴瀯锛変笌 `COUNT(*)`锛堣鏁帮級鈥斺��**29 寮犺〃缁撴瀯涓庤鏁板潎 0 宸紓锛堟柊澧炶妭鍋囨棩妯″潡鍚庝负 33 寮狅級**锛屾娊鏌� `wyc_order_monthly` 2026-08 鏁版嵁涓�鑷达紝楠岃瘉鍚庡凡鍒犻櫎涓存椂搴撱��
#### 璺嚎 B2锛氱敤 Navicat 鐨勩�屽浠� / 杩樺師澶囦唤銆嶏紙.nb3锛屾渶璐磋繎鏃ュ父涔犳儻锛�
@@ -204,7 +208,7 @@
| 瀵煎嚭鎶ャ�屾湭鎵惧埌姹囨�昏〃姣嶇増銆奩YYY骞碝鏈堚�︺�嬨�� | `docs/鐢熸垚姹囨�诲ぇ琛╜ 缂鸿鏈堟瘝鐗� |
| 鐧诲綍鎺ュ彛 500 | `jwt.secret` 濉簡闈炴硶瀛楃锛堝涓枃锛夛紱鏀规垚 32 浣嶅崄鍏繘鍒朵覆 |
| 椤甸潰鑳藉紑浣嗘帴鍙� 404 | 璧� nginx 鏂规鏃舵病閰� `/api` 鍙嶄唬锛涙敼鐢� jar 鍐呭祵璁块棶 8090 |
-| 鏁版嵁搴撹繛鎺ュけ璐� | 妫�鏌� `application.yml`锛涚‘璁� 4 涓� SQL 鑴氭湰宸叉墽琛� |
+| 鏁版嵁搴撹繛鎺ュけ璐� | 妫�鏌� `application.yml`锛涚‘璁� 5 涓� SQL 鑴氭湰宸叉墽琛� |
| 绔彛鍗犵敤 | 鏀� `server.port`锛涘墠绔紑鍙戠鍙� 8080 |
## 鍗併�佸紑鍙戠幆澧冩棩甯稿惎鍔�
@@ -255,6 +259,30 @@
python -c "import zipfile;print(zipfile.ZipFile('traffic-audit-server/target/traffic-audit-server-1.0.0-SNAPSHOT.jar').read('BOOT-INF/classes/application.yml').decode('utf-8'))" | Select-String "password:|api-key:"
```
+
+### 涓�閿墦鍖咃紙鎺ㄨ崘锛�2026-09-27 璧凤級
+
+```powershell
+powershell -NoProfile -ExecutionPolicy Bypass -File pack-deploy.ps1
+# 鍙�夊弬鏁帮細 -OutRoot "E:\璇曢獙" -SkipFrontend
+```
+
+鑴氭湰鍋氬洓浠朵簨锛�
+1. `mvn clean package -DskipTests` 鏋勫缓鍚庣 jar锛�
+2. **瑙ｅ帇 jar 鑷**锛氭鏌� `BOOT-INF/classes/application.yml` 鏄惁鍏ㄤ负鍗犱綅绗︹�斺�斾竴鏃﹀彂鐜� `sk-` 鎴栨槑鏂囧彛浠�**鐩存帴涓鎵撳寘**锛�
+3. `npm run build` 閲嶅缓鍓嶇 `dist`锛�
+4. 鎸� `deploy-templates/` 缁勮瀹屾暣閮ㄧ讲鍖咃紙backend / frontend / db / README-閮ㄧ讲璇存槑.txt锛夛紝杈撳嚭鍒� `<OutRoot>\traffic-audit-deploy-<yyyyMMdd>`銆�
+
+妯℃澘浠剁粺涓�鏀惧湪 **`deploy-templates/`**锛堝凡鍏ュ簱锛夛細澶栭儴 `application.yml`銆乣start-backend.cmd/.sh`銆乣nginx.conf.example`銆乣db\{init.sql,sql_city_bus,sql_city_taxi,sql_wyc}.sql`銆乣README-閮ㄧ讲璇存槑.txt`銆傛敼妯℃澘鍗虫敼鎵撳寘浜х墿銆�
+
+### 杞崲瀵嗛挜鍚庡悓姝ユ湰鏈�
+
+```powershell
+powershell -NoProfile -ExecutionPolicy Bypass -File set-secrets.ps1
+```
+
+浜や簰寮忚緭鍏ワ紙鍥炶溅璺宠繃鏌愪竴椤癸級锛岃嚜鍔� `setx` 鍒扮敤鎴风幆澧冨彉閲忓苟鎻愮ず閲嶅惎鍚庣锛涘�间笉浼氬啓鍏ヤ换浣曟枃浠躲��
+
### 閮ㄧ讲鏈轰笂鍔�/鎹� DeepSeek key
1. 鎵撳寘涓婁紶鍚庯紝缂栬緫 **jar 鍚岀骇**鐨� `backend/application.yml`锛歚deepseek.api-key: "浣犵殑鏂発ey"`锛堢暀绌哄垯椤甸潰 AI 鍒嗘瀽涓嶅彲鐢紝鍏朵綑鍔熻兘姝ｅ父锛夛紱
--
Gitblit v1.9.1