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 |   90 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 81 insertions(+), 9 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 6d56bda..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"
@@ -64,8 +64,9 @@
 鈹�  鈹溾攢 sql_city_bus.sql                          鍩庡競瀹㈣繍-鍏氦鏈堝害琛紙蹇呴』鎵ц锛�
 鈹�  鈹溾攢 sql_city_taxi.sql                         鍩庡競瀹㈣繍-鍑虹鏈堝害琛�/鎺堟潈琛紙蹇呴』鎵ц锛�
 鈹�  鈹溾攢 sql_wyc.sql                               缃戠害杞﹀叏鐪佹�婚噺/璁㈠崟鍒嗗競宸炶〃锛堝繀椤绘墽琛岋級
-鈹�  鈹溾攢 sql_holiday.sql                           涓撻」缁熻-閲嶈鑺傚亣鏃ヨ〃锛堝繀椤绘墽琛岋級
-鈹�  鈹斺攢 sql_holiday_comparison_base_migration.sql 鑺傚亣鏃ユ棫搴撳崌绾э細鏅�氬浗鐪侀亾鐜瘮鍩烘湡瀛楁
+鈹�  鈹溾攢 sql_holiday.sql                           涓撻」缁熻-閲嶈鑺傚亣鏃ヨ〃锛堟棫搴撹ˉ寤烘椂鎵ц锛�
+鈹�  鈹溾攢 sql_holiday_decimal_migration.sql         鑺傚亣鏃ユ暟鍊煎垪绮惧害杩佺Щ锛堟棫搴撳崌绾э級
+鈹�  鈹斺攢 sql_holiday_comparison_base_migration.sql 鑺傚亣鏃ョ幆姣斿熀鏈熷瓧娈佃縼绉伙紙鏃у簱鍗囩骇锛�
 鈹斺攢 README-閮ㄧ讲璇存槑.txt
 ```
 
@@ -73,9 +74,9 @@
 
 ### 5.1 鍑嗗鏁版嵁搴擄紙涓ゆ潯璺嚎浜岄�変竴锛�**涓嶈娣风潃鍋�**锛�
 
-#### 璺嚎 A锛氬叏鏂扮┖搴擄紙瑕佽窇 5 涓剼鏈級
+#### 璺嚎 A锛氬叏鏂扮┖搴擄紙瑕佽窇 4 涓剼鏈級
 
-`init.sql` 鑷甫 `CREATE DATABASE` 涓� `USE traffic_audit`锛屽彲鐙珛鎵ц锛涘彟澶� 4 涓剼鏈病鏈� `USE` 璇彞锛屽繀椤荤敤 `-D traffic_audit`锛堟垨 `mysql ... traffic_audit < 鏂囦欢`锛夋寚瀹氬簱锛�
+`init.sql` 鑷甫 `CREATE DATABASE` 涓� `USE traffic_audit`锛屽彲鐙珛鎵ц锛涘彟澶� 3 涓剼鏈病鏈� `USE` 璇彞锛屽繀椤荤敤 `-D traffic_audit`锛堟垨 `mysql ... traffic_audit < 鏂囦欢`锛夋寚瀹氬簱锛�
 
 ```bash
 cd db
@@ -83,12 +84,11 @@
 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
