From 77bfd4cf1b4e38156fb479688e0ac83c87a4c1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 19 Nov 2026 00:09:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(phase-5):=20v1.5=20CR=20=E6=B6=88=E9=A1=B9?= =?UTF-8?q?=20JD-PUB-01~07=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8D=8A=E8=BE=B9?= =?UTF-8?q?=EF=BC=88=E8=93=9D=E5=9B=BE=20docs/ITERATION=5FPLAN.md=20Phase?= =?UTF-8?q?=205=EF=BC=89=E2=80=94=E2=80=94=E2=91=A0JD-PUB-01=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=AB=AF=E7=82=B9=E6=94=B6=E6=9C=89=E6=95=88=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BC=9A=E8=AF=9D=EF=BC=8B=E4=BB=BB=E5=8A=A1=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E9=97=B8=EF=BC=88AdminAuthSupport=20=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E6=BA=90=E6=94=B6=E5=8F=A3=EF=BC=8Coutlet=20=E5=88=86?= =?UTF-8?q?=E6=AF=8D=E9=9A=8F=E8=A1=8C=EF=BC=8CRequestSuppliedIdentityOutl?= =?UTF-8?q?etTest=20+1=EF=BC=89=EF=BC=9B=E2=91=A1JD-PUB-02=20=E5=BB=BA?= =?UTF-8?q?=E5=8D=95/=E5=8E=9F=E4=BD=8D=E9=87=8D=E8=AF=95=E8=A1=A5?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E8=BE=B9=E7=95=8C=E9=98=B2=E5=8D=8A=E6=88=AA?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9B=E2=91=A2JD-PUB-03=20=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E6=A0=A1=E9=AA=8C=E6=89=A7=E8=A1=8C=E4=BB=A3=E6=AC=A1?= =?UTF-8?q?=E4=B8=8E=E8=AE=B8=E5=8F=AF=E6=89=B9=E6=AC=A1=EF=BC=88V213=5F?= =?UTF-8?q?=5Fjd=5Fpublish=5Fitem=5Fpermit=20=E4=B8=A4=E5=88=97=20nullable?= =?UTF-8?q?=20=E6=89=A9=E5=B1=95=EF=BC=8CExpand-and-Contract=EF=BC=9B?= =?UTF-8?q?=E6=97=A7=E4=BB=A3=E4=B8=8D=E5=86=99=E6=96=B0=E4=BB=A3=E3=80=81?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=9B=9E=E6=89=A7=E5=B9=82=E7=AD=89=E3=80=81?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E6=98=8E=E7=BB=86=E4=B8=8D=E4=BA=A7?= =?UTF-8?q?=20SUCCESS=EF=BC=89=EF=BC=9B=E2=91=A3JD-PUB-04=20=E5=85=A5?= =?UTF-8?q?=E9=98=9F=E4=B8=8D=E5=86=8D=E7=AD=89=E4=BA=8E=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=EF=BC=88=E6=BF=80=E6=B4=BB=E4=B8=8E=E6=A1=8C=E9=9D=A2=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=85=9C=E5=BA=95=E4=BF=9D?= =?UTF-8?q?=E7=95=99=EF=BC=89=EF=BC=9B=E2=91=A4JD-PUB-05=20=E6=9C=AA?= =?UTF-8?q?=E7=9F=A5=E6=8F=90=E4=BA=A4=E4=B8=8D=E8=87=AA=E5=8A=A8=E9=87=8D?= =?UTF-8?q?=E5=8F=91=EF=BC=9B=E2=91=A5JD-PUB-06=20=E6=97=A7=E4=BB=A3?= =?UTF-8?q?=E7=BB=88=E6=80=81=E4=B8=8D=E8=A7=A6=E5=8F=91=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E6=94=B6=E5=B0=BE=E6=88=96=E5=BC=B9=E7=AA=97=EF=BC=88credentia?= =?UTF-8?q?l-fatal=20=E6=97=A7=E4=BB=A3=E9=9A=94=E7=A6=BB=EF=BC=8B?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88=E8=AF=86?= =?UTF-8?q?=E5=88=AB=EF=BC=89=EF=BC=9B=E2=91=A6JD-PUB-07=20=E9=80=89?= =?UTF-8?q?=E5=93=81=E5=88=87=E5=88=86=E7=B1=BB=E4=B8=A2=E5=BC=83=E8=BF=9F?= =?UTF-8?q?=E5=88=B0=E5=93=8D=E5=BA=94=E3=80=81=E5=85=A8=E9=80=89=E5=8F=AA?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=9C=AC=E9=A1=B5=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20mount=20=E6=B5=8B=E8=AF=95=20jd-publish-dispatch=E3=80=82?= =?UTF-8?q?=E5=88=A4=E6=8D=AE=EF=BC=9A=E5=90=8E=E7=AB=AF=E7=82=B9=E5=90=8D?= =?UTF-8?q?=2011=20=E7=B1=BB=2088=20=E4=BE=8B=EF=BC=8B=E6=95=B4=E9=87=8F?= =?UTF-8?q?=20mvn=20-o=20test=205,716=20=E4=BE=8B=200=20=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=200=20=E9=94=99=E8=AF=AF=2019=20skip=20BUILD=20SUCCESS?= =?UTF-8?q?=EF=BC=8800:07=EF=BC=8C7:12min=EF=BC=89=EF=BC=9B=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=20vue-tsc=20rc0=EF=BC=8Bnode=20--test=2031?= =?UTF-8?q?=EF=BC=8Bvitest=20mount=208=20=E5=85=A8=E7=BB=BF=EF=BC=9Bfull?= =?UTF-8?q?=20=E9=97=B8=E9=97=A8=20overall=3Dpass=20=E5=9B=9B=E9=9D=A2?= =?UTF-8?q?=E7=BB=BF=EF=BC=882026-11-18=2023:59:16=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=E7=9C=9F=E6=9C=BA=20AC-1~AC-9=20=E8=81=94=E9=AA=8C=E4=B8=8E?= =?UTF-8?q?=E5=8F=91=E7=89=88=E6=9C=AA=E5=81=9A=EF=BC=8CPhase=205=20?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E6=9C=AA=E5=8B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/AdminAuthSupport.java | 12 + .../config/ApiGuardCoverageAuditor.java | 9 +- .../jd/controller/JdPublishController.java | 48 +-- .../jd/model/dto/JdPublishChunkRequest.java | 18 +- .../jd/model/entity/JdPublishItemEntity.java | 6 +- .../modules/jd/model/vo/JdPublishChunkVo.java | 2 + .../jd/model/vo/JdPublishHistoryItemVo.java | 1 + .../jd/model/vo/JdPublishItemsPageVo.java | 1 + .../jd/model/vo/JdPublishProgressVo.java | 1 + .../jd/model/vo/JdPublishTaskItemVo.java | 1 + .../jd/service/JdPublishBoardService.java | 10 +- .../jd/service/JdPublishIngestService.java | 274 +++++++--------- .../jd/service/JdPublishStaleTaskService.java | 2 + .../JdPublishTaskItemsResetSpiImpl.java | 17 +- .../jd/service/JdPublishTaskPullSpiImpl.java | 5 + .../jd/service/JdPublishTaskService.java | 63 ++-- .../controller/TaskClientPullController.java | 9 +- .../modules/task/mapper/FileTaskMapper.java | 3 + .../task/service/TaskClientPullService.java | 13 +- .../task/service/TaskInPlaceRetryService.java | 5 + .../db/V213__jd_publish_item_permit.sql | 5 + .../resources/mapper/task/FileTaskMapper.xml | 3 + .../aiimage/MigratedSqlEquivalenceTest.java | 7 +- .../aiimage/SqlLayeringConventionTest.java | 3 +- .../RequestSuppliedIdentityOutletTest.java | 1 + .../config/MigrationInventoryTest.java | 5 +- .../jd/JdPublishContractPendingTest.java | 4 +- .../jd/service/JdPublishBoardServiceTest.java | 6 +- .../service/JdPublishIngestServiceTest.java | 307 +++++++----------- .../JdPublishTaskItemsResetSpiImplTest.java | 5 +- .../jd/service/JdPublishTaskServiceTest.java | 4 +- .../service/TaskClientPullServiceTest.java | 13 + frontend-vue/src/pages/jd/JdPublishTab.vue | 192 ++++++----- frontend-vue/src/shared/api/endpoints.ts | 4 +- .../shared/api/types/modules/jd-publish.ts | 16 +- .../shared/utils/credential-fatal-notice.ts | 16 +- .../tests/credential-fatal-alert.test.ts | 9 + .../tests/credential-fatal-notice.test.ts | 20 ++ frontend-vue/tests/endpoints.test.ts | 5 +- .../mount/jd-publish-dispatch.mount.test.ts | 191 +++++++++++ 40 files changed, 770 insertions(+), 546 deletions(-) create mode 100644 backend-java/src/main/resources/db/V213__jd_publish_item_permit.sql create mode 100644 frontend-vue/tests/mount/jd-publish-dispatch.mount.test.ts diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java index e3cd3a06b..efd4cd0b9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java @@ -315,6 +315,18 @@ public class AdminAuthSupport { return bindOwnershipUserId(requireUserOrInternal(request), requestedUserId); } + /** 用户自助接口:只接受真实会话,不允许内部令牌或管理角色代用户。 */ + public Long requireSessionOwnerUserId(HttpServletRequest request, Long requestedUserId) { + Long userId = requireUser(request).getId(); + if (userId == null || userId <= 0) { + throw new BusinessException(401, "登录身份无效"); + } + if (requestedUserId != null && !userId.equals(requestedUserId)) { + throw new BusinessException(403, "请求用户与登录用户不一致"); + } + return userId; + } + private Long bindOwnershipUserId(AdminUserEntity identity, Long requestedUserId) { if (mayActForOtherUsers(identity)) { return requestedUserId; 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 dd5edd20e..9c422190b 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,13 +118,8 @@ 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 京东商品上架任务面(建单/products/activate/items/progress/ - * dashboard/history/progress-batch/delete/chunk/heartbeat):与 /api/jd-collect 逐形状同族——建单等 - * 写类端点方法体已有 requireOwnershipUserId - * (fail-closed 401,B98-07 同形债预防),products/dashboard/history/delete 走 resolveOwnershipUserId - * (Phase 4 面板读侧),progressBatch 走 require+filterOwnedTaskIds,chunk 判死口凭据化 - * (isTrustedInternalToken,匿名一律拒绝判死),行级落库与 jd-collect 同形状(本机桌面执行器不带凭据, - * 行归属以任务 owner 投影);判死口凭据化后随统一批进名单
  • + *
  • {@code /api/jd-publish} —— 所有入口在控制器绑定真实会话;执行器沿用桌面 JWT, + * 单独内部令牌不授权。回传再在事务内校验归属、代次与发布许可。
  • * */ static final Set PENDING_CONVERGENCE = Set.of( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java index 96c8cf151..870392313 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/controller/JdPublishController.java @@ -67,23 +67,18 @@ public class JdPublishController { public ApiResponse createTask(@Valid @RequestBody JdPublishTaskCreateRequest request, HttpServletRequest httpRequest) { // uid 不由请求体说了算:解析不出会话身份就 401(fail-closed,与采集建单同口径)。 - request.setUserId(adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())); + request.setUserId(adminAuthSupport.requireSessionOwnerUserId(httpRequest, request.getUserId())); return ApiResponse.success(publishTaskService.createTask(request, adminAuthSupport.currentDeviceId(httpRequest))); } @PostMapping("/tasks/{taskId}/activate") - @Operation(summary = "激活京东上架任务", description = "页面把 jd-product-publish-run 载荷推给本机客户端前调用:" - + "PENDING→RUNNING 条件更新。漏掉这一步,客户端第一个回传会被「任务不在运行中(PENDING)」拒收" - + "(2026-11-14 采集链真机实录同形)。") - public ApiResponse activate( - @Parameter(description = "任务 ID", required = true, example = "34400") - @PathVariable Long taskId, - @Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1") + @Operation(summary = "认领当前代次的京东上架任务") + public ApiResponse activate(@PathVariable Long taskId, + @RequestParam("resumeAttempt") int resumeAttempt, @RequestParam(value = "user_id", required = false) Long userId, HttpServletRequest httpRequest) { - publishTaskService.activateTask(taskId, - adminAuthSupport.requireOwnershipUserId(httpRequest, userId)); + publishTaskService.activateTask(taskId, adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), resumeAttempt); return ApiResponse.success(null); } @@ -100,9 +95,10 @@ public class JdPublishController { @RequestParam(value = "limit", required = false) Integer limit, @Parameter(description = "任务所属用户 ID;省略时取当前登录身份", required = false, example = "1") @RequestParam(value = "user_id", required = false) Long userId, + @RequestParam("resumeAttempt") int resumeAttempt, HttpServletRequest httpRequest) { return ApiResponse.success(publishTaskService.pullItems(taskId, - adminAuthSupport.requireOwnershipUserId(httpRequest, userId), cursor, limit)); + adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), resumeAttempt, cursor, limit)); } @GetMapping("/tasks/{taskId}/progress") @@ -115,22 +111,14 @@ public class JdPublishController { @RequestParam(value = "user_id", required = false) Long userId, HttpServletRequest httpRequest) { return ApiResponse.success(publishTaskService.queryProgress(taskId, - adminAuthSupport.requireOwnershipUserId(httpRequest, userId))); + adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId))); } @PostMapping("/tasks/{taskId}/chunk") - @Operation(summary = "提交行级发布结果回传", description = "执行器按批次回传行级状态(PUBLISHING/SUCCESS/FAILED" - + " +真实失败原因 + wareId);isEnd=true 任务按行级状态汇总落终态。error 字段按铁律 31 分档" - + "(京麦登录态失效整单 FAILED;非致命只记录)——判定只信 X-Internal-Token,匿名一律拒绝判死。") - public ApiResponse submitChunk( - @Parameter(description = "任务 ID", required = true, example = "34400") - @PathVariable Long taskId, - @RequestBody JdPublishChunkRequest request, - HttpServletRequest httpRequest) { - // 判死口凭据化(JdCollectController.submitChunk 同口径):error 上报是唯一能触发整单 - // 判死的入口,匿名一律拒绝判死;行级结果落库不要求内部令牌(采集端按任务拉单)。 - boolean trustedErrorReporter = adminAuthSupport.isTrustedInternalToken(httpRequest); - return ApiResponse.success(ingestService.submitChunk(taskId, request, trustedErrorReporter)); + @Operation(summary = "申请发布许可或提交京麦发布回执") + public ApiResponse submitChunk(@PathVariable Long taskId, + @Valid @RequestBody JdPublishChunkRequest request, HttpServletRequest httpRequest) { + return ApiResponse.success(ingestService.submitChunk(taskId, request, adminAuthSupport.requireSessionOwnerUserId(httpRequest, null))); } @PostMapping("/tasks/{taskId}/heartbeat") @@ -145,7 +133,7 @@ public class JdPublishController { @RequestBody(required = false) TaskHeartbeatRequest request, HttpServletRequest httpRequest) { return ApiResponse.success(publishTaskService.heartbeat(taskId, - adminAuthSupport.requireOwnershipUserId(httpRequest, userId), request)); + adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId), request)); } // ------------------------------------------------------------------ @@ -167,7 +155,7 @@ public class JdPublishController { @Parameter(description = "当前用户 ID;省略时取当前登录身份", required = false) @RequestParam(value = "user_id", required = false) Long userId, HttpServletRequest httpRequest) { - userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + userId = adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId); return ApiResponse.success(jdProductQueryService.pageForUser(userId, categoryId, page, pageSize)); } @@ -178,7 +166,7 @@ public class JdPublishController { @Parameter(description = "当前用户 ID", required = true, example = "1") @RequestParam("user_id") Long userId, HttpServletRequest httpRequest) { - userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + userId = adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId); return ApiResponse.success(boardService.dashboard(userId)); } @@ -191,7 +179,7 @@ public class JdPublishController { @Parameter(description = "历史记录条数,默认 50,最大 100", example = "50") @RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit, HttpServletRequest httpRequest) { - userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + userId = adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId); return ApiResponse.success(boardService.history(userId, limit)); } @@ -202,7 +190,7 @@ public class JdPublishController { HttpServletRequest httpRequest) { return ApiResponse.success(boardService.progressBatch(progressOwnershipSupport .filterOwnedTaskIds(request.getTaskIds(), - adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())))); + adminAuthSupport.requireSessionOwnerUserId(httpRequest, request.getUserId())))); } @DeleteMapping("/tasks/{taskId}") @@ -214,7 +202,7 @@ public class JdPublishController { @Parameter(description = "当前用户 ID,必须与创建任务的用户一致", required = true, example = "1") @RequestParam("user_id") Long userId, HttpServletRequest httpRequest) { - userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId); + userId = adminAuthSupport.requireSessionOwnerUserId(httpRequest, userId); boardService.deleteTask(taskId, userId); return ApiResponse.success(null); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java index 73db3f159..6d046e98f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/dto/JdPublishChunkRequest.java @@ -1,6 +1,9 @@ package com.nanri.aiimage.modules.jd.model.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; import lombok.Data; import java.util.List; @@ -8,21 +11,20 @@ import java.util.List; /** * 京东发布行级回传请求(v1.5 蓝图 §3:POST /api/jd-publish/tasks/{taskId}/chunk)。 * - *

    顶层键集 {@code batchId / items / isEnd}(外加 {@code error} 失败上报);行内键集 - * {@code itemId / productId / publishStatus / publishError / jdWareId}。行状态是唯一 - * 行级真源({@code biz_jd_publish_item.publish_status});{@code error} 按铁律 31 分档 - * (京麦登录态失效→整单 FAILED,代理/LLM 凭据致命词→{@code CredentialFatalClassifier}, - * 其余技术性故障只记录不判死)——判定只信 X-Internal-Token(匿名 error 一律拒绝判死, - * 照 JdCollectController.submitChunk 同口径)。

    + *

    发布许可属于当前 {@code resumeAttempt} 和本执行者 {@code batchId};成功/失败回执沿用该批次。

    */ @Data @JsonIgnoreProperties(ignoreUnknown = true) public class JdPublishChunkRequest { - /** 批次号(客户端生成,溯源用)。 */ + @NotNull + @PositiveOrZero + private Integer resumeAttempt; + + /** Stable execution identity, not a per-request identifier. */ private String batchId; - /** 本批行级结果。 */ + @Size(max = 500) private List items; /** true=本任务全部行已回传,任务按行级状态汇总落终态。 */ diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/entity/JdPublishItemEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/entity/JdPublishItemEntity.java index f28171d40..4eba36b72 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/entity/JdPublishItemEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/entity/JdPublishItemEntity.java @@ -13,8 +13,8 @@ import java.time.LocalDateTime; *

    每任务每商品一行(唯一键 {@code uk_task_product}):建单即按 {@code biz_jd_product} * 快照落行(商品库有 ageCleanup 清理语义,发布记录不随商品删除丢失溯源);行级状态机 * {@code PENDING → PUBLISHING → SUCCESS/FAILED} 由客户端 chunk 回传逐行推进——服务端 - * 不预测发布结果,行状态的唯一写入口是 {@code JdPublishIngestService}(单客户端串行 - * 回传,无并发竞争)。任务级行为复用 {@code biz_file_task}(module_type=JD_PUBLISH), + * 不预测发布结果。回传持任务行锁,发布许可按代次和执行批次绑定。任务级行为复用 + * {@code biz_file_task}(module_type=JD_PUBLISH), * 本表只承载行级明细与快照。

    */ @Data @@ -45,6 +45,8 @@ public class JdPublishItemEntity { private String stockJson; /** 行级状态机:PENDING/PUBLISHING/SUCCESS/FAILED(客户端 chunk 回传推进)。 */ private String publishStatus; + private String publishBatchId; + private Integer publishResumeAttempt; /** 行级失败真实原因(客户端回传原文,R6 单行失败隔离)。 */ private String publishError; /** 京麦发布成功回执的商品 id(wareId,AC-3 真机核对锚点)。 */ diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishChunkVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishChunkVo.java index da6ed4bcc..6d55e8218 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishChunkVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishChunkVo.java @@ -13,6 +13,8 @@ public class JdPublishChunkVo { /** 该任务剩余未发布(PENDING)行数。 */ private long pendingCount; + private long publishingCount; + private boolean needsReview; /** 任务终态状态(isEnd=true 且落了终态时回填;非终态回 null)。 */ private String taskStatus; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java index 6c707c8c5..5f65c7e5f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java @@ -19,6 +19,7 @@ public class JdPublishHistoryItemVo { @Schema(description = "任务 ID") private Long taskId; + private int resumeAttempt; @Schema(description = "任务编号") private String taskNo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java index eaf4b2aa4..5b46997a1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishItemsPageVo.java @@ -15,6 +15,7 @@ import java.util.List; public class JdPublishItemsPageVo { private Long taskId; + private int resumeAttempt; /** 本页明细行。 */ private List items; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishProgressVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishProgressVo.java index 38f0db175..2d16d44d4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishProgressVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishProgressVo.java @@ -15,6 +15,7 @@ import java.time.LocalDateTime; public class JdPublishProgressVo { private Long taskId; + private int resumeAttempt; /** 任务状态(biz_file_task.status)。 */ private String status; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java index 118c5983c..f95807132 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishTaskItemVo.java @@ -10,6 +10,7 @@ public class JdPublishTaskItemVo { @Schema(description = "任务 ID") private Long id; + private int resumeAttempt; @Schema(description = "任务编号") private String taskNo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java index bff7321af..c6d7e5036 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardService.java @@ -30,7 +30,6 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; /** @@ -134,6 +133,7 @@ public class JdPublishBoardService { item.setTaskId(task.getId()); item.setTaskNo(task.getTaskNo()); item.setTaskStatus(task.getStatus()); + item.setResumeAttempt(JdPublishTaskService.resumeAttempt(task)); item.setSuccess(TaskStatuses.FileTask.SUCCESS.equals(task.getStatus())); item.setErrorMessage(task.getErrorMessage()); JdPublishTaskCreateRequest request = readCreateRequestQuiet(task); @@ -209,6 +209,7 @@ public class JdPublishBoardService { taskItem.setId(task.getId()); taskItem.setTaskNo(task.getTaskNo()); taskItem.setStatus(task.getStatus()); + taskItem.setResumeAttempt(JdPublishTaskService.resumeAttempt(task)); taskItem.setErrorMessage(task.getErrorMessage()); taskItem.setUpdatedAt(task.getUpdatedAt() == null ? null : task.getUpdatedAt().toString()); JdPublishTaskDetailVo detail = new JdPublishTaskDetailVo(); @@ -231,10 +232,9 @@ public class JdPublishBoardService { */ @Transactional public void deleteTask(Long taskId, Long userId) { - FileTaskEntity task = fileTaskMapper.selectById(taskId); - if (task == null || !JdPublishTaskService.MODULE_TYPE.equals(task.getModuleType()) - || (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) { - throw new BusinessException("任务不存在"); + FileTaskEntity task = JdPublishTaskService.assertOwnedTask(fileTaskMapper.selectByIdForUpdate(taskId), userId); + if (TaskStatuses.FileTask.RUNNING.equals(task.getStatus())) { + throw new BusinessException(409, "运行中的发布任务不能删除"); } int items = jdPublishItemMapper.delete(new LambdaQueryWrapper() .eq(JdPublishItemEntity::getTaskId, taskId)); 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 522ec8111..4dec27048 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 @@ -11,219 +11,193 @@ import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; import com.nanri.aiimage.modules.jd.model.vo.JdPublishChunkVo; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; -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 com.nanri.aiimage.modules.task.service.support.TaskFailureLedger; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.LinkedHashMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.regex.Pattern; + +import static com.nanri.aiimage.modules.jd.service.JdPublishTaskService.ITEM_FAILED; +import static com.nanri.aiimage.modules.jd.service.JdPublishTaskService.ITEM_PENDING; +import static com.nanri.aiimage.modules.jd.service.JdPublishTaskService.ITEM_PUBLISHING; +import static com.nanri.aiimage.modules.jd.service.JdPublishTaskService.ITEM_SUCCESS; +import static com.nanri.aiimage.modules.jd.service.JdPublishTaskService.MODULE_TYPE; -/** - * 京东发布行级回传(v1.5 蓝图 §3 chunk 通道:POST /api/jd-publish/tasks/{taskId}/chunk)。 - * - *

    行状态是唯一行级真源({@code biz_jd_publish_item.publish_status},uk_task_product 定位); - * {@code isEnd=true} 时按行级状态汇总任务终态(失败行 > 0 ⇒ 任务 FAILED、其余 SUCCESS, - * successFileCount/failedFileCount 落真实行数——R6 单行失败隔离、任务终态汇总成败数)。 - * CAS 只认 RUNNING(铁律 14:已终态的任务不改写;可重入)。

    - * - *

    {@code error} 上报按铁律 31 分档(判死口凭据化,匿名一律拒绝判死——照 - * {@code JdCollectController#submitChunk} 同口径):京麦登录态失效 → - * {@link JdPublishStaleTaskService#terminalizeOnJdLoginFatal}(词表复用 - * {@code JdStaleTaskService#isJdLoginStateFailure},京东域两链同一族);代理/LLM 凭据 - * 致命词 → {@code CredentialFatalTaskCloser};其余技术性故障只记录不判死。

    - */ @Service @RequiredArgsConstructor -@Slf4j public class JdPublishIngestService { - private static final String LOG_TAG = "jd-publish"; - - private static final String STATUS_RUNNING = TaskStatuses.FileTask.RUNNING; - - /** chunk 可写回的行级状态(PENDING 是建单初值,不接受回传写回)。 */ - private static final Set WRITABLE_STATUSES = - Set.of(JdPublishTaskService.ITEM_PUBLISHING, JdPublishTaskService.ITEM_SUCCESS, - JdPublishTaskService.ITEM_FAILED); - - /** publish_error 列宽(V210 VARCHAR(1024)),超长截断不炸批。 */ - private static final int MAX_ERROR_LENGTH = 1024; + private static final String RUNNING = TaskStatuses.FileTask.RUNNING; + private static final Pattern BATCH_ID = Pattern.compile("[A-Za-z0-9_-]{1,128}"); private final FileTaskMapper fileTaskMapper; private final JdPublishItemMapper jdPublishItemMapper; private final JdPublishStaleTaskService staleTaskService; private final TaskProgressSnapshotService taskProgressSnapshotService; - public JdPublishChunkVo submitChunk(Long taskId, JdPublishChunkRequest request, boolean trustedErrorReporter) { - if (taskId == null || taskId <= 0) { - throw new BusinessException("任务 ID 不合法"); + @Transactional + public JdPublishChunkVo submitChunk(Long taskId, JdPublishChunkRequest request, Long userId) { + if (taskId == null || taskId <= 0 || request == null || request.getResumeAttempt() == null + || request.getResumeAttempt() < 0 || request.getBatchId() == null + || !BATCH_ID.matcher(request.getBatchId()).matches()) { + throw new BusinessException(400, "回传必须提供有效的任务、代次和批次号"); } - if (request == null) { - throw new BusinessException("回传体为空"); + List items = request.getItems() == null ? List.of() : request.getItems(); + if (items.size() > 500) { + throw new BusinessException(400, "回传明细过多"); } - FileTaskEntity task = fileTaskMapper.selectById(taskId); - if (task == null || !TaskFinalizeSupport.belongsToModule(JdPublishTaskService.MODULE_TYPE, task.getModuleType())) { - throw new BusinessException("任务不存在: " + taskId); + FileTaskEntity task = JdPublishTaskService.assertOwnedTask(fileTaskMapper.selectByIdForUpdate(taskId), userId); + int attempt = JdPublishTaskService.resumeAttempt(task); + if (attempt != request.getResumeAttempt()) { + throw new BusinessException(409, "回传代次已失效"); } - if (TaskStatuses.FileTask.TERMINAL.contains(task.getStatus())) { - throw new BusinessException("任务已结束(" + task.getStatus() + "),不再接受回传"); - } - if (request.getError() != null && !request.getError().isBlank()) { - return handleErrorReport(task, request.getError(), trustedErrorReporter); - } - if (!STATUS_RUNNING.equals(task.getStatus())) { - // PENDING 拒收(页面推送漏 activate 时客户端第一个回传在此被拒,2026-11-14 同形实录)。 - throw new BusinessException("任务不在运行中(" + task.getStatus() + "),请先激活任务再回传"); + boolean terminal = TaskStatuses.FileTask.TERMINAL.contains(task.getStatus()); + if (!terminal && !RUNNING.equals(task.getStatus())) { + throw new BusinessException(409, "任务不在运行中,请先激活任务再回传"); } int accepted = 0; - if (request.getItems() != null) { - for (ItemResult item : request.getItems()) { - accepted += applyRowResult(taskId, item); + String newlyFailedReason = null; + Set seen = new HashSet<>(); + for (ItemResult item : items) { + if (item == null || item.getProductId() == null || !seen.add(item.getProductId())) { + continue; + } + String status = normalizeStatus(item.getPublishStatus()); + RowOutcome outcome = applyRow(taskId, userId, attempt, request.getBatchId(), item, status, terminal); + if (outcome != RowOutcome.REJECTED) { + accepted++; + } + if (outcome == RowOutcome.CHANGED && ITEM_FAILED.equals(status) + && JdStaleTaskService.isJdLoginStateFailure(item.getPublishError())) { + newlyFailedReason = item.getPublishError(); } } - + Map counts = statusCounts(taskId); JdPublishChunkVo vo = new JdPublishChunkVo(); vo.setAcceptedCount(accepted); - vo.setPendingCount(statusCounts(taskId).getOrDefault(JdPublishTaskService.ITEM_PENDING, 0L)); - if (Boolean.TRUE.equals(request.getIsEnd())) { - vo.setTaskStatus(summarizeTerminal(taskId)); + vo.setPendingCount(counts.getOrDefault(ITEM_PENDING, 0L)); + vo.setPublishingCount(counts.getOrDefault(ITEM_PUBLISHING, 0L)); + vo.setNeedsReview(Boolean.TRUE.equals(request.getIsEnd()) && vo.getPublishingCount() > 0); + if (terminal) { + vo.setTaskStatus(task.getStatus()); + } else if (newlyFailedReason != null && staleTaskService.terminalizeOnJdLoginFatal(task, newlyFailedReason)) { + vo.setTaskStatus(TaskStatuses.FileTask.FAILED); + } else if (Boolean.TRUE.equals(request.getIsEnd())) { + vo.setTaskStatus(summarizeTerminal(task, counts)); } - log.info("[{}] chunk 回传 taskId={} batchId={} accepted={} pending={} isEnd={}", - LOG_TAG, taskId, request.getBatchId(), accepted, vo.getPendingCount(), - Boolean.TRUE.equals(request.getIsEnd())); return vo; } - /** 行级结果落库:按 uk_task_product(task_id + product_id)定位,单行失败不炸批。 */ - private int applyRowResult(Long taskId, ItemResult item) { - if (item == null || item.getProductId() == null) { - return 0; + private RowOutcome applyRow(Long taskId, Long userId, int attempt, String batchId, ItemResult item, + String status, boolean terminal) { + String wareId = ITEM_SUCCESS.equals(status) ? item.getJdWareId() : null; + String error = ITEM_FAILED.equals(status) ? truncate(item.getPublishError()) : null; + if (status == null || (ITEM_SUCCESS.equals(status) && (wareId == null || wareId.isBlank() || wareId.length() > 64)) + || (ITEM_FAILED.equals(status) && (error == null || error.isBlank()))) { + return RowOutcome.REJECTED; } - String status = item.getPublishStatus() == null ? null : item.getPublishStatus().trim().toUpperCase(); - if (status == null || !WRITABLE_STATUSES.contains(status)) { - log.warn("[{}] 回传行状态不识别,跳过 taskId={} productId={} status={}", - LOG_TAG, taskId, item.getProductId(), item.getPublishStatus()); - return 0; - } - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() + JdPublishItemEntity row = jdPublishItemMapper.selectOne(new LambdaQueryWrapper() .eq(JdPublishItemEntity::getTaskId, taskId) .eq(JdPublishItemEntity::getProductId, item.getProductId()) + .eq(JdPublishItemEntity::getUserId, userId)); + if (row == null || (item.getItemId() != null && !item.getItemId().equals(row.getId()))) { + return RowOutcome.REJECTED; + } + String previous = row.getPublishStatus(); + boolean samePermit = batchId.equals(row.getPublishBatchId()) && Objects.equals(attempt, row.getPublishResumeAttempt()); + if (samePermit && status.equals(previous) && (!terminal || !ITEM_PUBLISHING.equals(status)) + && Objects.equals(wareId, row.getJdWareId()) && Objects.equals(error, row.getPublishError())) { + return RowOutcome.REPLAY; + } + boolean fromPending = ITEM_PENDING.equals(previous) && !ITEM_SUCCESS.equals(status); + boolean fromPublishing = ITEM_PUBLISHING.equals(previous) && samePermit && !ITEM_PUBLISHING.equals(status); + if (terminal || (!fromPending && !fromPublishing)) { + return RowOutcome.REJECTED; + } + int updated = jdPublishItemMapper.update(null, new LambdaUpdateWrapper() + .eq(JdPublishItemEntity::getId, row.getId()) + .eq(JdPublishItemEntity::getTaskId, taskId) + .eq(JdPublishItemEntity::getPublishStatus, previous) + .eq(fromPublishing, JdPublishItemEntity::getPublishBatchId, batchId) + .eq(fromPublishing, JdPublishItemEntity::getPublishResumeAttempt, attempt) .set(JdPublishItemEntity::getPublishStatus, status) - .set(JdPublishItemEntity::getPublishError, - JdPublishTaskService.ITEM_FAILED.equals(status) - ? truncate(item.getPublishError()) : null) - .set(JdPublishItemEntity::getJdWareId, item.getJdWareId()) - .set(JdPublishItemEntity::getUpdatedAt, LocalDateTime.now()); - int updated = jdPublishItemMapper.update(null, wrapper); - if (updated == 0) { - log.warn("[{}] 回传行未命中明细行(商品不在本任务?)taskId={} productId={}", - LOG_TAG, taskId, item.getProductId()); - } - return updated; + .set(JdPublishItemEntity::getPublishError, error) + .set(JdPublishItemEntity::getJdWareId, wareId) + .set(JdPublishItemEntity::getPublishBatchId, batchId) + .set(JdPublishItemEntity::getPublishResumeAttempt, attempt) + .set(JdPublishItemEntity::getUpdatedAt, LocalDateTime.now())); + return updated == 1 ? RowOutcome.CHANGED : RowOutcome.REJECTED; } - /** 铁律 31 分档判死口:只信 X-Internal-Token,匿名 error 一律拒绝判死(不碰状态)。 */ - private JdPublishChunkVo handleErrorReport(FileTaskEntity task, String error, boolean trustedErrorReporter) { - JdPublishChunkVo vo = new JdPublishChunkVo(); - vo.setAcceptedCount(0); - vo.setPendingCount(statusCounts(task.getId()).getOrDefault(JdPublishTaskService.ITEM_PENDING, 0L)); - if (!trustedErrorReporter) { - log.warn("[{}] 匿名 error 上报拒绝判死 taskId={} err={}", LOG_TAG, task.getId(), abbreviate(error)); - return vo; - } - // 京东域凭据词(京麦登录态)先判——采集/发布共用 19899 同一 profile,同一族同一判据。 - if (JdStaleTaskService.isJdLoginStateFailure(error)) { - staleTaskService.terminalizeOnJdLoginFatal(task, error); - vo.setTaskStatus(TaskStatuses.FileTask.FAILED); - return vo; - } - // 代理/LLM 凭据致命词 → 公共判定档(发布面无代理无 LLM 消费,客户端报什么分什么档)。 - boolean closed = new CredentialFatalTaskCloser(LOG_TAG, fileTaskMapper, null) - .closeIfFatal(task, error); - if (closed) { - vo.setTaskStatus(TaskStatuses.FileTask.FAILED); - return vo; - } - log.warn("[{}] 非致命失败上报,只记录不判死 taskId={} err={}", LOG_TAG, task.getId(), abbreviate(error)); - return vo; - } - - /** isEnd 终态汇总:按行级真源聚合落任务终态(R6),CAS 只认 RUNNING(铁律 14)。 */ - private String summarizeTerminal(Long taskId) { - Map counts = statusCounts(taskId); - long success = counts.getOrDefault(JdPublishTaskService.ITEM_SUCCESS, 0L); - long failed = counts.getOrDefault(JdPublishTaskService.ITEM_FAILED, 0L); - long unpublished = counts.getOrDefault(JdPublishTaskService.ITEM_PENDING, 0L) - + counts.getOrDefault(JdPublishTaskService.ITEM_PUBLISHING, 0L); - boolean anyFailed = failed > 0; - String status = anyFailed ? TaskStatuses.FileTask.FAILED : TaskStatuses.FileTask.SUCCESS; - StringBuilder reason = new StringBuilder("发布完成:成功 ").append(success).append(" 行,失败 ") - .append(failed).append(" 行"); - if (unpublished > 0) { - reason.append(",未发布 ").append(unpublished).append(" 行"); + private String summarizeTerminal(FileTaskEntity task, Map counts) { + long success = counts.getOrDefault(ITEM_SUCCESS, 0L); + long failed = counts.getOrDefault(ITEM_FAILED, 0L); + long total = counts.values().stream().mapToLong(Long::longValue).sum(); + if (total == 0 || success + failed != total || !Objects.equals(task.getSourceFileCount(), (int) total)) { + return RUNNING; } + String status = failed > 0 ? TaskStatuses.FileTask.FAILED : TaskStatuses.FileTask.SUCCESS; + String message = failed > 0 ? "发布完成:成功 " + success + " 行,失败 " + failed + " 行" : null; 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) - .eq(FileTaskEntity::getStatus, STATUS_RUNNING) + .eq(FileTaskEntity::getId, task.getId()) + .eq(FileTaskEntity::getModuleType, MODULE_TYPE) + .eq(FileTaskEntity::getStatus, RUNNING) + .eq(FileTaskEntity::getResumeAttempt, JdPublishTaskService.resumeAttempt(task)) .set(FileTaskEntity::getStatus, status) .set(FileTaskEntity::getSuccessFileCount, success) .set(FileTaskEntity::getFailedFileCount, failed) .set(FileTaskEntity::getErrorMessage, message) - .set(FileTaskEntity::getFailureCategory, message == null ? null : TaskFailureLedger.categoryOf(message)) + .set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(message)) .set(FileTaskEntity::getUpdatedAt, now) .set(FileTaskEntity::getFinishedAt, now)); if (updated > 0) { - taskProgressSnapshotService.markTerminal(taskId, JdPublishTaskService.MODULE_TYPE, status, - anyFailed ? reason.toString() : null); - log.info("[{}] 任务落终态 {} taskId={}", LOG_TAG, status, taskId); + taskProgressSnapshotService.markTerminal(task.getId(), MODULE_TYPE, status, message); + return status; } - return status; + return RUNNING; } - /** 行级状态聚合(XML 具名 SQL):status → 行数。 */ private Map statusCounts(Long taskId) { - Map counts = new LinkedHashMap<>(); + Map counts = new HashMap<>(); for (Map row : jdPublishItemMapper.countByPublishStatus(taskId)) { - Object status = row.get("publishStatus"); - Object cnt = row.get("cnt"); - if (status != null && cnt instanceof Number number) { - counts.put(String.valueOf(status), number.longValue()); + if (row.get("publishStatus") != null && row.get("cnt") instanceof Number number) { + counts.put(String.valueOf(row.get("publishStatus")), number.longValue()); } } return counts; } - private String truncate(String value) { + private static String normalizeStatus(String raw) { + if (raw == null) { + return null; + } + return switch (raw.trim().toUpperCase(Locale.ROOT)) { + case ITEM_PUBLISHING -> ITEM_PUBLISHING; + case ITEM_SUCCESS -> ITEM_SUCCESS; + case ITEM_FAILED -> ITEM_FAILED; + default -> null; + }; + } + + private static String truncate(String value) { if (value == null) { return null; } String trimmed = value.trim(); - return trimmed.length() <= MAX_ERROR_LENGTH ? trimmed : trimmed.substring(0, MAX_ERROR_LENGTH); + return trimmed.length() <= 1024 ? trimmed : trimmed.substring(0, 1024); } - private String abbreviate(String value) { - if (value == null) { - return ""; - } - return value.length() <= 200 ? value : value.substring(0, 200) + "…"; - } - - /** 供测试确认行级形状(按任务取全部明细行)。 */ - public java.util.List findItemRows(Long taskId) { - return jdPublishItemMapper.selectList(new LambdaQueryWrapper() - .eq(JdPublishItemEntity::getTaskId, taskId) - .orderByAsc(JdPublishItemEntity::getId)); - } + private enum RowOutcome { REJECTED, REPLAY, CHANGED } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishStaleTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishStaleTaskService.java index 7b53c7dfc..fa9bd1880 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishStaleTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishStaleTaskService.java @@ -102,6 +102,8 @@ public class JdPublishStaleTaskService { .eq(FileTaskEntity::getId, task.getId()) .eq(FileTaskEntity::getModuleType, MODULE_TYPE) .eq(FileTaskEntity::getStatus, STATUS_RUNNING) + .eq(FileTaskEntity::getResumeAttempt, JdPublishTaskService.resumeAttempt(task)) + .lt(FileTaskEntity::getUpdatedAt, LocalDateTime.now().minusMinutes(minutes)) .set(FileTaskEntity::getStatus, STATUS_FAILED) .set(FileTaskEntity::getErrorMessage, reason) .set(FileTaskEntity::getFailureCategory, TaskFailureLedger.categoryOf(reason)) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java index 6d7b5dd54..8f8cf997d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java @@ -13,15 +13,8 @@ import java.time.LocalDateTime; /** * 京东商品上架的失败重试明细行复位(AC-7 服务端半边,v1.5 Phase 5 消欠账)。 * - *

    任务头被 {@code TaskInPlaceRetryService} 原地复位成 PENDING 后,明细分批下发 - * {@code JdPublishItemMapper.selectPublishableItems} 只出 PENDING 行——上一代留下的 - * FAILED/PUBLISHING 行不复位,重试就是空页空跑(蓝图 Phase 2 变更记录登记的欠账)。 - * 本实现把 FAILED/PUBLISHING 行复位回 PENDING 并清旧错误文案,让剩余商品重新进入 - * 下发候选;SUCCESS 行不动:已发布商品不重发(AC-4),客户端断点 done 集合同口径。 - * - *

    {@code jd_ware_id} 不清:只有 SUCCESS 行才有值,本条不碰 SUCCESS 行; - * 旧 {@code publish_error} 必须清——留着会让用户端面板把「上一代的失败原因」 - * 显示在「待发布」行上(进度真源是行级状态聚合,JdPublishBoardService 同源)。 + *

    只复位已经确认失败的 FAILED 行。SUCCESS 已经发布,PUBLISHING 的外部提交结果未知, + * 两者都不能重发。已发出的许可保留用于识别旧批次,但不能跨代确认。

    */ @Slf4j @Service @@ -40,10 +33,12 @@ public class JdPublishTaskItemsResetSpiImpl implements TaskItemsResetSpi { LocalDateTime now = LocalDateTime.now(); int updated = jdPublishItemMapper.update(null, new LambdaUpdateWrapper() .eq(JdPublishItemEntity::getTaskId, taskId) - .in(JdPublishItemEntity::getPublishStatus, - JdPublishTaskService.ITEM_FAILED, JdPublishTaskService.ITEM_PUBLISHING) + .eq(JdPublishItemEntity::getPublishStatus, JdPublishTaskService.ITEM_FAILED) .set(JdPublishItemEntity::getPublishStatus, JdPublishTaskService.ITEM_PENDING) .set(JdPublishItemEntity::getPublishError, null) + .set(JdPublishItemEntity::getPublishBatchId, null) + .set(JdPublishItemEntity::getPublishResumeAttempt, null) + .set(JdPublishItemEntity::getJdWareId, null) .set(JdPublishItemEntity::getUpdatedAt, now)); log.info("[jd-publish][retry] 明细行已复位可续跑 taskId={} reset={}", taskId, updated); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskPullSpiImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskPullSpiImpl.java index 915475592..e8bada29d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskPullSpiImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskPullSpiImpl.java @@ -40,6 +40,11 @@ public class JdPublishTaskPullSpiImpl implements ClientTaskPullSpi { public Map buildQueuePayload(FileTaskEntity task) { // 载荷组装单一出处:与建单响应的 queuePayload 同源(铁律 32 三件同值判据)。 Map payload = publishTaskService.buildQueuePayload(task); + if (payload.get("data") instanceof Map data) { + Map claimed = new java.util.LinkedHashMap<>(data); + claimed.put("claimed", true); + payload = Map.of("type", QUEUE_TYPE, "data", claimed); + } log.info("[jd-publish] 兜底载荷已组装 taskId={}", task.getId()); return payload; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java index 5f1ac5dab..6b813b938 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskService.java @@ -37,6 +37,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; @@ -114,6 +115,7 @@ public class JdPublishTaskService { @Value("${aiimage.jd.oss.bucket:jd-products}") private String bucket; + @Transactional public JdPublishTaskVo createTask(JdPublishTaskCreateRequest request, String deviceId) { validate(request); // AC-8 配额闸:前置在一切昂贵动作前(铁律 27b),超配额当场业务码拒绝并点名额度文案。 @@ -175,33 +177,20 @@ public class JdPublishTaskService { return vo; } - /** - * 激活任务(PENDING→RUNNING)——页面把载荷推给本机客户端之前调用。 - * - *

    形状照 {@code JdCollectTaskService#activateTask} 同形(2026-11-14 真机实录:漏掉 - * 这一步,客户端第一个回传会被「任务不在运行中(PENDING)」拒收)。只允许 - * PENDING→RUNNING 条件更新:与客户端兜底拉取的原子认领互斥,谁先翻转谁执行。 - */ - public void activateTask(Long taskId, Long userId) { - FileTaskEntity task = fileTaskMapper.selectById(taskId); - // 归属谓词走公共出口(TaskLifecycleDebtRatchetTest 棘轮只许降:新增手写遍数即红)。 - if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType()) - || (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) { - throw new BusinessException("任务不存在"); - } + /** 仅当前代次的 PENDING 任务能被页面队列中的桌面执行器认领。 */ + public void activateTask(Long taskId, Long userId, int attempt) { + FileTaskEntity task = requireOwnedTask(taskId, userId); + requireAttempt(task, attempt); int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, taskId) + .eq(FileTaskEntity::getUserId, userId) .eq(FileTaskEntity::getStatus, STATUS_PENDING) + .eq(FileTaskEntity::getResumeAttempt, attempt) .set(FileTaskEntity::getStatus, STATUS_RUNNING) .set(FileTaskEntity::getUpdatedAt, LocalDateTime.now())); - if (updated == 0) { - FileTaskEntity latest = fileTaskMapper.selectById(taskId); - if (latest != null && STATUS_RUNNING.equals(latest.getStatus())) { - throw new BusinessException("任务已在执行中(可能已由客户端自动接管),无需重复启动"); - } - throw new BusinessException("任务已结束"); + if (updated != 1) { + throw new BusinessException(409, "任务已被认领、已结束或代次已变化"); } - log.info("[jd-publish] 已激活(PENDING→RUNNING) taskId={} userId={}", taskId, task.getUserId()); } /** @@ -209,8 +198,12 @@ public class JdPublishTaskService { * 重连 cursor 归零也不会重发已发布商品,AC-4 服务端半边);SKU 价按改价规则折算; * 图片发 jd-products 桶预签名 GET URL(蓝图 §3)。 */ - public JdPublishItemsPageVo pullItems(Long taskId, Long userId, Long cursor, Integer limit) { - requireOwnedTask(taskId, userId); + public JdPublishItemsPageVo pullItems(Long taskId, Long userId, int attempt, Long cursor, Integer limit) { + FileTaskEntity task = requireOwnedTask(taskId, userId); + requireAttempt(task, attempt); + if (!STATUS_RUNNING.equals(task.getStatus())) { + throw new BusinessException(409, "任务未在运行,不能下发发布明细"); + } int safeLimit = Math.min(Math.max(limit == null ? itemsBatchSize : limit, 1), MAX_ITEMS_BATCH); long safeCursor = cursor == null ? 0L : Math.max(0L, cursor); @@ -222,6 +215,7 @@ public class JdPublishTaskService { JdPublishItemsPageVo vo = new JdPublishItemsPageVo(); vo.setTaskId(taskId); + vo.setResumeAttempt(attempt); vo.setItems(rows.isEmpty() ? List.of() : rows.stream() .map(row -> buildItemPayload(row, productsByPid.get(row.getProductId()))) .toList()); @@ -237,6 +231,7 @@ public class JdPublishTaskService { JdPublishProgressVo vo = new JdPublishProgressVo(); vo.setTaskId(task.getId()); vo.setStatus(task.getStatus()); + vo.setResumeAttempt(resumeAttempt(task)); vo.setMessage(task.getErrorMessage()); vo.setUpdatedAt(task.getUpdatedAt()); Map counts = aggregateStatusCounts(taskId); @@ -269,6 +264,7 @@ public class JdPublishTaskService { JdPublishTaskCreateRequest create = readCreateRequest(task); Map data = new LinkedHashMap<>(); data.put("taskId", task.getId()); + data.put("resumeAttempt", resumeAttempt(task)); data.put("priceRule", create.getPriceRule() == null ? Map.of("mode", "none") : create.getPriceRule()); return Map.of("type", JdPublishTaskPullSpiImpl.QUEUE_TYPE, "data", data); } @@ -298,16 +294,29 @@ public class JdPublishTaskService { if (taskId == null || taskId <= 0) { throw new BusinessException("任务 ID 不合法"); } - FileTaskEntity task = fileTaskMapper.selectById(taskId); + return assertOwnedTask(fileTaskMapper.selectById(taskId), userId); + } + + static FileTaskEntity assertOwnedTask(FileTaskEntity task, Long userId) { if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) { - throw new BusinessException("任务不存在: " + taskId); + throw new BusinessException(404, "任务不存在"); } - if (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId())) { - throw new BusinessException(403, "无权查看该任务"); + if (userId == null || userId <= 0 || !userId.equals(task.getUserId())) { + throw new BusinessException(403, "无权访问该任务"); } return task; } + static int resumeAttempt(FileTaskEntity task) { + return task.getResumeAttempt() == null ? 0 : task.getResumeAttempt(); + } + + private static void requireAttempt(FileTaskEntity task, int attempt) { + if (attempt < 0 || attempt != resumeAttempt(task)) { + throw new BusinessException(409, "任务代次已变化"); + } + } + private void validate(JdPublishTaskCreateRequest request) { if (request.getUserId() == null || request.getUserId() <= 0) { throw new BusinessException("user_id 不合法"); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java index a6f1bf2b4..20d1531bf 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskClientPullController.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -27,6 +28,8 @@ import java.util.List; @Tag(name = "任务兜底拉取", description = "供桌面客户端领取页面未推送成功的待执行任务") public class TaskClientPullController { + private static final Integer JD_PUBLISH_PROTOCOL = 2; + private final TaskClientPullService taskClientPullService; private final AdminAuthSupport adminAuthSupport; @@ -35,8 +38,10 @@ public class TaskClientPullController { summary = "拉取并认领长期未推送的任务", description = "只返回当前登录用户、创建超过 N 分钟仍为 PENDING 的任务;服务端原子认领(PENDING→RUNNING)," + "与页面推送互斥,不会重复执行。开关关闭时返回空列表。") - public ApiResponse> pullPending(HttpServletRequest request) { + public ApiResponse> pullPending(HttpServletRequest request, + @RequestParam(name = "jdPublishProtocol", required = false) Integer jdPublishProtocol) { AdminUserEntity me = adminAuthSupport.requireUser(request); - return ApiResponse.success(taskClientPullService.pullPendingTasks(me.getId())); + return ApiResponse.success(taskClientPullService.pullPendingTasks(me.getId(), + JD_PUBLISH_PROTOCOL.equals(jdPublishProtocol))); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java index 3769b50dd..04dda5657 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/mapper/FileTaskMapper.java @@ -11,6 +11,9 @@ import java.util.List; @Mapper public interface FileTaskMapper extends BaseMapper { + /** 回传、重试与删除按任务主键串行,调用方必须持有数据库事务。 */ + FileTaskEntity selectByIdForUpdate(@Param("taskId") Long taskId); + /** * 查询某模块下超过保留期的终态任务 id(保留期清理用,只取 id 不拉整行)。 * diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java index 79ddf634b..b78745042 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java @@ -128,6 +128,10 @@ public class TaskClientPullService { /** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */ public List pullPendingTasks(Long userId) { + return pullPendingTasks(userId, false); + } + + public List pullPendingTasks(Long userId, boolean jdPublishV2) { if (!enabled) { return List.of(); } @@ -135,6 +139,9 @@ public class TaskClientPullService { return List.of(); } List types = resolveModuleTypes(); + if (!jdPublishV2) { + types = withoutJdPublish(types); + } if (types.isEmpty()) { log.warn("[client-task-pull] 模块白名单为空,本次不拉取 userId={}", userId); return List.of(); @@ -174,7 +181,7 @@ public class TaskClientPullService { log.info("[client-task-pull] 内部认领端点被调用但开关关闭 types={}", moduleTypes); return List.of(); } - List types = normalizeModuleTypes(moduleTypes); + List types = withoutJdPublish(normalizeModuleTypes(moduleTypes)); if (types.isEmpty()) { log.warn("[client-task-pull] 内部认领:模块白名单为空,本次不拉取"); return List.of(); @@ -250,6 +257,10 @@ public class TaskClientPullService { } /** 归一化模块类型列表:去空白、转大写、去重;空输入返回空列表。 */ + private static List withoutJdPublish(List types) { + return types.stream().filter(type -> !CollectRoutingProperties.MODULE_JD_PUBLISH.equals(type)).toList(); + } + private List normalizeModuleTypes(List moduleTypes) { List types = new ArrayList<>(); for (String raw : (moduleTypes == null ? List.of() : moduleTypes)) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java index af021ef10..b7248acff 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java @@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.task.spi.TaskItemsResetSpi; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; @@ -74,6 +75,7 @@ public class TaskInPlaceRetryService { * @return true=已复位(「活已经干完了」那一形状返回的是「已补终态」,见 {@link #settleAlreadyDelivered}); * false=状态已不是 FAILED/CANCELLED(并发或已重试过) */ + @Transactional public boolean retryInPlace(FileTaskEntity task) { if (task == null || task.getId() == null) { return false; @@ -98,6 +100,7 @@ public class TaskInPlaceRetryService { int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, task.getId()) .in(FileTaskEntity::getStatus, STATUS_FAILED, STATUS_CANCELLED) + .eq(FileTaskEntity::getResumeAttempt, attempt) .set(FileTaskEntity::getStatus, STATUS_PENDING) .set(FileTaskEntity::getErrorMessage, null) .set(FileTaskEntity::getFailureCategory, null) @@ -195,6 +198,7 @@ public class TaskInPlaceRetryService { *

    外观专利/相似ASIN/采集数据三个模块的失败任务走同一条路——它们原先都会被 * {@code TaskResumeService} 克隆重试,同一份输入在界面上多出好几行。 */ + @Transactional public void retryFailedTask(Long taskId, Long userId) { FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !java.util.Objects.equals(userId, task.getUserId())) { @@ -208,6 +212,7 @@ public class TaskInPlaceRetryService { * * @throws com.nanri.aiimage.common.exception.BusinessException 任务不存在 / 不是可续跑态 / 状态已变 */ + @Transactional public void retryFailedTask(Long taskId, Long userId, String moduleType) { FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !moduleType.equals(task.getModuleType()) diff --git a/backend-java/src/main/resources/db/V213__jd_publish_item_permit.sql b/backend-java/src/main/resources/db/V213__jd_publish_item_permit.sql new file mode 100644 index 000000000..2e1df05cf --- /dev/null +++ b/backend-java/src/main/resources/db/V213__jd_publish_item_permit.sql @@ -0,0 +1,5 @@ +-- V213: bind a publish permit to its originating execution batch and generation. +-- Nullable expansion: legacy PUBLISHING rows remain protected, not automatically reissued. +ALTER TABLE biz_jd_publish_item + ADD COLUMN publish_batch_id VARCHAR(128) CHARACTER SET ascii COLLATE ascii_bin NULL, + ADD COLUMN publish_resume_attempt INT NULL; diff --git a/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml b/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml index a87bec344..8f3b0f879 100644 --- a/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml +++ b/backend-java/src/main/resources/mapper/task/FileTaskMapper.xml @@ -55,4 +55,7 @@ ORDER BY created_at ASC LIMIT #{limit} + 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 24f1f1f43..f93b1a989 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/MigratedSqlEquivalenceTest.java @@ -109,7 +109,8 @@ class MigratedSqlEquivalenceTest { // 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; + // 105 → 106:Phase 5 京东上架回传的任务行锁在 FileTaskMapper 新写一条 select。 + private static final int XML_SELECT_TOTAL = 106; /** * 不是「从注解搬过来」的语句:注解时代没有原文可对撞,等价性这支只能跳过它们。 @@ -227,7 +228,9 @@ class MigratedSqlEquivalenceTest { // 该笔点名 12 类 87 例没跑整量、两处账本漏记,2026-11-18 发版前整量抓到补记 //(XML_SELECT_TOTAL 103 → 105,SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 147 → 149)。 "JdPublishItemMapper#selectPublishableItems", - "JdPublishItemMapper#countByPublishStatus"); + "JdPublishItemMapper#countByPublishStatus", + // Phase 5 原生 XML 行锁,不存在注解时代原文。 + "FileTaskMapper#selectByIdForUpdate"); /** 账本 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 6ac307a9f..eb0a112ba 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/SqlLayeringConventionTest.java @@ -135,7 +135,8 @@ class SqlLayeringConventionTest { // 落 2 条只读 select(selectPublishableItems 明细分批下发页 + countByPublishStatus 行级聚合), // 全部新写,非迁移语句;同轮登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED //(该文件 XML_SELECT_TOTAL 同轮 103 → 105)。 - private static final int XML_STATEMENT_TOTAL = 149; + // 149 → 150:Phase 5 京东上架的任务行锁查询(FileTaskMapper.selectByIdForUpdate)。 + private static final int XML_STATEMENT_TOTAL = 150; /** * 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 93deaea12..751d7a88b 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 @@ -48,6 +48,7 @@ class RequestSuppliedIdentityOutletTest { private static final List OUTLETS = List.of( "resolveOwnershipUserId(httpRequest", "requireOwnershipUserId(httpRequest", + "adminAuthSupport.requireSessionOwnerUserId(httpRequest", "currentUserId(httpRequest"); private static final Pattern MAPPING = diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/MigrationInventoryTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/MigrationInventoryTest.java index fc6bb0a92..943390437 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/MigrationInventoryTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/MigrationInventoryTest.java @@ -97,9 +97,12 @@ class MigrationInventoryTest { * 2026-11-17 已改号 {@code V207__users_jd_publish_quota.sql} 入库(V206 被同窗 * admin_account_platform 三表平台列占用,account-platform 提交);202 号自此彻底空置。

    * + *

    211:京东商品发布许可迁移尚未入库时,生产已随品牌双通道发版应用 V212 + * (2026-11-18 17:1x)。Flyway 未开 out-of-order,故许可迁移改为 V213,211 永久留空。

    + * *

    共同后果:新迁移只能取当前最大值之上的号(详见 docs/migration-inventory.md)。

    */ - private static final Set RETIRED_HOLES = Set.of(132, 133, 148, 168, 169, 202); + private static final Set RETIRED_HOLES = Set.of(132, 133, 148, 168, 169, 202, 211); /** * 文件名版本与头注释版本不一致的历史件。V170 的头注释误写成 V168;它已应用到生产, diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java index 9fdf79d51..a350db0c2 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdPublishContractPendingTest.java @@ -123,8 +123,8 @@ class JdPublishContractPendingTest { assertTrue(source.contains("@PostMapping(\"/tasks\")"), "缺建单端点 POST /tasks"); assertTrue(source.contains("@PostMapping"), "建单必须是 POST 端点"); // AC-9 归属半边:选了他人商品要业务码拒绝(照 JdCollectController 的 fail-closed 鉴权形状) - assertTrue(source.contains("requireOwnershipUserId"), - "建单/items 下发必须走 adminAuthSupport.requireOwnershipUserId(选他人商品要业务码拒绝)"); + assertTrue(source.contains("adminAuthSupport.requireSessionOwnerUserId(httpRequest"), + "京东发布必须使用真实会话绑定所有者"); } @Test diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java index a37e3602d..2f5c36f8e 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishBoardServiceTest.java @@ -143,11 +143,11 @@ class JdPublishBoardServiceTest { @Test void 删除任务_归属不符一律拒_不碰明细表() { FileTaskEntity other = task(88L, 9L, "FAILED"); - when(fileTaskMapper.selectById(88L)).thenReturn(other); + when(fileTaskMapper.selectByIdForUpdate(88L)).thenReturn(other); assertThatThrownBy(() -> service.deleteTask(88L, 7L)) .isInstanceOf(BusinessException.class) - .hasMessageContaining("任务不存在"); + .extracting("code").isEqualTo(403); verify(jdPublishItemMapper, never()).delete(any()); verify(fileTaskMapper, never()).deleteById(any(java.io.Serializable.class)); } @@ -155,7 +155,7 @@ class JdPublishBoardServiceTest { @Test void 删除任务_先清明细快照行再清任务行() { FileTaskEntity mine = task(88L, 7L, "FAILED"); - when(fileTaskMapper.selectById(88L)).thenReturn(mine); + when(fileTaskMapper.selectByIdForUpdate(88L)).thenReturn(mine); when(jdPublishItemMapper.delete(any())).thenReturn(2); service.deleteTask(88L, 7L); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java index 12e647231..2d5ec4ba4 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishIngestServiceTest.java @@ -1,14 +1,12 @@ package com.nanri.aiimage.modules.jd.service; import com.baomidou.mybatisplus.core.MybatisConfiguration; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.modules.jd.mapper.JdPublishItemMapper; import com.nanri.aiimage.modules.jd.model.dto.JdPublishChunkRequest; import com.nanri.aiimage.modules.jd.model.dto.JdPublishChunkRequest.ItemResult; import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; -import com.nanri.aiimage.modules.jd.model.vo.JdPublishChunkVo; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; @@ -16,7 +14,6 @@ import org.apache.ibatis.builder.MapperBuilderAssistant; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -27,240 +24,160 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.lenient; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -/** - * v1.5 Phase 2 行级回传测试:R6 单行失败隔离/终态汇总、铁律 31 判死分档(京麦登录态致命、 - * 匿名拒判死、非致命只记录)、PENDING/终态任务拒收回传。 - */ @ExtendWith(MockitoExtension.class) class JdPublishIngestServiceTest { + private static final long TASK_ID = 34400L; + private static final long UID = 7L; - @Mock - private FileTaskMapper fileTaskMapper; - @Mock - private JdPublishItemMapper jdPublishItemMapper; - @Mock - private JdPublishStaleTaskService staleTaskService; - @Mock - private TaskProgressSnapshotService taskProgressSnapshotService; + @Mock FileTaskMapper fileTaskMapper; + @Mock JdPublishItemMapper jdPublishItemMapper; + @Mock JdPublishStaleTaskService staleTaskService; + @Mock TaskProgressSnapshotService taskProgressSnapshotService; + @InjectMocks JdPublishIngestService service; - @InjectMocks - private JdPublishIngestService service; - - /** Mockito 纯单测无 Spring 环境:LambdaUpdateWrapper 解析 SFunction 需要 TableInfo 缓存(先例 ProgressQueryOwnershipOutletTest)。 */ @BeforeAll - static void initMybatisPlusTableInfo() { + static void initTableInfo() { MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), ""); TableInfoHelper.initTableInfo(assistant, FileTaskEntity.class); TableInfoHelper.initTableInfo(assistant, JdPublishItemEntity.class); } - private FileTaskEntity runningTask(long taskId) { + private FileTaskEntity task(String status, int attempt, int total) { FileTaskEntity task = new FileTaskEntity(); - task.setId(taskId); + task.setId(TASK_ID); + task.setUserId(UID); task.setModuleType("JD_PUBLISH"); - task.setStatus("RUNNING"); + task.setStatus(status); + task.setResumeAttempt(attempt); + task.setSourceFileCount(total); + when(fileTaskMapper.selectByIdForUpdate(TASK_ID)).thenReturn(task); return task; } - private ItemResult row(long productId, String status, String error, String wareId) { - ItemResult item = new ItemResult(); - item.setProductId(productId); - item.setPublishStatus(status); - item.setPublishError(error); - item.setJdWareId(wareId); - return item; + private JdPublishItemEntity row(String status, String batch, Integer attempt) { + JdPublishItemEntity row = new JdPublishItemEntity(); + row.setId(1L); + row.setPublishStatus(status); + row.setPublishBatchId(batch); + row.setPublishResumeAttempt(attempt); + when(jdPublishItemMapper.selectOne(any())).thenReturn(row); + return row; } - private void stubCounts(long success, long failed, long pending, long publishing) { - when(jdPublishItemMapper.countByPublishStatus(34400L)).thenReturn(List.of( - Map.of("publishStatus", "SUCCESS", "cnt", success), - Map.of("publishStatus", "FAILED", "cnt", failed), - Map.of("publishStatus", "PENDING", "cnt", pending), - Map.of("publishStatus", "PUBLISHING", "cnt", publishing))); + private static JdPublishChunkRequest request(int attempt, String batch, String status, String evidence) { + JdPublishChunkRequest request = new JdPublishChunkRequest(); + request.setResumeAttempt(attempt); + request.setBatchId(batch); + if (status != null) { + ItemResult item = new ItemResult(); + item.setItemId(1L); + item.setProductId(101L); + item.setPublishStatus(status); + if ("SUCCESS".equals(status)) { + item.setJdWareId(evidence); + } else { + item.setPublishError(evidence); + } + request.setItems(List.of(item)); + } + return request; + } + + private void counts(String status, long count) { + when(jdPublishItemMapper.countByPublishStatus(TASK_ID)).thenReturn( + List.of(Map.of("publishStatus", status, "cnt", count))); } @Test - void 行级回传SUCCESS落库并带wareId() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 1, 0); - when(jdPublishItemMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); - request.setBatchId("PUB-0001"); - request.setItems(List.of(row(101L, "SUCCESS", null, "10036498117800"))); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getAcceptedCount()).isEqualTo(1); - ArgumentCaptor captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class); - verify(jdPublishItemMapper).update(any(), captor.capture()); - String sqlSet = captor.getValue().getSqlSet(); - assertThat(sqlSet).as("行级状态与 wareId 两列一起落库") - .contains("publish_status").contains("jd_ware_id"); - assertThat(captor.getValue().getParamNameValuePairs().values()) - .extracting(String::valueOf) - .as("行级值:状态 + wareId").contains("SUCCESS", "10036498117800"); - assertThat(vo.getTaskStatus()).as("未带 isEnd 不落终态").isNull(); + void 旧代回执及异主请求都不接触明细() { + task("RUNNING", 1, 1); + assertThatThrownBy(() -> service.submitChunk(TASK_ID, request(0, "old", "FAILED", "失败"), UID)) + .isInstanceOf(BusinessException.class).extracting("code").isEqualTo(409); + assertThatThrownBy(() -> service.submitChunk(TASK_ID, request(1, "other", null, null), 8L)) + .isInstanceOf(BusinessException.class).extracting("code").isEqualTo(403); + verifyNoInteractions(jdPublishItemMapper, staleTaskService); } @Test - void 行级FAILED带真实原因落库() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 1, 0); - when(jdPublishItemMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); - request.setItems(List.of(row(101L, "FAILED", "类目不在授权树内", null))); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getAcceptedCount()).isEqualTo(1); - ArgumentCaptor captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class); - verify(jdPublishItemMapper).update(any(), captor.capture()); - assertThat(captor.getValue().getParamNameValuePairs().values()) - .extracting(String::valueOf) - .as("R6:失败行落真实原因,不伪造成功").contains("FAILED", "类目不在授权树内"); + void 已领取发布许可仅原代原批可重复确认() { + task("RUNNING", 1, 1); + row("PUBLISHING", "batchA", 1); + assertThat(service.submitChunk(TASK_ID, request(1, "batchB", "PUBLISHING", null), UID).getAcceptedCount()).isZero(); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "PUBLISHING", null), UID).getAcceptedCount()).isOne(); + verify(jdPublishItemMapper, never()).update(any(), any()); } @Test - void 不识别的行状态跳过不炸批() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 2, 0); - when(jdPublishItemMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); - request.setItems(List.of(row(101L, "PENDING", null, null), row(102L, "SUCCESS", null, "w1"))); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getAcceptedCount()).as("PENDING 不可回传写回,只有 SUCCESS 行被接受").isEqualTo(1); + void 首次许可及持有者的确定失败分别写库() { + task("RUNNING", 1, 1); + JdPublishItemEntity row = row("PENDING", null, null); + when(jdPublishItemMapper.update(isNull(), any())).thenReturn(1); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "PUBLISHING", null), UID).getAcceptedCount()).isOne(); + row.setPublishStatus("PUBLISHING"); + row.setPublishBatchId("batchA"); + row.setPublishResumeAttempt(1); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "FAILED", "京麦明确拒绝"), UID).getAcceptedCount()).isOne(); } @Test - void isEnd全成功任务落SUCCESS() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(3, 0, 0, 0); - when(jdPublishItemMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); - when(fileTaskMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); + void 旧代许可不能在新代被同一批次重新确认或转失败() { + task("RUNNING", 2, 1); + row("PUBLISHING", "batchA", 1); + assertThat(service.submitChunk(TASK_ID, request(2, "batchA", "PUBLISHING", null), UID).getAcceptedCount()).isZero(); + assertThat(service.submitChunk(TASK_ID, request(2, "batchA", "FAILED", "京麦明确拒绝"), UID).getAcceptedCount()).isZero(); + verify(jdPublishItemMapper, never()).update(any(), any()); + } - JdPublishChunkRequest request = new JdPublishChunkRequest(); + @Test + void SUCCESS仅允许精确重放而不可覆盖() { + task("SUCCESS", 1, 1); + row("SUCCESS", "batchA", 1).setJdWareId("w1"); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "SUCCESS", "w1"), UID).getAcceptedCount()).isOne(); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "SUCCESS", "w2"), UID).getAcceptedCount()).isZero(); + verify(jdPublishItemMapper, never()).update(any(), any()); + } + + @Test + void 未决或零行不得收尾() { + task("RUNNING", 1, 1); + JdPublishChunkRequest request = request(1, "batchA", null, null); request.setIsEnd(true); - request.setItems(List.of(row(103L, "SUCCESS", null, "w3"))); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getTaskStatus()).isEqualTo("SUCCESS"); - ArgumentCaptor captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class); - verify(fileTaskMapper).update(any(), captor.capture()); - String sqlSet = captor.getValue().getSqlSet(); - assertThat(sqlSet).as("任务终态列:状态 + 真实行数两列") - .contains("status").contains("success_file_count"); - assertThat(captor.getValue().getParamNameValuePairs().values()) - .extracting(String::valueOf) - .as("AC-6:任务终态汇总真实行数").contains("SUCCESS"); - verify(taskProgressSnapshotService).markTerminal(eq(34400L), eq("JD_PUBLISH"), eq("SUCCESS"), any()); + assertThat(service.submitChunk(TASK_ID, request, UID).getTaskStatus()).isEqualTo("RUNNING"); + counts("PUBLISHING", 1); + var pending = service.submitChunk(TASK_ID, request, UID); + assertThat(pending.getTaskStatus()).isEqualTo("RUNNING"); + assertThat(pending.isNeedsReview()).isTrue(); + assertThat(pending.getPublishingCount()).isOne(); + verify(fileTaskMapper, never()).update(any(), any()); } @Test - void isEnd有失败行任务落FAILED并汇总() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(2, 1, 0, 0); - when(fileTaskMapper.update(any(), any(LambdaUpdateWrapper.class))).thenReturn(1); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); + void 非零且全部已处理才汇总失败() { + task("RUNNING", 1, 1); + counts("FAILED", 1); + when(fileTaskMapper.update(isNull(), any())).thenReturn(1); + JdPublishChunkRequest request = request(1, "batchA", null, null); request.setIsEnd(true); - request.setItems(List.of()); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getTaskStatus()).isEqualTo("FAILED"); - ArgumentCaptor captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class); - verify(fileTaskMapper).update(any(), captor.capture()); - assertThat(captor.getValue().getParamNameValuePairs().values()) - .extracting(String::valueOf) - .as("R6:任务终态汇总成败数(文案带真实行数)") - .contains("FAILED", "发布完成:成功 2 行,失败 1 行"); + assertThat(service.submitChunk(TASK_ID, request, UID).getTaskStatus()).isEqualTo("FAILED"); + verify(taskProgressSnapshotService).markTerminal(TASK_ID, "JD_PUBLISH", "FAILED", "发布完成:成功 0 行,失败 1 行"); } @Test - void PENDING任务拒收回传点名激活() { - FileTaskEntity task = runningTask(34400L); - task.setStatus("PENDING"); - when(fileTaskMapper.selectById(34400L)).thenReturn(task); - assertThatThrownBy(() -> service.submitChunk(34400L, new JdPublishChunkRequest(), true)) - .isInstanceOf(BusinessException.class) - .hasMessageContaining("任务不在运行中"); - verify(jdPublishItemMapper, never()).update(any(), any(LambdaUpdateWrapper.class)); - } - - @Test - void 终态任务拒收回传() { - FileTaskEntity task = runningTask(34400L); - task.setStatus("SUCCESS"); - when(fileTaskMapper.selectById(34400L)).thenReturn(task); - assertThatThrownBy(() -> service.submitChunk(34400L, new JdPublishChunkRequest(), true)) - .isInstanceOf(BusinessException.class) - .hasMessageContaining("任务已结束"); - } - - @Test - void 京麦登录态致命可信上报判死() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 1, 0); - when(staleTaskService.terminalizeOnJdLoginFatal(any(), anyString())).thenReturn(true); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); - request.setError("发布页跳回登录页,京麦未登录"); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getTaskStatus()).as("铁律 31:凭据不可自愈 ⇒ 整单 FAILED").isEqualTo("FAILED"); - verify(staleTaskService).terminalizeOnJdLoginFatal(any(), eq("发布页跳回登录页,京麦未登录")); - verify(jdPublishItemMapper, never()).update(any(), any(LambdaUpdateWrapper.class)); - } - - @Test - void 匿名error上报拒绝判死() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 1, 0); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); + void 登录失效必须先写真实失败行才可判死() { + FileTaskEntity task = task("RUNNING", 1, 2); + JdPublishChunkRequest request = request(1, "batchA", null, null); request.setError("京麦未登录"); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, false); - - assertThat(vo.getTaskStatus()).as("判死口凭据化:匿名一律拒绝判死").isNull(); - verify(staleTaskService, never()).terminalizeOnJdLoginFatal(any(), anyString()); - verify(fileTaskMapper, never()).update(any(), any(LambdaUpdateWrapper.class)); - } - - @Test - void 非致命技术故障只记录不判死() { - when(fileTaskMapper.selectById(34400L)).thenReturn(runningTask(34400L)); - stubCounts(0, 0, 1, 0); - - JdPublishChunkRequest request = new JdPublishChunkRequest(); - request.setError("页面结构变更,发布按钮定位失败"); - - JdPublishChunkVo vo = service.submitChunk(34400L, request, true); - - assertThat(vo.getTaskStatus()).as("技术性故障只补测不判死(R5 分档)").isNull(); - verify(staleTaskService, never()).terminalizeOnJdLoginFatal(any(), anyString()); - verify(fileTaskMapper, never()).update(any(), any(LambdaUpdateWrapper.class)); - } - - @Test - void 任务不存在拒收回传() { - when(fileTaskMapper.selectById(99999L)).thenReturn(null); - assertThatThrownBy(() -> service.submitChunk(99999L, new JdPublishChunkRequest(), true)) - .isInstanceOf(BusinessException.class) - .hasMessageContaining("任务不存在"); + assertThat(service.submitChunk(TASK_ID, request, UID).getTaskStatus()).isNull(); + verifyNoInteractions(staleTaskService); + row("PENDING", null, null); + when(jdPublishItemMapper.update(isNull(), any())).thenReturn(1); + when(staleTaskService.terminalizeOnJdLoginFatal(task, "京麦未登录")).thenReturn(true); + assertThat(service.submitChunk(TASK_ID, request(1, "batchA", "FAILED", "京麦未登录"), UID).getTaskStatus()).isEqualTo("FAILED"); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java index 50abf8889..c7a356f39 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java @@ -45,7 +45,7 @@ class JdPublishTaskItemsResetSpiImplTest { } @Test - void 复位只圈FAILED与PUBLISHING行_清旧错误文案_不碰SUCCESS() { + void 复位只圈确定FAILED行_不碰SUCCESS或结果未知的PUBLISHING() { JdPublishItemMapper mapper = mock(JdPublishItemMapper.class); when(mapper.update(isNull(), any())).thenReturn(3); @@ -67,7 +67,8 @@ class JdPublishTaskItemsResetSpiImplTest { assertEquals(34567L, UpdateWrapperProbe.whereEq(wrapper).get("task_id")); Map params = UpdateWrapperProbe.paramNameValuePairs(wrapper); assertTrue(params.containsValue("FAILED"), "行状态谓词必须含 FAILED"); - assertTrue(params.containsValue("PUBLISHING"), "行状态谓词必须含 PUBLISHING(中断遗留行)"); + assertTrue(!params.containsValue("PUBLISHING"), "结果未知的 PUBLISHING 绝不能重新发布"); + assertTrue(!params.containsValue("SUCCESS"), "已发布商品绝不能重新发布"); assertTrue(params.containsValue("PENDING"), "复位目标值在参数册"); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java index 690151545..45ab1a483 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskServiceTest.java @@ -286,7 +286,7 @@ class JdPublishTaskServiceTest { when(jdProductSkuMapper.selectList(any())).thenReturn(List.of()); when(jdProductImageMapper.selectList(any())).thenReturn(List.of()); - var vo = service.pullItems(34400L, 7L, 0L, null); + var vo = service.pullItems(34400L, 7L, 0, 0L, null); assertThat(vo.getTaskId()).isEqualTo(34400L); assertThat(vo.getItems()).hasSize(1); @@ -304,7 +304,7 @@ class JdPublishTaskServiceTest { task.setUserId(8L); task.setStatus("RUNNING"); when(fileTaskMapper.selectById(34400L)).thenReturn(task); - assertThatThrownBy(() -> service.pullItems(34400L, 7L, 0L, null)) + assertThatThrownBy(() -> service.pullItems(34400L, 7L, 0, 0L, null)) .isInstanceOf(BusinessException.class) .extracting("code") .isEqualTo(403); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java index 208004a25..ccb701eb5 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskClientPullServiceTest.java @@ -98,6 +98,19 @@ class TaskClientPullServiceTest { any(LocalDateTime.class), eq(5)); } + @Test + void 京东发布能力在SQL取页以前生效且不影响其他任务() { + TaskClientPullService service = service(new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))); + ReflectionTestUtils.setField(service, "moduleTypes", "JD_PUBLISH,SIMILAR_ASIN"); + service.pullPendingTasks(USER_ID); + service.pullPendingTasks(USER_ID, true); + + verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), + eq(List.of("SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5)); + verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"), + eq(List.of("JD_PUBLISH", "SIMILAR_ASIN")), eq(CollectChannel.localDefaultModuleTypes()), any(), eq(5)); + } + @Test void 页面抢先认领后不再返回任务() { stubPullCandidates(task(11L, "SIMILAR_ASIN")); diff --git a/frontend-vue/src/pages/jd/JdPublishTab.vue b/frontend-vue/src/pages/jd/JdPublishTab.vue index ddeb54238..f50c1d0f1 100644 --- a/frontend-vue/src/pages/jd/JdPublishTab.vue +++ b/frontend-vue/src/pages/jd/JdPublishTab.vue @@ -8,7 +8,6 @@ import { type JdCollectGroupVo, } from '@/shared/api/types/modules/jd-collect' import { - activateJdPublishTask, createJdPublishTask, deleteJdPublishTask, fetchJdPublishDashboard, @@ -35,12 +34,9 @@ import NotificationBell from '@/shared/components/NotificationBell.vue' * 当前登录用户的行),页内翻页、勾选跨页累计; * 2. 改价规则三档(none/percent/fixed,蓝图 §3 死契约),与勾选集一起进建单体;服务端按 * 同一规则折算 SKU 价(铁律 27a 改价同源); - * 3. 建单成功把服务端下发的 queuePayload(type=jd-product-publish-run,铁律 32 第三件)原样 - * 推进本机客户端队列;激活(PENDING→RUNNING)必须在推队列之前(2026-11-14 采集链真机 - * 实录同因);推送失败不回滚建单(兜底拉取认领); + * 3. 网页原样转交建单响应的 queuePayload;认领只由客户端与后端完成,投递失败仍可由客户端拉取; * 4. 进度只读服务端:行级四档计数来自发布明细表聚合,total 缺失时只报已发布行数,不编造百分比; - * 5. 失败/中断「重试/继续」走通用原位复位(铁律 26,不克隆),推送载荷从历史行的建单载荷 - * (分类 id+改价规则)同源重建——与建单响应 queuePayload 同键同形状; + * 5. 失败/中断「重试/继续」走通用原位复位(铁律 26,不克隆),新一轮由客户端拉取认领; * 6. 京麦未登录等凭据致命失败(铁律 31):服务端整单判死后 useLiveTaskBoard 经 * reportCredentialFatal 弹一次窗(credential-fatal 同形接入,AC-5 用户端半边;弹窗组件 * 挂 App.vue,本页无需重复挂)。 @@ -85,8 +81,22 @@ const productTotal = ref(0) const productPage = ref(1) const productsLoading = ref(false) const selectedProducts = ref(new Map()) +let productRequest = 0 const selectedProductIds = computed(() => Array.from(selectedProducts.value.keys())) +const wholePageSelected = computed(() => products.value.length > 0 + && products.value.every((row) => selectedProducts.value.has(row.id))) +const partOfPageSelected = computed(() => !wholePageSelected.value + && products.value.some((row) => selectedProducts.value.has(row.id))) + +function togglePage(checked: boolean) { + const next = new Map(selectedProducts.value) + for (const row of products.value) { + if (checked) next.set(row.id, row) + else next.delete(row.id) + } + selectedProducts.value = next +} function toggleProduct(row: JdPublishProductVo, checked: boolean) { const next = new Map(selectedProducts.value) @@ -100,18 +110,35 @@ function clearSelection() { } async function loadProducts() { + const request = ++productRequest + products.value = [] + if (selectedGroupId.value == null) { + productTotal.value = 0 + productsLoading.value = false + return + } productsLoading.value = true try { const vo = await fetchJdPublishProducts(selectedGroupId.value, productPage.value, PRODUCT_PAGE_SIZE) + if (request !== productRequest) return products.value = vo.items ?? [] productTotal.value = vo.total ?? 0 } catch (err) { - errorMessage.value = err instanceof Error ? err.message : '商品列表拉取失败,请稍后重试' + if (request === productRequest) { + errorMessage.value = err instanceof Error ? err.message : '商品列表拉取失败,请稍后重试' + } } finally { - productsLoading.value = false + if (request === productRequest) productsLoading.value = false } } +function changeGroup() { + productPage.value = 1 + productTotal.value = 0 + clearSelection() + void loadProducts() +} + function changePage(page: number) { productPage.value = page void loadProducts() @@ -134,12 +161,54 @@ const submitDisabled = computed(() => || !selectedProducts.value.size || priceValueMissing.value) +// 重试回执不带代数:旧代 + 1 只用作读侧下限,不生成任务或队列数据。 +const retryAttemptFloor = new Map() +const awaitingRetryProgress = new Set() +const retryingTaskIds = ref(new Set()) + +function acceptsAttempt(taskId: number | undefined, attempt: number | undefined) { + const floor = taskId == null ? undefined : retryAttemptFloor.get(taskId) + return floor == null || (attempt != null && attempt >= floor) +} + +async function fetchCurrentHistory(): ReturnType { + const history = await fetchJdPublishHistory() + return { + ...history, + items: history.items.flatMap((item): JdPublishHistoryItemVo[] => { + if (acceptsAttempt(item.taskId, item.resumeAttempt)) return [item] + const current = board.historyItems.value.find((row) => row.taskId === item.taskId) + return current && acceptsAttempt(current.taskId, current.resumeAttempt) ? [current] : [] + }), + } +} + +async function fetchCurrentProgress(taskIds: number[], { force }: { force: boolean }) { + const floorsAtRequest = new Map(taskIds.map((id) => [id, retryAttemptFloor.get(id)])) + const unchanged = (id: number) => !retryingTaskIds.value.has(id) + && retryAttemptFloor.get(id) === floorsAtRequest.get(id) + const batch = await fetchJdPublishTaskProgressBatch(taskIds, { + force: force || taskIds.some((id) => awaitingRetryProgress.has(id)), + }) + return { + ...batch, + items: batch.items.filter(({ task, items }) => { + if (task?.id == null || !unchanged(task.id) || !acceptsAttempt(task.id, task.resumeAttempt)) return false + const row = items?.[0] + if (row && !acceptsAttempt(task.id, row.resumeAttempt)) return false + awaitingRetryProgress.delete(task.id) + return true + }), + missingTaskIds: batch.missingTaskIds.filter(unchanged), + } +} + // ---- 实时任务面板(照 JdCollectTab 的 useLiveTaskBoard 形状;京东发布无结果文件,无下载层)---- const board = useLiveTaskBoard({ scope: 'jd-publish', pollingStorageKey: () => `jd-publish:tasks:${uidForStorage()}`, - fetchHistory: fetchJdPublishHistory, - fetchProgressBatch: fetchJdPublishTaskProgressBatch, + fetchHistory: fetchCurrentHistory, + fetchProgressBatch: fetchCurrentProgress, fetchDashboard: fetchJdPublishDashboard, normalizeTaskStatus, // 京东发布没有结果文件:状态到终态即结束,没有「等文件」那一层 @@ -291,25 +360,23 @@ async function interruptTaskRecord(item: JdPublishHistoryItemVo | null | undefin async function retryTaskRecord(item: JdPublishHistoryItemVo | null | undefined) { const taskId = item?.taskId - if (!taskId) return + if (!taskId || retryingTaskIds.value.has(taskId)) return const isResume = normalizeTaskStatus(item) === 'CANCELLED' - try { - await retryClientTask(taskId) - ElMessage.success(isResume - ? '已继续:在这条任务上接着跑(已成功的商品不会重复发布)' - : '已提交重试:在这条任务上继续跑(不新建任务)') - // 复位是 PENDING:与建单同一条激活+推队列链路,客户端才会立刻领到这一单。 - const activateError = await activateTask(taskId) - if (!activateError) { - const priceRule = item?.priceRule && item.priceRule.mode ? item.priceRule : { mode: 'none' } - // 推送载荷从历史行的建单载荷同源重建(与建单响应 queuePayload 同键:type/taskId/priceRule)。 - await pushToClientQueue({ type: 'jd-product-publish-run', data: { taskId, priceRule } }) - } - board.addPollingTask(taskId) - await refreshBoard() - } catch (error) { + retryingTaskIds.value.add(taskId) + const retried = await retryClientTask(taskId).then(() => true, (error: unknown) => { ElMessage.error(error instanceof Error ? error.message : '重试失败') - } + return false + }) + retryingTaskIds.value.delete(taskId) + if (!retried) return + + retryAttemptFloor.set(taskId, (item.resumeAttempt ?? 0) + 1) + awaitingRetryProgress.add(taskId) + board.removePollingTask(taskId) + board.historyItems.value = board.historyItems.value.filter((row) => row.taskId !== taskId) + board.addPollingTask(taskId) + ElMessage.success(isResume ? '已提交继续,等待本机客户端领取' : '已提交原任务重试,等待本机客户端领取') + await refreshBoard().catch((error) => console.error('[jd-publish] 重试后刷新任务失败', error)) } /** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度 */ @@ -321,38 +388,21 @@ async function refreshBoard() { ]) } -/** 激活任务(PENDING→RUNNING),返回 null 表示可推队列,返回 string 表示失败原因。 - * 漏掉这一步,客户端第一个回传会被「任务不在运行中(PENDING)」拒收(采集链真机实录同因)。 */ -async function activateTask(id: number): Promise { - try { - await activateJdPublishTask(id) - return null - } catch (err) { - const text = err instanceof Error ? err.message : '' - // 客户端兜底拉取已原子认领(PENDING→RUNNING)时后端回这句:等同激活成功,不当失败展示。 - if (text.includes('已在执行中')) { - return null - } - console.error('[jd-publish] 激活任务失败', err) - return '任务激活失败,本机客户端领不到这一单,请稍后重试' - } -} +const WAIT_FOR_CLIENT = '任务已创建,等待本机客户端领取。请保持客户端在线。' -/** 推送本机队列:建单路径传服务端下发的 queuePayload(页面不拼载荷),重试路径按同键形状重建后传入。 */ -async function pushToClientQueue(payload: Record): Promise { +async function pushToClientQueue(payload: Record | undefined): Promise { + if (!payload) return WAIT_FOR_CLIENT const api = getPywebviewApi() if (!api?.enqueue_json) { - return '当前环境未启用任务队列能力(浏览器预览环境不会启动),请在本机客户端中打开本页' + return '任务已创建,等待本机客户端领取。请打开本机客户端并登录同一账号。' } - const pushResult = await api.enqueue_json(payload) - if (pushResult?.success) { + const result = await api.enqueue_json(payload).catch((error) => { + console.error('[jd-publish] 推送本机队列失败', error) return null - } - // 桥返回的 error 原文(系统/英文)不透传进界面:console 留链,界面固定中文动作句 - if (pushResult?.error) { - console.error('[jd-publish] enqueue_json 被拒', pushResult.error) - } - return '推送本机队列失败,任务将由客户端兜底拉取认领' + }) + if (result?.success) return null + if (result?.error) console.error('[jd-publish] enqueue_json 被拒', result.error) + return '任务已创建,但未能推送到本机队列。请保持客户端在线,客户端会自动领取。' } const isRunning = computed(() => Boolean(board.dashboard.value.pendingTaskCount) || submitting.value) @@ -378,29 +428,11 @@ async function startPublish() { const productIds = selectedProductIds.value const vo = await createJdPublishTask(categoryId, productIds, priceRule) board.addPollingTask(vo.taskId) - let pushNote = '' - const activateError = await activateTask(vo.taskId) - if (activateError) { - // 没激活成功就不推队列:推了也是白跑一轮。任务留在 PENDING, - // 由服务端兜底拉取认领后照样会跑,所以这里只提示、不回滚建单。 - pushNote = activateError - } else { - try { - // 建单响应自带 queuePayload(服务端组装,铁律 32 第三件),页面原样投递。 - const pushError = await pushToClientQueue(vo.queuePayload - ?? { type: 'jd-product-publish-run', data: { taskId: vo.taskId, priceRule } }) - if (pushError) pushNote = pushError - } catch (pushErr) { - pushNote = '推送本机队列失败,任务将由服务端兜底派发给本机客户端执行' - console.error('[jd-publish] 推送本机队列失败', pushErr) - } - } - if (pushNote) { - errorMessage.value = pushNote - } else { - successMessage.value = `任务已创建(${productIds.length} 个商品)并推送给本机客户端,进度显示在右侧任务区` - } + const pushNote = await pushToClientQueue(vo.queuePayload) + successMessage.value = pushNote + ?? `任务已创建(${productIds.length} 个商品)并送入本机队列,等待客户端领取。` await Promise.all([board.loadDashboard(), board.loadHistory({ force: true })]) + .catch((error) => console.error('[jd-publish] 建单后刷新任务失败', error)) } catch (err) { errorMessage.value = err instanceof Error ? err.message : '建单失败,请稍后重试' } finally { @@ -458,7 +490,7 @@ onUnmounted(() => {
    自定义分类 + :loading="groupsLoading" @change="changeGroup"> @@ -468,6 +500,12 @@ onUnmounted(() => {
    选择商品(已选 {{ selectedProducts.size }} 个,跨页累计) +
    diff --git a/frontend-vue/src/shared/api/endpoints.ts b/frontend-vue/src/shared/api/endpoints.ts index 21eb1e8c4..ed6244662 100644 --- a/frontend-vue/src/shared/api/endpoints.ts +++ b/frontend-vue/src/shared/api/endpoints.ts @@ -226,12 +226,10 @@ export const API_ENDPOINTS = { /** 删除任务(连带清理京东数据库该任务的商品/图片/SKU 行与断点游标) */ deleteTask: '/api/jd-collect/tasks/{taskId}', }, - /** 京东商品上架(v1.5 Phase 4):用户端建单/激活/选品/面板;派发载荷 type=jd-product-publish-run 由服务端下发 */ + /** 京东商品上架:用户端建单/选品/面板;派发载荷由服务端下发,认领只由客户端和后端完成。 */ jdPublish: { /** 建单(请求体 categoryId+productIds+priceRule,响应带 queuePayload 页面直推) */ create: '/api/jd-publish/tasks', - /** 激活(PENDING→RUNNING):推客户端队列之前必须调用(2026-11-14 采集链真机实录同因) */ - activate: '/api/jd-publish/tasks/{taskId}/activate', /** 用户端选品分页(AC-9 owner 过滤:只回归属当前用户的京东数据库商品行) */ products: '/api/jd-publish/products', /** 任务面板总览(运行中/成功/失败计数统计卡) */ diff --git a/frontend-vue/src/shared/api/types/modules/jd-publish.ts b/frontend-vue/src/shared/api/types/modules/jd-publish.ts index 742d40f56..5a555b952 100644 --- a/frontend-vue/src/shared/api/types/modules/jd-publish.ts +++ b/frontend-vue/src/shared/api/types/modules/jd-publish.ts @@ -20,7 +20,7 @@ export interface JdPublishTaskVo { taskId: number; taskNo?: string; collectChannel?: string; - /** {type:'jd-product-publish-run', data:{taskId, priceRule}}(铁律 32 第三件) */ + /** 服务端完整载荷,包含任务代数;网页只转交,不读取或重建 data。 */ queuePayload?: Record; } @@ -52,13 +52,6 @@ export function createJdPublishTask( )) } -/** 激活任务(PENDING→RUNNING):推客户端队列之前必须调用(漏掉=分片全被拒,采集链真机实录同因)。 */ -export function activateJdPublishTask(taskId: number) { - const path = buildJavaUrl(API_ENDPOINTS.jdPublish.activate.replace('{taskId}', String(taskId))) - const query = `?user_id=${encodeURIComponent(String(getCurrentUserId()))}` - return unwrapJavaResponse(post, Record>(path + query, {})) -} - // --------------------------------------------------------------------------- // 选品分页(AC-9 owner 过滤):服务端只回归属当前用户的京东数据库商品行。 // 形状照后管京东数据库列表行裁剪(选品面板只需要主字段,attr/detail 不下发)。 @@ -126,9 +119,11 @@ export interface JdPublishHistoryItemVo { taskStatus?: string; success?: boolean; errorMessage?: string; - /** 建单所选自定义分类 id;重试重建推送载荷时同源带回 */ + /** 由后端递增的原位重试代数;首轮为 0。 */ + resumeAttempt?: number; + /** 建单所选自定义分类 id。 */ categoryId?: number; - /** 建单统一改价规则(原样带回;重试重建推送载荷与建单响应 queuePayload 同键) */ + /** 建单统一改价规则。 */ priceRule?: { mode?: string; value?: number }; /** 商品明细总行数 */ productTotal?: number; @@ -151,6 +146,7 @@ export interface JdPublishTaskDetailVo { id?: number; taskNo?: string; status?: string; + resumeAttempt?: number; errorMessage?: string; updatedAt?: string; }; diff --git a/frontend-vue/src/shared/utils/credential-fatal-notice.ts b/frontend-vue/src/shared/utils/credential-fatal-notice.ts index 1bf73e473..c732eafba 100644 --- a/frontend-vue/src/shared/utils/credential-fatal-notice.ts +++ b/frontend-vue/src/shared/utils/credential-fatal-notice.ts @@ -10,7 +10,7 @@ * (用户只看到一行消失)或「界面弹了但其实还在跑」(拿抖动陪葬)的错位。 */ -export type CredentialFatalKind = 'llm_balance' | 'proxy' | 'key_invalid' +export type CredentialFatalKind = 'llm_balance' | 'proxy' | 'key_invalid' | 'jd_login' export interface CredentialFatalNotice { kind: CredentialFatalKind @@ -120,6 +120,12 @@ export function credentialFatalNotice(message: string | null | undefined): Crede if (!raw) return null const text = raw.toLowerCase() + // 京麦专属判据优先于通用终止句与 HTTP 401;仅探测登录态超时不是登录凭据失效。 + if (/京麦未登录|未登录京麦|京麦登录态(?:已)?失效/.test(raw) + || (raw.includes('京麦') && raw.includes('登录态失效') && !hit(text, SELF_HEALING_MARKERS))) { + return jdLoginNotice() + } + // 后端已经判死并写了指引句:这句话本身就足够定性,先认它(比逐词猜稳) if (raw.includes(TERMINAL_SENTENCE)) { return raw.includes(PROXY_TERMINAL_HINT) ? proxyNotice() : llmBalanceNotice() @@ -137,6 +143,14 @@ export function credentialFatalNotice(message: string | null | undefined): Crede return null } +function jdLoginNotice(): CredentialFatalNotice { + return { + kind: 'jd_login', + title: '任务已中断:京麦未登录', + body: '请在客户端重新登录京麦,再回到任务面板重试。', + } +} + export function proxyNotice(): CredentialFatalNotice { return { kind: 'proxy', diff --git a/frontend-vue/tests/credential-fatal-alert.test.ts b/frontend-vue/tests/credential-fatal-alert.test.ts index 779efeacc..620356d23 100644 --- a/frontend-vue/tests/credential-fatal-alert.test.ts +++ b/frontend-vue/tests/credential-fatal-alert.test.ts @@ -26,6 +26,15 @@ test('同一任务同一档只入队一次(重复轮询/重进页面都吃掉 assert.equal(credentialFatalQueueLength(), 1) }) +test('同一京麦任务的未登录提示出队后也不重复弹', () => { + __resetCredentialFatalAlertForTest() + assert.equal(reportCredentialFatal(88, '京麦接口限流'), false) + assert.equal(reportCredentialFatal(88, '京麦未登录'), true) + assert.equal(takeCredentialFatal()?.notice.kind, 'jd_login') + assert.equal(reportCredentialFatal(88, '京麦登录态已失效,请重新登录'), false) + assert.equal(credentialFatalQueueLength(), 0) +}) + test('同一任务换了一档要再弹(要去改的是另一处)', () => { __resetCredentialFatalAlertForTest() assert.equal(reportCredentialFatal(32901, '用户未配置代理'), true) diff --git a/frontend-vue/tests/credential-fatal-notice.test.ts b/frontend-vue/tests/credential-fatal-notice.test.ts index 36b075ca7..450980fc3 100644 --- a/frontend-vue/tests/credential-fatal-notice.test.ts +++ b/frontend-vue/tests/credential-fatal-notice.test.ts @@ -68,6 +68,26 @@ test('可自愈的供应商状态一律不弹', () => { } }) +test('京麦未登录和登录态失效提示去客户端重新登录', () => { + for (const message of [ + '京麦未登录(登录态失效),请在客户端重新登录京麦后重试', + '京麦登录态失效,任务已终止,请在客户端重新登录京麦', + '未登录京麦', + '京麦登录态已失效(HTTP 401)', + ]) { + const notice = credentialFatalNotice(message) + assert.equal(notice?.kind, 'jd_login') + assert.equal(notice?.title, '任务已中断:京麦未登录') + assert.match(notice?.body ?? '', /请在客户端重新登录京麦/) + } +}) + +test('京麦限流、页面结构变化和未注明京麦的登录错误不弹京麦提示', () => { + for (const message of ['京麦接口限流', '京麦登录态检查超时', '京麦发布页面结构变更', '登录态失效']) { + assert.equal(kindOf(message), null, `误弹: ${message}`) + } +}) + test('没有凭据字样的失败不弹(抖动不是凭据问题)', () => { assert.equal(kindOf('LLM 网关无应答'), null) assert.equal(kindOf('扩展注入失败'), null) diff --git a/frontend-vue/tests/endpoints.test.ts b/frontend-vue/tests/endpoints.test.ts index dd659a087..4a5ded2f6 100644 --- a/frontend-vue/tests/endpoints.test.ts +++ b/frontend-vue/tests/endpoints.test.ts @@ -339,12 +339,9 @@ test('test_endpoints_frozen_snapshot', () => { "progressBatch": "/api/jd-collect/tasks/progress/batch", "deleteTask": "/api/jd-collect/tasks/{taskId}" }, - // 2026-11-18 v1.5 Phase 4:京东商品上架(建单/激活/选品/面板七件)。建单响应 queuePayload - // 由服务端组装(type=jd-product-publish-run 与 SPI 同值,铁律 32 第三件),页面原样投 - // api.enqueue_json;分类读取唯一来源仍是 jdCollect.groups(B113-01,AC-9 源码绊线钉死)。 + // 京东商品上架:网页建单后只原样投递 queuePayload,客户端与后端负责认领。 "jdPublish": { "create": "/api/jd-publish/tasks", - "activate": "/api/jd-publish/tasks/{taskId}/activate", "products": "/api/jd-publish/products", "dashboard": "/api/jd-publish/dashboard", "history": "/api/jd-publish/history", diff --git a/frontend-vue/tests/mount/jd-publish-dispatch.mount.test.ts b/frontend-vue/tests/mount/jd-publish-dispatch.mount.test.ts new file mode 100644 index 000000000..b4c3d042d --- /dev/null +++ b/frontend-vue/tests/mount/jd-publish-dispatch.mount.test.ts @@ -0,0 +1,191 @@ +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import { flushPromises, mount, type VueWrapper } from '@vue/test-utils' +import JdPublishTab from '@/pages/jd/JdPublishTab.vue' +import { + __resetCredentialFatalAlertForTest, + credentialFatalQueueLength, + takeCredentialFatal, +} from '@/shared/stores/credential-fatal-alert' + +const api = vi.hoisted(() => ({ + create: vi.fn(), activate: vi.fn(), products: vi.fn(), groups: vi.fn(), + history: vi.fn(), progress: vi.fn(), dashboard: vi.fn(), retry: vi.fn(), enqueue: vi.fn(), bridge: vi.fn(), +})) + +vi.mock('@/shared/api/types/modules/jd-collect', () => ({ fetchJdCollectGroups: api.groups })) +vi.mock('@/shared/api/types/modules/jd-publish', () => ({ + createJdPublishTask: api.create, + activateJdPublishTask: api.activate, + fetchJdPublishDashboard: api.dashboard, + fetchJdPublishHistory: api.history, + fetchJdPublishProducts: api.products, + fetchJdPublishTaskProgressBatch: api.progress, + deleteJdPublishTask: vi.fn(), + interruptJdPublishTask: vi.fn(), +})) +vi.mock('@/shared/utils/categorized-timers.ts', () => ({ + createCategorizedTimers: () => ({ setTimeout: () => 1, clearTimer: vi.fn(), clearScope: vi.fn() }), +})) +vi.mock('element-plus', async (importOriginal) => ({ + ...await importOriginal(), + ElMessage: { success: vi.fn(), error: vi.fn() }, +})) +vi.mock('@/shared/api/task-retry', () => ({ retryClientTask: api.retry })) +vi.mock('@/shared/bridges/pywebview', () => ({ getPywebviewApi: api.bridge })) + +const queuePayload = { type: 'jd-product-publish-run', data: { taskId: 88, resumeAttempt: 0, serverOnly: true } } +const loginError = '京麦未登录(登录态失效),请在客户端重新登录京麦后重试' + +function row(taskStatus: string, resumeAttempt: number, errorMessage?: string) { + return { taskId: 88, taskStatus, resumeAttempt, productTotal: 2, errorMessage } +} + +function batch(item: ReturnType) { + return { + items: [{ task: { + id: item.taskId, status: item.taskStatus, resumeAttempt: item.resumeAttempt, errorMessage: item.errorMessage, + }, items: [item] }], + missingTaskIds: [], + } +} + +let wrapper: VueWrapper | undefined + +async function mountPage() { + wrapper = mount(JdPublishTab, { + global: { + stubs: { + NotificationBell: true, RouterLink: true, ElOption: true, + ElSelect: { props: ['modelValue'], emits: ['update:modelValue', 'change'], template: '
    ' }, + ElPagination: { emits: ['current-change'], template: '
    ' }, ElInputNumber: true, + ElDrawer: { props: ['modelValue'], template: '
    ' }, + }, + directives: { loading: () => undefined }, + }, + }) + await flushPromises() + return wrapper +} + +async function startPublish(page: VueWrapper) { + await page.get('.product-check').setValue(true) + await page.get('.collect-btn').trigger('click') + await flushPromises() +} + +beforeEach(() => { + for (const mock of Object.values(api)) mock.mockReset() + api.groups.mockResolvedValue([{ id: 12, name: '共享类目' }]) + api.products.mockResolvedValue({ items: [{ id: 23, title: '示例商品' }], total: 1 }) + api.create.mockResolvedValue({ taskId: 88, queuePayload }) + api.activate.mockResolvedValue(null) + api.dashboard.mockResolvedValue({ pendingTaskCount: 0, processedTaskCount: 0, successTaskCount: 0, failedTaskCount: 0 }) + api.history.mockResolvedValue({ items: [] }) + api.progress.mockResolvedValue(batch(row('PENDING', 0))) + api.bridge.mockReturnValue({ enqueue_json: api.enqueue }) + api.enqueue.mockResolvedValue({ success: true }) + api.retry.mockResolvedValue(null) + vi.spyOn(console, 'error').mockImplementation(() => undefined) +}) + +afterEach(() => { + wrapper?.unmount() + wrapper = undefined + __resetCredentialFatalAlertForTest() + localStorage.clear() + vi.restoreAllMocks() +}) + +it('建单只原样投递服务端载荷,网页不激活任务', async () => { + const page = await mountPage() + await startPublish(page) + expect(api.create).toHaveBeenCalledOnce() + expect(api.enqueue).toHaveBeenCalledOnce() + expect(api.enqueue.mock.calls[0][0]).toBe(queuePayload) + expect(api.activate).not.toHaveBeenCalled() +}) + +it.each(['没有桥', '队列拒绝', '桥异常', '没有服务端载荷'])('%s时保留待认领,不拼载荷也不误报建单失败', async (failure) => { + if (failure === '没有桥') api.bridge.mockReturnValue(undefined) + if (failure === '队列拒绝') api.enqueue.mockResolvedValue({ success: false, error: 'queue rejected' }) + if (failure === '桥异常') api.enqueue.mockRejectedValue(new Error('bridge unavailable')) + if (failure === '没有服务端载荷') api.create.mockResolvedValue({ taskId: 88 }) + const page = await mountPage() + await startPublish(page) + expect(api.activate).not.toHaveBeenCalled() + if (failure === '没有桥' || failure === '没有服务端载荷') expect(api.enqueue).not.toHaveBeenCalled() + expect(page.get('.feedback').text()).toContain('任务已创建') + expect(page.get('.feedback').text()).toContain('客户端') + expect(page.get('.status').text()).toContain('等待本机客户端领取') + expect(page.text()).not.toContain('queue rejected') +}) + +it('切换分类后迟到的旧商品列表不能再参与勾选', async () => { + api.groups.mockResolvedValue([{ id: 12, name: '原分类' }, { id: 13, name: '新分类' }]) + let resolveOld!: (data: { items: { id: number, title: string }[], total: number }) => void + api.products.mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve })) + api.products.mockResolvedValueOnce({ items: [{ id: 24, title: '新分类商品' }], total: 1 }) + const page = await mountPage() + const select = page.getComponent('.shop-cat-select') + select.vm.$emit('update:modelValue', 13) + select.vm.$emit('change', 13) + await flushPromises() + resolveOld({ items: [{ id: 23, title: '旧分类商品' }], total: 1 }) + await flushPromises() + expect(page.get('.product-title').text()).toBe('新分类商品') + await startPublish(page) + expect(api.create).toHaveBeenCalledExactlyOnceWith(13, [24], { mode: 'none' }) +}) + +it('全选和取消只影响本页,其他页勾选保留', async () => { + api.products.mockResolvedValueOnce({ items: [{ id: 23, title: '第一页商品' }], total: 13 }) + api.products.mockResolvedValueOnce({ items: [{ id: 24, title: '第二页商品' }], total: 13 }) + const page = await mountPage() + await page.get('.product-select-page').setValue(true) + page.getComponent('.product-pager').vm.$emit('current-change', 2) + await flushPromises() + await page.get('.product-select-page').setValue(true) + expect(page.get('.collect-btn').text()).toContain('2 个商品') + await page.get('.product-select-page').setValue(false) + await page.get('.collect-btn').trigger('click') + await flushPromises() + expect(api.create).toHaveBeenCalledExactlyOnceWith(12, [23], { mode: 'none' }) +}) + +it('原位重试只由兜底认领,迟到的旧代终态不能停掉轮询或弹窗', async () => { + api.history.mockResolvedValue({ items: [row('FAILED', 3, loginError)] }) + api.progress.mockResolvedValue(batch(row('FAILED', 3, loginError))) + const page = await mountPage() + await page.get('.history-btn').trigger('click') + await page.get('.btn-retry').trigger('click') + await flushPromises() + expect(api.retry).toHaveBeenCalledExactlyOnceWith(88) + expect(api.activate).not.toHaveBeenCalled() + expect(api.enqueue).not.toHaveBeenCalled() + expect(credentialFatalQueueLength()).toBe(0) + expect(page.find('.btn-retry').exists()).toBe(false) + expect(localStorage.getItem('jd-publish:tasks:0')).toBe('[88]') + + api.history.mockResolvedValue({ items: [row('RUNNING', 4)] }) + api.progress.mockResolvedValue(batch(row('RUNNING', 4))) + await page.get('.panel-refresh').trigger('click') + await flushPromises() + await flushPromises() + expect(page.get('.status').text()).toBe('正在发布到京麦…') + expect(page.text()).not.toContain(loginError) + + // 新代已进入 RUNNING,此时再晚到一条旧代终态也不能结算。 + api.progress.mockResolvedValue(batch(row('FAILED', 3, loginError))) + await page.get('.panel-refresh').trigger('click') + await flushPromises() + expect(credentialFatalQueueLength()).toBe(0) + expect(localStorage.getItem('jd-publish:tasks:0')).toBe('[88]') + + api.progress.mockResolvedValue(batch(row('FAILED', 4, loginError))) + await page.get('.panel-refresh').trigger('click') + await flushPromises() + await flushPromises() + expect(credentialFatalQueueLength()).toBe(1) + expect(takeCredentialFatal()?.notice.body).toContain('请在客户端重新登录京麦') + expect(localStorage.getItem('jd-publish:tasks:0')).toBeNull() +})