From 79b04afdd9a5fe547556fea70c1e1e2ff2b1e8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 30 Oct 2026 10:56:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(phase-6.1):=20CR=20=E6=B6=88=E9=A1=B9?= =?UTF-8?q?=E2=80=94=E2=80=94=E5=88=86=E9=A1=B5=E9=94=9A=E7=82=B9=E3=80=81?= =?UTF-8?q?=E5=88=86=E7=89=87=E9=89=B4=E6=9D=83=E3=80=81=E4=B8=AD=E6=96=AD?= =?UTF-8?q?=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 任务中心 keyset 锚点取 offset-1(上一页最后一行),修复第 2 页首行永久丢失 - /api/files/chunk/** 纳入必须凭据的写端点,并按解码路径再判一次堵住百分号编码绕过 - /api/tasks/{id}/interrupted 增加归属闸:普通账号只能打断自己名下任务, 内部令牌/管理角色保持原语义;品牌任务经 BrandTaskHeartbeatSpi.findOwnerUserId 比对 - 新增 TaskInterruptOwnershipTest 3 例,守卫测试扩到 6 例 --- .../aiimage/config/AdminApiGuardFilter.java | 45 ++++++++ .../service/BrandCrawlTaskHeartbeatSpi.java | 6 + .../controller/TaskHeartbeatController.java | 17 ++- .../task/service/TaskHeartbeatService.java | 24 ++++ .../task/spi/BrandTaskHeartbeatSpi.java | 9 ++ .../service/TaskCenterQueryService.java | 4 +- .../PendingPhase1AnonymousWriteGuardTest.java | 38 +++++++ .../service/TaskInterruptOwnershipTest.java | 104 ++++++++++++++++++ .../service/TaskCenterQueryServiceTest.java | 6 +- 9 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInterruptOwnershipTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java b/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java index 3d90c5c88..50fb9bbb0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java @@ -141,6 +141,9 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { /** 必须解析得出身份才放行的确切写路径(S0-7/AC-8),不受 {@code user-tool-guard-enabled} 豁免。 */ private static final String[] CREDENTIALED_WRITE_PATHS = {"/api/files/upload"}; + /** 分片通道前缀:init/part/status/complete/abort 与整包上传同一归属语义,不许留匿名口。 */ + private static final String FILES_CHUNK_PATH_PREFIX = "/api/files/chunk"; + /** 打断任务这条动作:只收 {@code /api/tasks/{id}/interrupted},不动同前缀的 pull-pending/heartbeat。 */ private static final String TASK_PATH_PREFIX = "/api/tasks/"; private static final String TASK_INTERRUPTED_SUFFIX = "/interrupted"; @@ -355,15 +358,57 @@ public class AdminApiGuardFilter extends OncePerRequestFilter { */ static boolean isCredentialRequiredWriteEndpoint(String uri) { String path = uri == null ? "" : uri; + if (matchesCredentialedWrite(path)) { + return true; + } + // getRequestURI() 保留百分号编码,而容器按解码后的路径路由: + // /api/files/%75pload 会落回同一条写动作 ⇒ 再按解码路径判一次,堵住编码绕过。 + String decoded = decodePath(path); + return !decoded.equals(path) && matchesCredentialedWrite(decoded); + } + + private static boolean matchesCredentialedWrite(String path) { for (String exact : CREDENTIALED_WRITE_PATHS) { if (path.equals(exact)) { return true; } } + // 分片通道(AC-17)是新的写面:匿名 init/part/complete 能占临时盘, + // complete 还能把匿名数据转存进公开桶,必须与 /api/files/upload 同口径。 + if (path.equals(FILES_CHUNK_PATH_PREFIX) || path.startsWith(FILES_CHUNK_PATH_PREFIX + "/")) { + return true; + } return path.startsWith(TASK_PATH_PREFIX) && path.endsWith(TASK_INTERRUPTED_SUFFIX) && path.length() > TASK_PATH_PREFIX.length() + TASK_INTERRUPTED_SUFFIX.length(); } + /** + * 手写百分号解码:只为匹配 ASCII 写端点,畸形编码原样保留(交给容器 400)。 + * 不用 {@code UriUtils.decode}——它遇到坏序列抛异常,会在守卫里多长一枚 catch。 + */ + private static String decodePath(String path) { + if (path == null || path.indexOf('%') < 0) { + return path == null ? "" : path; + } + StringBuilder out = new StringBuilder(path.length()); + int i = 0; + while (i < path.length()) { + char c = path.charAt(i); + if (c == '%' && i + 2 < path.length()) { + int hi = Character.digit(path.charAt(i + 1), 16); + int lo = Character.digit(path.charAt(i + 2), 16); + if (hi >= 0 && lo >= 0) { + out.append((char) ((hi << 4) + lo)); + i += 3; + continue; + } + } + out.append(c); + i++; + } + return out.toString(); + } + /** 未强制要求凭据的用户态前缀:只要带了 user_id 参数,归属就得和令牌身份对齐。 */ private boolean needsOwnershipBinding(HttpServletRequest request, String uri) { if (!isUserToolPrefix(uri)) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandCrawlTaskHeartbeatSpi.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandCrawlTaskHeartbeatSpi.java index e940fa669..102aa29ae 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandCrawlTaskHeartbeatSpi.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandCrawlTaskHeartbeatSpi.java @@ -88,6 +88,12 @@ public class BrandCrawlTaskHeartbeatSpi implements BrandTaskHeartbeatSpi { return TaskHeartbeatVo.notAlive(MODULE_BRAND, status, "task is not running"); } + @Override + public Long findOwnerUserId(Long taskId) { + BrandCrawlTaskEntity task = selectTask(taskId); + return task == null ? null : task.getUserId(); + } + private BrandCrawlTaskEntity selectTask(Long taskId) { LambdaQueryWrapper brandQuery = new LambdaQueryWrapper() .eq(BrandCrawlTaskEntity::getId, taskId) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskHeartbeatController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskHeartbeatController.java index 261f0a36d..71890fb2f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskHeartbeatController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/controller/TaskHeartbeatController.java @@ -1,6 +1,8 @@ package com.nanri.aiimage.modules.task.controller; import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.common.model.entity.AdminUserEntity; +import com.nanri.aiimage.common.security.AdminAuthSupport; import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest; import com.nanri.aiimage.modules.task.model.vo.TaskHeartbeatVo; import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; @@ -8,6 +10,7 @@ import com.nanri.aiimage.modules.task.service.TaskHeartbeatService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PathVariable; @@ -24,6 +27,7 @@ public class TaskHeartbeatController { private final TaskHeartbeatService taskHeartbeatService; private final TaskHeartbeatPositionService taskHeartbeatPositionService; + private final AdminAuthSupport adminAuthSupport; @PostMapping("/{taskId}/heartbeat") @Operation( @@ -46,8 +50,17 @@ public class TaskHeartbeatController { public ApiResponse interrupted( @Parameter(description = "任务 ID", required = true, example = "200") @PathVariable Long taskId, - @RequestBody(required = false) TaskHeartbeatRequest request) { + @RequestBody(required = false) TaskHeartbeatRequest request, + HttpServletRequest httpRequest) { String reason = request == null ? null : request.getPhase(); - return ApiResponse.success(taskHeartbeatService.markInterrupted(taskId, reason)); + // 内部令牌(4.0.66 桌面端)与管理角色按原语义放行;普通登录账号只能打断自己名下的任务。 + Long requesterUid = null; + if (!adminAuthSupport.isTrustedInternalToken(httpRequest)) { + AdminUserEntity identity = adminAuthSupport.requireUser(httpRequest); + if (!adminAuthSupport.mayActForOtherUsers(identity)) { + requesterUid = identity.getId(); + } + } + return ApiResponse.success(taskHeartbeatService.markInterrupted(taskId, reason, requesterUid)); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java index e9bfda122..d2c3eccd1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatService.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; @@ -144,6 +145,17 @@ public class TaskHeartbeatService { * file_task RUNNING → FAILED;brand_crawl_tasks running → cancelled;其余状态不动(幂等)。 */ public TaskHeartbeatVo markInterrupted(Long taskId, String reason) { + return markInterrupted(taskId, reason, null); + } + + /** + * 带请求方归属的中断上报。 + * + *

{@code requesterUid} 非空 = 普通登录账号(非管理角色),只能打断自己名下的任务; + * 空 = 内部令牌或管理角色,按原语义放行。AC-8 只把门槛从匿名抬到"任意登录账号", + * 不补这一层就等于任何用户遍历 taskId 都能把别人的在跑任务置 FAILED。

+ */ + public TaskHeartbeatVo markInterrupted(Long taskId, String reason, Long requesterUid) { if (taskId == null || taskId <= 0) { log.warn("[task-interrupted] ignored invalid taskId={}", taskId); return TaskHeartbeatVo.notAlive(null, null, "invalid taskId"); @@ -153,6 +165,7 @@ public class TaskHeartbeatService { : "客户端异常中断: " + reason.trim(); FileTaskEntity fileTask = selectFullFileTask(taskId); if (fileTask != null) { + assertInterruptOwnership("file", taskId, fileTask.getUserId(), requesterUid); String status = fileTask.getStatus(); int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper() .eq(FileTaskEntity::getId, taskId) @@ -178,6 +191,7 @@ public class TaskHeartbeatService { syncTerminalState(fileTask, status, fileTask.getErrorMessage()); return TaskHeartbeatVo.notAlive(fileTask.getModuleType(), status, "task is not running"); } + assertInterruptOwnership("brand", taskId, brandTaskHeartbeatSpi.findOwnerUserId(taskId), requesterUid); TaskHeartbeatVo brandResult = brandTaskHeartbeatSpi.markInterrupted(taskId, safeReason); if (brandResult != null) { return brandResult; @@ -186,6 +200,16 @@ public class TaskHeartbeatService { return TaskHeartbeatVo.notAlive(null, null, "task not found"); } + /** 归属闸:只有普通登录账号(requesterUid 非空)且任务有明确归属时才比对。 */ + private void assertInterruptOwnership(String kind, Long taskId, Long ownerUserId, Long requesterUid) { + if (requesterUid == null || ownerUserId == null || requesterUid.equals(ownerUserId)) { + return; + } + log.warn("[task-interrupted] rejected foreign {} task taskId={} requesterUid={} ownerUid={}", + kind, taskId, requesterUid, ownerUserId); + throw new BusinessException(403, "无权操作该任务"); + } + private TaskHeartbeatVo touchFileTaskIfRunning(Long taskId, TaskHeartbeatRequest request) { FileTaskEntity task = selectFileTask(taskId); if (task == null) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/BrandTaskHeartbeatSpi.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/BrandTaskHeartbeatSpi.java index a7fbccc98..77856efd7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/BrandTaskHeartbeatSpi.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/BrandTaskHeartbeatSpi.java @@ -22,4 +22,13 @@ public interface BrandTaskHeartbeatSpi { * 客户端重启中断:running/pending → cancelled(条件更新),返回心跳结果;任务不存在返回 null。 */ TaskHeartbeatVo markInterrupted(Long taskId, String reason); + + /** + * 任务归属用户 id(中断上报的越权闸用);任务不存在返回 null。 + * + *

默认 null 表示"查不到归属",调用方只在有明确归属时才拒绝跨用户打断。

+ */ + default Long findOwnerUserId(Long taskId) { + return null; + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java index 1c5850f43..9647add30 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java @@ -137,8 +137,10 @@ public class TaskCenterQueryService { LocalDateTime afterCreatedAt = null; Long afterId = null; if (offset > 0) { + // 锚点必须是「上一页最后一行」(offset-1)。取 offset 那一行等于拿本页首行当游标, + // 而页查询按 (createdAt,id) 严格小于游标取下一页 ⇒ 第 2 页首行永远不出现。 TaskCenterTaskRow anchor = queryMapper.selectTaskPageAnchor(userIds, query.getModuleType(), - statuses, query.getShop(), startTime, endTime, offset); + statuses, query.getShop(), startTime, endTime, offset - 1); if (anchor == null || anchor.getCreatedAt() == null || anchor.getId() == null) { // 页码落在窗口之外:与旧实现取到空行同样返回空页,不拿 null 游标去要第一页 return TaskCenterTaskPageVo.empty(page, pageSize); diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/PendingPhase1AnonymousWriteGuardTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/PendingPhase1AnonymousWriteGuardTest.java index cdc2e27d8..435cfc52d 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/PendingPhase1AnonymousWriteGuardTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/PendingPhase1AnonymousWriteGuardTest.java @@ -92,6 +92,44 @@ class PendingPhase1AnonymousWriteGuardTest { assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401); } + @Test + void 匿名分片上传必须被拒() throws Exception { + AdminAuthSupport authSupport = mock(AdminAuthSupport.class); + when(authSupport.isTrustedInternalToken(any())).thenReturn(false); + AdminApiGuardFilter filter = factoryDefaults(authSupport); + + MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/files/chunk/init"); + MockHttpServletResponse response = new MockHttpServletResponse(); + MockFilterChain chain = new MockFilterChain(); + + filter.doFilter(request, response, chain); + + assertThat(chain.getRequest()) + .as("AC-17 分片通道与整包上传同口径:匿名 init 能占临时盘、complete 能写公开桶").isNull(); + assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401); + } + + @Test + void 分片前缀只吃自己的段落且内部令牌放行() throws Exception { + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/init")).isTrue(); + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/u1/part/0")).isTrue(); + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunk/u1/complete")).isTrue(); + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/chunked-legacy")) + .as("相邻前缀不许误伤").isFalse(); + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/files/%75pload")) + .as("百分号编码不能绕过凭据要求(容器会解码后路由到 /api/files/upload)").isTrue(); + assertThat(AdminApiGuardFilter.isCredentialRequiredWriteEndpoint("/api/tasks/7001/%69nterrupted")) + .as("中断端点的编码变体同样必须要求凭据").isTrue(); + + AdminAuthSupport internal = mock(AdminAuthSupport.class); + when(internal.isTrustedInternalToken(any())).thenReturn(true); + MockFilterChain chain = new MockFilterChain(); + factoryDefaults(internal).doFilter( + new MockHttpServletRequest("POST", "/api/files/chunk/init"), + new MockHttpServletResponse(), chain); + assertThat(chain.getRequest()).as("内部令牌(4.0.66 桌面端/服务端转存)必须照常放行").isNotNull(); + } + @Test void 坏令牌同样必须被拒() throws Exception { AdminAuthSupport authSupport = mock(AdminAuthSupport.class); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInterruptOwnershipTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInterruptOwnershipTest.java new file mode 100644 index 000000000..782701610 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInterruptOwnershipTest.java @@ -0,0 +1,104 @@ +package com.nanri.aiimage.modules.task.service; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.spi.BrandTaskHeartbeatSpi; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowableOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 中断上报的归属闸(Phase 6 CR 补)。 + * + *

AC-8 把 {@code /api/tasks/{id}/interrupted} 从匿名抬到"必须带凭据",但任何登录账号 + * 仍可遍历 taskId 把别人的 RUNNING 任务置 FAILED。这里钉住三条: + * 普通账号只能打断自己名下的任务、管理角色/内部令牌(requesterUid=null)按原语义放行、 + * 品牌任务的归属同样比对。

+ */ +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class TaskInterruptOwnershipTest { + + private static final Long TASK_ID = 8801L; + + @BeforeAll + static void initializeMybatisMetadata() { + MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), ""); + TableInfoHelper.initTableInfo(assistant, FileTaskEntity.class); + } + + @Mock private FileTaskMapper fileTaskMapper; + @Mock private TaskProgressSnapshotService snapshotService; + @Mock private BrandTaskHeartbeatSpi brandSpi; + @Mock private TaskHeartbeatLivenessService livenessService; + + private TaskHeartbeatService service() { + return new TaskHeartbeatService(fileTaskMapper, snapshotService, brandSpi, livenessService, List.of()); + } + + private static FileTaskEntity runningTaskOwnedBy(Long userId) { + FileTaskEntity task = new FileTaskEntity(); + task.setId(TASK_ID); + task.setModuleType("PUBLISH"); + task.setStatus("RUNNING"); + task.setUserId(userId); + return task; + } + + @Test + @DisplayName("普通账号打断别人的任务必须 403,且不许写库") + void foreignRequesterCannotInterruptFileTask() { + when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(runningTaskOwnedBy(7L)); + + BusinessException ex = catchThrowableOfType( + () -> service().markInterrupted(TASK_ID, "客户端崩溃重启", 8L), BusinessException.class); + + assertThat(ex.getCode()).isEqualTo(403); + verify(fileTaskMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class)); + } + + @Test + @DisplayName("任务归属人本人(或管理角色/内部令牌的 requesterUid=null)照常打断") + void ownerAndPrivilegedCallersStillInterrupt() { + when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(runningTaskOwnedBy(7L)); + when(fileTaskMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1); + + assertThat(service().markInterrupted(TASK_ID, "本人重启", 7L).isAlive()).isFalse(); + assertThat(service().markInterrupted(TASK_ID, "内部令牌", null).isAlive()).isFalse(); + } + + @Test + @DisplayName("品牌任务按 owner 比对:外人 403 且不许调用 SPI 改写终态") + void foreignRequesterCannotInterruptBrandTask() { + when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(null); + when(brandSpi.findOwnerUserId(TASK_ID)).thenReturn(9L); + + BusinessException ex = catchThrowableOfType( + () -> service().markInterrupted(TASK_ID, "客户端崩溃重启", 8L), BusinessException.class); + + assertThat(ex.getCode()).isEqualTo(403); + verify(brandSpi, never()).markInterrupted(any(), any()); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java index 3a5e110de..2fefacd23 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java @@ -356,9 +356,11 @@ class TaskCenterQueryServiceTest { verify(queryMapper).countTaskPage(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")), eq("旗舰店"), eq(start), eq(end)); - // (page-1)*pageSize 这条算术还在,只是它的去向从 OFFSET 变成了锚点行号 + // (page-1)*pageSize 这条算术还在,只是它的去向从 OFFSET 变成了锚点行号; + // 锚点落在 offset-1(上一页最后一行)——取 offset 那行会让本页首行在同一对 + // (createdAt,id) 严格比较下被跳过,第 2 页从此少一行。 verify(queryMapper).selectTaskPageAnchor(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")), - eq("旗舰店"), eq(start), eq(end), eq(200L)); + eq("旗舰店"), eq(start), eq(end), eq(199L)); verify(queryMapper).selectTaskPage(isNull(), eq("PUBLISH"), eq(List.of("RUNNING")), eq("旗舰店"), eq(start), eq(end), eq(100L), eq(anchorTime), eq(anchorId)); }