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); }