dong/webhtv-mys
0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-10-08 19:44:46 +00:00
Code Issues Releases Packages Activity

merge: 合并 origin/beta 最新代码（PR#417/#418）并复评 T3→T4 本机网关

Browse source 
纳入 beta 唯一实质增量 6e667a236f：gradle/gradle-daemon-jvm.properties
从已下架的 JetBrains JBR 21 硬钉改为「Java 21、任意厂商」并重新生成
10 个有效下载地址，修复 CI 在测试前即中断的问题（旧 toolchainVendor=JETBRAINS
已移除，实测 ./gradlew --version 显示 Compatible with Java 21, any vendor）。
0 冲突、0 冲突标记。

复评 dev3 全部已修改代码（含已提交未推送的 c388619629 T3→T4 本机网关），
4 轮评审全部通过，未发现必修问题，本任务未修改任何生产代码。

远端已移除/回退内容零复活：全 refs 258 个 revert-like 提交、1144 条被触及
路径逐条比对，合并索引树相对 origin/beta 复活数 = 0；净差异 5 个路径与
revert 路径集交集为空。检测器已用「注入伪造树」反证有效（能正确报出
ISSUE_TEMPLATE），故 0 复活非空转结论。

验证：
- VodApiTest 31 tests / 0 skipped / 0 failures / 0 errors；
- 双 flavor Java 与 AndroidTest 编译 BUILD SUCCESSFUL；
- node --check、git diff --check、冲突标记扫描均通过；
- UI token 门禁 violations=1，为既有 item_following.xml，相对 beta 零新增；
- 实机 192.168.50.3:5559 端到端：170 个站源、真实站源搜索/详情/播放/分类
  与 base64 ext 筛选全部正常，内部 site/tmdb 字段未泄漏；
  /file/WebHTV/EnvFiles/T4Proxy.js 回退资源与内置 asset 逐字节一致。

净差异（相对 origin/beta）仅 5 个路径，全部为 dev3 自身改动：
T4Proxy.js、Nano.java、VodApi.java、VodApiTest.java、docs/C45-t4-api-gateway.md。

Verification: merge origin/beta d8daedf86c (0 conflicts, 1 path: gradle/gradle-daemon-jvm.properties); zero revived remote-removed paths (1144 revert-touched paths scanned, detector self-test with injected fake tree reports REVIVED; net diff vs origin/beta disjoint from revert set); beta increment and dev3 changes lossless (per-path SAME); VodApiTest 31 passed 0 failures; dual-flavor Java+AndroidTest compile BUILD SUCCESSFUL; gradlew --version shows 'Java 21, any vendor'; node --check passed; UI token gate relative to beta zero new violations; device 192.168.50.3:5559 e2e: 170 sites, real-source search/detail/play/category/ext filter, asset fallback byte-identical; git diff --check clean; no conflict markers

Task-Guard: C46-beta-merge-review-dev3-20261008
This commit is contained in:
Silent1566 2026-10-08 16:43:37 +08:00
commit 5d4a7e8e18
2 changed files with 159 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files