From b5578561df5bf9e0ea4896b246a4f2c84ff3978c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 18 Nov 2026 02:56:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(guardrails):=20=E4=BA=AC=E4=B8=9C=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E4=BA=94=E5=AE=88=E5=8D=AB=E6=A0=BC=E6=95=B4=E9=87=8F?= =?UTF-8?q?=E8=A1=A5=E8=AE=B0=EF=BC=8824272a91=20=E7=82=B9=E5=90=8D=2087?= =?UTF-8?q?=20=E4=BE=8B=E6=B2=A1=E8=B7=91=E6=95=B4=E9=87=8F=E3=80=81?= =?UTF-8?q?=E4=B8=A4=E5=A4=84=E8=B4=A6=E6=9C=AC=E4=B8=8E=E5=9B=9B=E4=B8=AA?= =?UTF-8?q?=E5=88=86=E6=AF=8D=E6=BC=8F=E8=AE=B0=EF=BC=8C2026-11-18=20?= =?UTF-8?q?=E5=8F=91=E7=89=88=E5=89=8D=E6=95=B4=E9=87=8F=205689=20?= =?UTF-8?q?=E4=BE=8B=E6=8A=93=E5=88=B0=EF=BC=89=E2=80=94=E2=80=94=E2=91=A0?= =?UTF-8?q?TaskFailureCategoryGuardrail=20B51-R1=EF=BC=9AJdPublishIngestSe?= =?UTF-8?q?rvice.summarizeTerminal=20=E6=96=87=E6=A1=88=E5=85=88=E8=90=BD?= =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=20message=20=E5=86=8D?= =?UTF-8?q?=E9=85=8D=E5=AF=B9=E5=86=99=E5=88=97=EF=BC=88=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E4=B8=89=E5=85=83=E9=87=8C=E5=90=84=E5=86=99=E5=90=84=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=A2=AB=E3=80=8C=E5=86=99=E7=9A=84?= =?UTF-8?q?=E5=88=97=E4=B8=8E=E6=96=87=E6=A1=88=E4=B8=8D=E6=98=AF=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9D=A5=E6=BA=90=E3=80=8D=E5=88=A4=E7=BA=A2?= =?UTF-8?q?=EF=BC=9BCollectDataService=20failTask=20=E6=AD=A3=E6=9C=AC?= =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E5=90=8C=E6=BA=90=EF=BC=89=EF=BC=9B=E2=91=A1?= =?UTF-8?q?ApiGuardCoverageAuditor=20PENDING=5FCONVERGENCE=20=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=20/api/jd-publish=EF=BC=88=E4=B8=8E=20/api/jd-collect?= =?UTF-8?q?=20=E9=80=90=E5=BD=A2=E7=8A=B6=E5=90=8C=E6=97=8F=EF=BC=9A?= =?UTF-8?q?=E5=BB=BA=E5=8D=95=E7=AD=89=E4=BA=94=E7=AB=AF=E7=82=B9=20requir?= =?UTF-8?q?eOwnershipUserId=20fail-closed=E3=80=81chunk=20=E5=88=A4?= =?UTF-8?q?=E6=AD=BB=E5=8F=A3=E5=87=AD=E6=8D=AE=E5=8C=96=20isTrustedIntern?= =?UTF-8?q?alToken=20=E5=8C=BF=E5=90=8D=E6=8B=92=E7=BB=9D=E5=88=A4?= =?UTF-8?q?=E6=AD=BB=E3=80=81JdPublishChunkRequest=20=E4=B8=8D=E5=B8=A6=20?= =?UTF-8?q?userId=20=E4=B8=8D=E8=BF=9B=E8=BA=AB=E4=BB=BD=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=EF=BC=89=EF=BC=9B=E2=91=A2RequestSuppliedIdentityOutletTest=20?= =?UTF-8?q?=E5=86=99=E7=B1=BB=E5=88=86=E6=AF=8D=20133=E2=86=92136=EF=BC=88?= =?UTF-8?q?=E5=BB=BA=E5=8D=95=20DTO=20=E5=BD=A2=EF=BC=8Bactivate=EF=BC=8Bh?= =?UTF-8?q?eartbeat=20=E4=B8=89=E6=94=AF=EF=BC=89=E3=80=81=E8=AF=BB?= =?UTF-8?q?=E7=B1=BB=2067=E2=86=9269=EF=BC=88items=EF=BC=8Bprogress=20?= =?UTF-8?q?=E4=B8=A4=E6=94=AF=EF=BC=89=EF=BC=8Cchunk=20=E4=B8=8D=E8=AE=A1?= =?UTF-8?q?=E5=85=A5=EF=BC=88=E7=95=99=E7=97=95=E6=B3=A8=E9=87=8A=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E2=91=A3MigratedSqlEquivalenceTest=20XML=5FSELECT=5FT?= =?UTF-8?q?OTAL=20103=E2=86=92105=EF=BC=8BNOT=5FMIGRATED=20=E7=82=B9?= =?UTF-8?q?=E5=90=8D=20JdPublishItemMapper#selectPublishableItems/countByP?= =?UTF-8?q?ublishStatus=EF=BC=9B=E2=91=A4SqlLayeringConventionTest=20XML?= =?UTF-8?q?=5FSTATEMENT=5FTOTAL=20147=E2=86=92149=E3=80=82=E5=88=A4?= =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E7=82=B9=E5=90=8D=205=20=E7=B1=BB=2034/34=20?= =?UTF-8?q?=E7=BB=BF=EF=BC=8B=E6=95=B4=E9=87=8F=205689=20=E4=BE=8B?= =?UTF-8?q?=EF=BC=880=20=E5=A4=B1=E8=B4=A5/19=20skip=EF=BC=89BUILD=20SUCCE?= =?UTF-8?q?SS=209:51min=E2=80=94=E2=80=94=E4=BF=AE=E5=A4=8D=20jar=20?= =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E5=8F=B0=E9=9A=94=E7=A6=BB=20jar=20=E5=90=8C?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aiimage/config/ApiGuardCoverageAuditor.java | 8 +++++++- .../modules/jd/service/JdPublishIngestService.java | 7 +++++-- .../nanri/aiimage/MigratedSqlEquivalenceTest.java | 14 ++++++++++++-- .../nanri/aiimage/SqlLayeringConventionTest.java | 6 +++++- .../RequestSuppliedIdentityOutletTest.java | 13 +++++++++++-- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java index f614e3a22..b7ba68816 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java @@ -118,6 +118,11 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { * requireOwnershipUserId(fail-closed 401),chunk 与 heartbeat 和 collect-data/delete-brand * 同形状(本机桌面执行器不带凭据,行归属以任务 owner 投影);chunk 的 error 上报已接整单 * 判死,其 owner 对撞收口随 v1.4 Phase 6.1 落,判死口凭据化后随统一批进名单 + *
  • {@code /api/jd-publish} —— v1.5 京东商品上架任务面(建单/activate/items/progress/chunk/ + * heartbeat):与 /api/jd-collect 逐形状同族——建单等五端点方法体已有 requireOwnershipUserId + * (fail-closed 401,B98-07 同形债预防),chunk 判死口凭据化(isTrustedInternalToken, + * 匿名一律拒绝判死),行级落库与 jd-collect 同形状(本机桌面执行器不带凭据,行归属以 + * 任务 owner 投影);判死口凭据化后随统一批进名单
  • * */ static final Set PENDING_CONVERGENCE = Set.of( @@ -127,7 +132,8 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { "/api/delete-brand", "/api/module-templates", "/api/split", - "/api/jd-collect"); + "/api/jd-collect", + "/api/jd-publish"); private final RequestMappingHandlerMapping handlerMapping; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java index 0a06df3a3..522ec8111 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestService.java @@ -170,6 +170,9 @@ public class JdPublishIngestService { reason.append(",未发布 ").append(unpublished).append(" 行"); } LocalDateTime now = LocalDateTime.now(); + // 文案先落局部变量再配对写列(B51-R1 守卫「写的列与文案同一个来源」:列由同一句文案派生, + // 三元里各写各的表达式会被 TaskFailureCategoryGuardrailTest 判为不同源即红)。 + String message = anyFailed ? reason.toString() : null; int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, taskId) .eq(FileTaskEntity::getModuleType, JdPublishTaskService.MODULE_TYPE) @@ -177,8 +180,8 @@ public class JdPublishIngestService { .set(FileTaskEntity::getStatus, status) .set(FileTaskEntity::getSuccessFileCount, success) .set(FileTaskEntity::getFailedFileCount, failed) - .set(FileTaskEntity::getErrorMessage, anyFailed ? reason.toString() : null) - .set(FileTaskEntity::getFailureCategory, anyFailed ? TaskFailureLedger.categoryOf(reason.toString()) : null) + .set(FileTaskEntity::getErrorMessage, message) + .set(FileTaskEntity::getFailureCategory, message == null ? null : TaskFailureLedger.categoryOf(message)) .set(FileTaskEntity::getUpdatedAt, now) .set(FileTaskEntity::getFinishedAt, now)); if (updated > 0) { diff --git a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java index 5a1dcd276..24f1f1f43 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java @@ -106,7 +106,10 @@ class MigratedSqlEquivalenceTest { // 该笔当时只点编译没跑整量、两处账本都漏记,2026-11-15 发版前整量抓到补记。 // 114 → 103:keywordshare 模块整体下线(Project-Slimming 第三轮:6.4 天访问日志零流量、 // 四树零引用、V165 已撤菜单),随删 11 条 select 与下方 NOT_MIGRATED 的 12 条点名。 - private static final int XML_SELECT_TOTAL = 103; + // 103 → 105:2026-11-18 整量补记 v1.5 Phase 2(24272a91)JdPublishItemMapper 新写 2 条 + // 只读 select(selectPublishableItems + countByPublishStatus),逐条点名进 NOT_MIGRATED + //(SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 147 → 149)。 + private static final int XML_SELECT_TOTAL = 105; /** * 不是「从注解搬过来」的语句:注解时代没有原文可对撞,等价性这支只能跳过它们。 @@ -217,7 +220,14 @@ class MigratedSqlEquivalenceTest { // 注解时代原文没有这列(同批 selectAllGroups 也漏了 platform 投影,那已在 // 上面豁免),平台闸读不到平台档把全部组清空。按同款先例整行摘账本点名留痕 // (LEDGER_ROWS 82 → 81 / SELECTS 58 → 57);新形状由 ShopManageGroupScopeSqlTest 钉。 - "ShopManageGroupMapper#selectLedGroups"); + "ShopManageGroupMapper#selectLedGroups", + // 2026-11-18 整量补记:v1.5 Phase 2 京东商品上架(24272a91)JdPublishItemMapper + // 新写 2 条只读 select(selectPublishableItems 明细分批下发页 PENDING 谓词+id 游标、 + // countByPublishStatus 行级状态聚合),从来没有注解原文可对撞,逐条点名留痕。 + // 该笔点名 12 类 87 例没跑整量、两处账本漏记,2026-11-18 发版前整量抓到补记 + //(XML_SELECT_TOTAL 103 → 105,SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 147 → 149)。 + "JdPublishItemMapper#selectPublishableItems", + "JdPublishItemMapper#countByPublishStatus"); /** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */ private static final int LEDGER_COLUMNS = 5; diff --git a/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java b/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java index 00f7a0a01..6ac307a9f 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java @@ -131,7 +131,11 @@ class SqlLayeringConventionTest { // 164 → 147:keywordshare 模块整体下线(Project-Slimming 第三轮:6.4 天访问日志零流量、 // 四树零引用、V165 已撤菜单),4 份 XML 17 条语句(11 select + 4 insert + 1 delete)随删; // 同轮 MigratedSqlEquivalenceTest.XML_SELECT_TOTAL 114 → 103、NOT_MIGRATED 摘掉 12 条点名。 - private static final int XML_STATEMENT_TOTAL = 147; + // 147 → 149:2026-11-18 整量补记 v1.5 Phase 2(24272a91)京东商品上架在 JdPublishItemMapper + // 落 2 条只读 select(selectPublishableItems 明细分批下发页 + countByPublishStatus 行级聚合), + // 全部新写,非迁移语句;同轮登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED + //(该文件 XML_SELECT_TOTAL 同轮 103 → 105)。 + private static final int XML_STATEMENT_TOTAL = 149; /** * wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数: diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java index 4abd3aff3..38da52d05 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java @@ -107,7 +107,13 @@ class RequestSuppliedIdentityOutletTest { // POST /api/jd-collect/tasks/progress/batch(批量进度:request.userId 先过 requireOwnershipUserId // 再 filterOwnedTaskIds 过滤归属)+ DELETE /api/jd-collect/tasks/{taskId}(@RequestParam("user_id") // 先过 resolveOwnershipUserId,删除任务行连带 jd 三表)——覆盖面变大,不是放宽分母。 - assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(133); + // 136 而不是 133:2026-11-18 v1.5 Phase 2 京东商品上架(24272a91)新增三支写类端点—— + // POST /api/jd-publish/tasks(建单:JdPublishTaskCreateRequest 带 userId DTO 形,先过 + // requireOwnershipUserId fail-closed、请求体自带值不采信)+ POST /api/jd-publish/tasks/{taskId}/activate + // + POST /api/jd-publish/tasks/{taskId}/heartbeat(都是 @RequestParam("user_id") 先过 + // requireOwnershipUserId);chunk 回传不走身份出口(判死口凭据化 isTrustedInternalToken, + // JdPublishChunkRequest 不带 userId 字段),不计入——覆盖面变大,不是放宽分母。 + assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(136); // 64 而不是 63:2026-10-29 随本地采集开关恢复 GET /tasks/{taskId}/queue-payload, // 该 handler 同时接上 resolveOwnershipUserId(不是放宽分母)。 // 65 而不是 64:2026-11-14 v1.4 新增 JdCollectController GET /api/jd-collect/tasks/{taskId}/progress @@ -116,7 +122,10 @@ class RequestSuppliedIdentityOutletTest { // 67 而不是 65:2026-11-15 京东任务面板改版(45d0989a)新增两支读类端点—— // GET /api/jd-collect/dashboard(统计卡)+ GET /api/jd-collect/history(历史层,limit 钳制 1..100), // 都是 @RequestParam("user_id") 先过 resolveOwnershipUserId——覆盖面变大,不是放宽分母。 - assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(67); + // 69 而不是 67:2026-11-18 v1.5 Phase 2 新增两支读类端点——GET /api/jd-publish/tasks/{taskId}/items + // + GET /api/jd-publish/tasks/{taskId}/progress,都是 @RequestParam("user_id") 先过 + // requireOwnershipUserId——覆盖面变大,不是放宽分母。 + assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(69); assertThat(scan.unbound()).as("取请求身份但未接出口的 handler:只剩豁免那一条") .containsExactlyElementsOf(ALLOWED_WITHOUT_OUTLET); }