-mysql --default-character-set=utf8mb4 -u root -p -D traffic_audit < sql_holiday.sql
 ```
 
 > 鈿狅笍 **`init.sql` 鏄牬鍧忔�х殑**锛氶噷闈㈢殑鍩虹琛ㄩ兘甯� `DROP TABLE IF EXISTS`銆�**宸叉湁鏁版嵁鐨勫簱涓婂崈涓囦笉瑕佸啀璺� init.sql**锛屽惁鍒欒〃鏁版嵁浼氳娓呯┖閲嶅缓銆�
-> 宸查儴缃茶繃鏃╂湡鑺傚亣鏃ユā鍧楃殑鐜版湁搴擄紝鍗囩骇鍓嶅厛鎵ц `sql_holiday_comparison_base_migration.sql` 娣诲姞 `comparison_base` 瀛楁锛涘叏鏂板簱鐩存帴浣跨敤宸叉洿鏂板悗鐨� `sql_holiday.sql`銆�
-> 5 涓剼鏈叡瑕嗙洊 33 寮犺〃锛坕nit.sql 28 寮� + 鍩庡競瀹㈣繍 3 寮� + 缃戠害杞� 2 寮狅級銆�
+> 鏃╂湡鐗堟湰搴撹嫢娌℃湁鑺傚亣鏃� 4 寮犺〃锛屾墽琛� `sql_holiday.sql`锛涜嫢宸叉湁鑺傚亣鏃ヨ〃浣嗙己绮惧害鎴栫幆姣斿熀鏈熷瓧娈碉紝鎸夐渶鎵ц涓や釜杩佺Щ鑴氭湰銆�
+> 4 涓剼鏈叡瑕嗙洊 33 寮犺〃锛坕nit.sql 28 寮狅紝鍏朵腑鍚妭鍋囨棩 4 寮� + 鍩庡競瀹㈣繍 3 寮� + 缃戠害杞� 2 寮狅級銆�
 
 #### 璺嚎 B锛氭妸鐜扮綉/寮�鍙戞満鐨勬暟鎹暣濂楁惉杩囧幓锛堟帹鑽愶紝涓嶇敤璺戣剼鏈級
 
@@ -109,9 +109,9 @@
 mysql --default-character-set=utf8mb4 -u root -p < traffic_audit_full_YYYYMMDD.sql
 ```
 
