From 47278ee425cdcc711910bf8c324174f05c352e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 14 Nov 2026 18:36:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(phase-6):=20=E5=90=8E=E7=AB=AF=E6=95=B4?= =?UTF-8?q?=E9=87=8F=E4=B8=A4=E5=A4=84=E6=A3=98=E8=BD=AE=E7=BA=A2=E9=97=AD?= =?UTF-8?q?=E7=8E=AF=E2=80=94=E2=80=94=E5=BD=92=E5=B1=9E=E8=B0=93=E8=AF=8D?= =?UTF-8?q?=E6=94=B9=E8=B5=B0=20TaskFinalizeSupport=20=E5=87=BA=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E8=AF=BB=E7=B1=BB=E8=BA=AB=E4=BB=BD=E5=87=BA=E5=8F=A3?= =?UTF-8?q?=E5=88=86=E6=AF=8D=2064->65=20=E7=82=B9=E5=90=8D=E7=99=BB?= =?UTF-8?q?=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 整量 mvn -o test 首跑 5540 例 2 红(闸门 73 格不覆盖这两把尺,正是 AGENTS 记的「full 闸门绿 != 后端整量绿」): 1) TaskLifecycleDebtRatchetTest 15 -> 16 文件:36e110d2 的 JdCollectTaskService#queryProgress 手抄了第 17 处归属谓词。按该棘轮设计意图改走公共出口 TaskFinalizeSupport.belongsToModule(与 JdResultIngestService 同形),不是把阈值调大。 2) RequestSuppliedIdentityOutletTest boundRead 64 -> 65:36e110d2 新增 GET /api/jd-collect/tasks/{taskId}/progress(用户端进度条),@RequestParam(user_id) 先过 requireOwnershipUserId(fail-closed),属覆盖面变大,按先例(128->129->130)点名登记并写清是谁的哪一笔。 复跑:点名 7 类 44 例绿;整量 5540 例 0 失败 19 skip BUILD SUCCESS(4:43)。 --- .../aiimage/modules/jd/service/JdCollectTaskService.java | 4 +++- .../common/security/RequestSuppliedIdentityOutletTest.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java index 813962f7b..c1a85733f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdCollectTaskService.java @@ -14,6 +14,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.CollectChannel; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity; +import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; import com.nanri.aiimage.common.security.AdminAuthSupport; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -180,7 +181,8 @@ public class JdCollectTaskService { throw new BusinessException("任务 ID 不合法"); } FileTaskEntity task = fileTaskMapper.selectById(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + // 归属谓词走公共出口(TaskLifecycleDebtRatchetTest 棘轮只许降:新增手写遍数即红)。 + if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) { throw new BusinessException("任务不存在: " + taskId); } if (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId())) { 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 f553aec39..14c7bba63 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 @@ -103,7 +103,10 @@ class RequestSuppliedIdentityOutletTest { assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(130); // 64 而不是 63:2026-10-29 随本地采集开关恢复 GET /tasks/{taskId}/queue-payload, // 该 handler 同时接上 resolveOwnershipUserId(不是放宽分母)。 - assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(64); + // 65 而不是 64:2026-11-14 v1.4 新增 JdCollectController GET /api/jd-collect/tasks/{taskId}/progress + // (用户端「获取店铺数据」进度条数据源),@RequestParam("user_id") 先过 requireOwnershipUserId + // (fail-closed 401,与建单同口径),覆盖面变大不是放宽分母。 + assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(65); assertThat(scan.unbound()).as("取请求身份但未接出口的 handler:只剩豁免那一条") .containsExactlyElementsOf(ALLOWED_WITHOUT_OUTLET); }