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 b0cd3d6f6..92c9faca8 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 @@ -120,6 +120,10 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { *
  • {@code /api/delete-brand} —— 删品牌任务单,与已在名单里的 /api/brand 同形状,等同一批客户端
  • *
  • {@code /api/module-templates} —— 模板列表按 user_id 取,匿名可读他人模板
  • *
  • {@code /api/split} —— 拆合单任务,随 /api/convert 那批一起收
  • + *
  • {@code /api/jd-collect} —— v1.4 京东采集任务面(建单/chunk 回传/心跳):建单方法体已有 + * requireOwnershipUserId(fail-closed 401),chunk 与 heartbeat 和 collect-data/delete-brand + * 同形状(本机桌面执行器不带凭据,行归属以任务 owner 投影);chunk 的 error 上报已接整单 + * 判死,其 owner 对撞收口随 v1.4 Phase 6.1 落,判死口凭据化后随统一批进名单
  • * */ static final Set PENDING_CONVERGENCE = Set.of( @@ -128,7 +132,8 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { "/api/dedupe", "/api/delete-brand", "/api/module-templates", - "/api/split"); + "/api/split", + "/api/jd-collect"); private final RequestMappingHandlerMapping handlerMapping; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java index a72d186fd..081a97f6d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdResultIngestService.java @@ -8,6 +8,7 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity; import com.nanri.aiimage.common.retry.CredentialFatalClassifier; import com.nanri.aiimage.common.task.TaskStatuses; import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.common.text.UserMessages; import com.nanri.aiimage.modules.jd.mapper.JdProductMapper; import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest; import com.nanri.aiimage.modules.jd.model.dto.JdIngestChunkRequest; @@ -18,6 +19,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; 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.CredentialFatalTaskCloser; +import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -308,7 +310,9 @@ public class JdResultIngestService { try { return objectMapper.convertValue(summary, JdIngestChunkRequest.JdProductSummaryDto.class); } catch (IllegalArgumentException ex) { - throw new BusinessException("回传 summary 字段形状不合法: " + ex.getMessage(), ex); + // 原始异常文本不进用户可见出口(RawExceptionMessageSinkGuardTest):中文详情才拼接,原文只留日志。 + log.warn("[jd-collect] 回传 summary 字段形状不合法 err={}", ex.getMessage(), ex); + throw new BusinessException(UserMessages.with("回传 summary 字段形状不合法", ex), ex); } } @@ -331,7 +335,8 @@ public class JdResultIngestService { private FileTaskEntity requireJdTask(Long taskId) { FileTaskEntity task = fileTaskMapper.selectById(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + // 归属谓词走 TaskFinalizeSupport 出口(棘轮只许降不许升,新增校验不得手抄字面量)。 + if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) { throw new BusinessException("任务不存在"); } return task; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdStaleTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdStaleTaskService.java index 4f9d8a01d..f8a52b1c1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdStaleTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdStaleTaskService.java @@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.jd.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.nanri.aiimage.common.service.DistributedJobLockService; +import com.nanri.aiimage.common.task.LockSkipWitness; import com.nanri.aiimage.common.task.TaskStatuses; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; @@ -60,6 +61,7 @@ public class JdStaleTaskService { DistributedJobLockService.LockHandle lock = distributedJobLockService.tryLock("jd-collect:stale-check", java.time.Duration.ofMinutes(10)); if (lock == null) { + LockSkipWitness.abandoned("jd-collect:stale-check"); return; } try (lock) { @@ -81,6 +83,7 @@ public class JdStaleTaskService { TaskDistributedLockService.LockHandle taskLock = taskDistributedLockService.acquire(MODULE_TYPE, task.getId(), 0L); if (taskLock == null) { + LockSkipWitness.recordAbandoned("jd-collect:stale-finalize", MODULE_TYPE, task.getId()); continue; } try (taskLock) { 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 6514379c4..f553aec39 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 @@ -97,7 +97,10 @@ class RequestSuppliedIdentityOutletTest { // 两边都是 @RequestParam("user_id") 先过 resolveOwnershipUserId——记账变大是覆盖面变大,不是放宽分母。 // 129 而不是 128:2026-11-03 f43ed6f1「任务中断+继续」新增 TaskHeartbeatController // POST /api/tasks/{taskId}/interrupt,鉴权镜像 retry(先过 resolveOwnershipUserId 再比归属)。 - assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(129); + // 130 而不是 129:2026-11-14 v1.4 Phase 2 新增 JdCollectController POST /api/jd-collect/tasks, + // JdCollectTaskCreateRequest 带 userId 字段(DTO 形),先过 requireOwnershipUserId(fail-closed + // 401,uid 不由请求体说了算)再落建单——覆盖面变大,不是放宽分母。 + 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); diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java index 7f7f15095..b7a49c788 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java @@ -125,8 +125,11 @@ class SuperAdminPredicateSingleOutletTest { // 18 -> 19:v1.2 Phase 3 证据读取面 AdminTaskEvidenceController#requireSuperAdmin。 // 19 -> 20:v1.3 Phase 3 外观专利无侵权只读页 // AdminAppearancePatentCleanItemsController#requireSuperAdmin(2026-11-10 整量回归补记)。 + // 20 -> 22:v1.4 Phase 5 京东数据库读取面——AdminJdProductController#requireJdDatabaseAccess + // 与 AdminJdProductGroupController#requireJdDatabaseAccess 两处超管直通 + // (2026-11-14 整量回归补记,同 AdminTaskEvidenceController 先例)。 .as("走出口的调用点数:17 个业务调用方 + DataReadScope 包装体(新增调用要一起改这个数字,别改回字面量)") - .isEqualTo(20); + .isEqualTo(22); // 自检:这三把尺子的锚点必须真落在预期的文件里,否则"恰好也是 N"可能是扫错地方凑出来的 assertThat(read(mainRoot().resolve("common/security/DeviceSessionPolicy.java"))) .contains("public static boolean isSuper(String resolvedRole)"); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java index b1ecc206b..5920458b8 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFailureCategoryGuardrailTest.java @@ -85,8 +85,14 @@ class TaskFailureCategoryGuardrailTest { *

    2026-11-12:外观专利/相似ASIN 两处实体式落库搬进 {@code CredentialFatalTaskCloser}, * 总量 160 − 2 + 1(收口器自己那一处,实体取自 {@code selectById} 的新鲜行,不涉 ALWAYS 抹列)= 159。 * 这是"在册写点被挪走"那一支,不是新增写法。 + * + *

    159 → 162:2026-11-14 v1.4 京东模块新增三处——JdProductGroupService 分组改名/排序一处 + * (JdProductGroupEntity 无 ALWAYS 字段)、JdResultIngestService scope 台账合并写两处 + * (TaskScopeStateEntity 无 ALWAYS 字段,且写前经合并读回,铁律 30)。三处传入实体都不带 + * ALWAYS 家族列(ALWAYS 只在 PriceTrackLoopRun/ShopKey/SkipPriceAsin/FileTask 四实体), + * 审过无抹列风险后登记基线。 */ - private static final int REGISTERED_UPDATE_BY_ID_SITES = 159; + private static final int REGISTERED_UPDATE_BY_ID_SITES = 162; @Test void 任务失败文案写点必须同笔写分类列() {