-- `--databases` 浼氭妸 `CREATE DATABASE` + `USE` 涓�璧峰啓杩涘浠斤紝鎵�浠ョ洰鏍囨満鍣�**涓嶇敤鍏堝缓搴撱�佷篃涓嶇敤璺戦偅 5 涓剼鏈�**銆�
+- `--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 宸紓锛堟柊澧炶妭鍋囨棩妯″潡鍚庝负 33 寮狅級**锛屾娊鏌� `wyc_order_monthly` 2026-08 鏁版嵁涓�鑷达紝楠岃瘉鍚庡凡鍒犻櫎涓存椂搴撱��
 
@@ -223,3 +223,75 @@
 
 - **2026-09-13**锛氭柊澧炰竴閿墦鍖呰剼鏈� `package-deploy.py`锛沯ar 鏀逛负鍐呭祵鍓嶇锛堥儴缃叉満涓嶅啀闇�瑕� nginx锛夛紱鍒犻櫎 Redis 鐩稿叧璇存槑锛堜唬鐮佹湭浣跨敤锛夛紱琛� `sql_wyc.sql` 涓� `summary.template-dir`锛涜ˉ `jwt.secret` 鍙栧�艰鍒欙紱琛ラ儴缃插悗楠岃瘉娓呭崟銆�
 - 2026-08-27锛氶鐗堬紙zip 閮ㄧ讲鍖� + nginx 鏂规锛夈��
+
+---
+
+## 瀵嗛挜涓庨厤缃紙2026-09-26 璧凤紝鎵撳寘蹇呰锛�
+
+### 鍒嗗眰绾﹀畾
+
+| 浣嶇疆 | 鐢ㄩ�� | 鏄惁杩� git | 鏄惁杩� jar |
+| --- | --- | --- | --- |
+| `traffic-audit-server/src/main/resources/application.yml` | 杩� jar 鐨勯粯璁ら厤缃紝**鍙湁鍗犱綅绗�**锛坄${TRAFFIC_DB_PASSWORD:}`銆乣${DEEPSEEK_API_KEY:}` 绛夛級 | 鍚︼紙宸� gitignore锛岀敤 `application.yml.example` 鍋氭ā鏉匡級 | **鏄�**锛堟棤鐪熷疄鍊硷級 |
+| `traffic-audit-server/config/application.yml` | 鏈満寮�鍙戠湡瀹炲�硷紙搴撳彛浠� / JWT / DeepSeek key锛� | 鍚︼紙宸� gitignore锛� | 鍚� |
+| jar 鍚岀骇鐨� `backend/application.yml` | 閮ㄧ讲鏈虹湡瀹炲�硷紙浼樺厛绾ч珮浜� jar 鍐呯疆锛� | 鍚� | 鍚︼紙鍦ㄥ寘澶栵紝鐜板満濉級 |
+| 鐜鍙橀噺 `TRAFFIC_DB_PASSWORD` / `TRAFFIC_DB_USER` / `TRAFFIC_DB_URL` / `TRAFFIC_JWT_SECRET` / `DEEPSEEK_API_KEY` | 瑕嗙洊浠ヤ笂浠绘剰涓�椤� | 鍚� | 鍚� |
+
+### 鏈満寮�鍙戯紙鍊兼斁鐜鍙橀噺锛屼笉钀芥枃浠讹級
+
+```powershell
+setx TRAFFIC_DB_PASSWORD "鏈満 MySQL 鍙ｄ护"     # 璁句竴娆″嵆鍙紝涔嬪悗鏂板紑鐨勭粓绔嚜鍔ㄥ甫涓�
+setx DEEPSEEK_API_KEY   "DeepSeek key"
+# 闇�瑕佹椂鍐嶈鐩栵細setx TRAFFIC_DB_URL / TRAFFIC_DB_USER / TRAFFIC_JWT_SECRET
+
+powershell -NoProfile -ExecutionPolicy Bypass -File start-dev.ps1   # 浼氳嚜鍔ㄤ粠娉ㄥ唽琛ㄨˉ榻愬苟娉ㄥ叆鍚庣杩涚▼
+```
+
+- `traffic-audit-server/config/application.yml` 鍙暀娉ㄩ噴璇存槑锛堟棤鏄庢枃锛夛紱鍒犳帀瀹冧篃涓嶅奖鍝嶏紙鍊煎叏鍦ㄧ幆澧冨彉閲忛噷锛夈��
+- 鑻ョ敤 IDE 鐩存帴璺戜富绫伙紝璇峰湪**鏂板紑鐨�**缁堢/IDE 閲屽惎鍔紙璁╂柊缁堢缁ф壙鐢ㄦ埛鐜鍙橀噺锛夛紝鎴栨墜鍔� `setx` 鍚庨噸鍚� IDE銆�
+
+### 鎵撳寘鍓嶈嚜鏌ワ紙30 绉掞級
+
+```powershell
+# 1) 纭杩� jar 鐨勯厤缃病鏈夌湡瀹炲瘑閽ワ紙搴斿彧鐪嬪埌 ${...}锛�
+Select-String -Path traffic-audit-server\src\main\resources\application.yml -Pattern "password:|api-key:|secret:"
+# 2) 鎵撳畬鍖呭悗鍐嶉獙璇佷竴娆� jar 鍐呴儴
+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 鍒嗘瀽涓嶅彲鐢紝鍏朵綑鍔熻兘姝ｅ父锛夛紱
+2. 閲嶅惎鍚庣锛歚start-backend.cmd`锛堟垨 `java -jar traffic-audit-server-1.0.0-SNAPSHOT.jar`锛夛紱
+3. 椤甸潰閲岀偣涓�娆� AI 鍒嗘瀽纭鍙敤锛�
+4. **涓嶈**鍘绘敼 jar 鍐呴儴鐨勯厤缃紙鏀逛簡涓嬫鍙戝寘灏变涪锛夛紝涔熶笉瑕佹妸 key 鎻愪氦杩涗换浣曚粨搴撴枃浠躲��
+
+### 杞崲锛堜綔搴燂級宸叉硠闇茬殑 key
+
+1. 鐧诲綍 DeepSeek 鎺у埗鍙� 鈫� API Keys 鈫� 鏂板缓涓�涓� key锛�
+2. 鍒犻櫎/绂佺敤鏃� key锛堟棫 key 绔嬪埢澶辨晥锛屾鍓嶆墦鍖呭甫鍑哄幓鐨� jar 閲岄偅浠藉嵆浣滃簾锛夛紱
+3. 鎸変笂闈㈢ 1~3 姝ユ妸鏂� key 濉埌閮ㄧ讲鏈虹殑澶栭儴閰嶇疆骞堕噸鍚獙璇併��

--
Gitblit v1.9.1