test(phase-0): v1.1 验收契约预置(AC-7~12/16~19)与两处棘轮台账登记
后端 9 支 @Disabled 契约只引用现存签名(mvn -o test-compile rc=0),逐条
钉住审计 ✅ 缺口:清空全表删、每日档按 id 越权、出厂默认下匿名可写的
interrupted/upload、12 格共享执行器与拒绝即内联、心跳抢锁变 40902、
批查整实体与无优雅停机、PENDING 被 Math.min(4) 钉死永不终态、
视频详情 SQL 双转义、无 statement timeout、删除多写无事务、
深 OFFSET/ORDER BY RAND/心跳整行/菜单每请求重算、补检 WARN 风暴与无 MDC。
两前端 3 支用 { skip } 预置 AC-16/17/18(网络错误登出、全局兜底与脱敏
上报、单次 PUT 无分片、element-plus 回首屏、列表无竞态门)。
台账两处按官方口径重钉,非放宽:source-pin-ledger 用仓内
UPDATE_SOURCE_PIN_BASELINE=1 生成(含他人 3 支零钉子件记账);
SourceScanTest 点名台账 10→22 名/8→16 支,逐个出处写在注释里。
This commit is contained in:
+138
@@ -0,0 +1,138 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.mock.web.MockFilterChain;
|
||||
import org.springframework.mock.web.MockHttpServletRequest;
|
||||
import org.springframework.mock.web.MockHttpServletResponse;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-8(R4/审计 S0-7 ✅):匿名可达的写接口必须收紧——{@code /api/tasks/{id}/interrupted}
|
||||
* 与 {@code /api/files/upload} 在无凭据时必须 401,内部令牌或合法 JWT 才放行。
|
||||
*
|
||||
* <p>现状(三条都是可读的事实):
|
||||
* <ul>
|
||||
* <li>{@code AdminApiGuardFilter.java:80-107} 把 {@code /api/files}(:87)与
|
||||
* {@code /api/tasks}(:100,注释 :98-99 正好点名 interrupted)放进
|
||||
* {@code USER_TOOL_PREFIXES},而这组前缀要吃 {@code userToolGuardEnabled}(:141);</li>
|
||||
* <li>{@code application.yml:603} 出厂默认 {@code user-tool-guard-enabled:false}
|
||||
* ({@code AdminGuardSwitchConfigTest} 已把这枚默认钉死)⇒ 整组前缀默认不吃凭据;</li>
|
||||
* <li>{@code TaskHeartbeatController.java:41-52} 与 {@code FileUploadController.java:34-59}
|
||||
* 自身没有任何方法级校验——匿名遍历 taskId 就能把 RUNNING 任务置 FAILED,匿名上传能塞满临时盘。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>因此本用例把两条端点当作 {@code SELF_SERVICE_PREFIXES}(:113-128,关开关也拦)那一类
|
||||
* 来验收:{@code userToolGuardEnabled=false} 这个总闸**不许**成为它们的豁免理由。
|
||||
* 401 的形状沿用既有口径:HTTP 200 + body.code=401(见 {@code AdminApiGuardFilterTest:286-301}
|
||||
* 与 {@code writeFailure:293-298}),不许拿 status 冒充。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-8 匿名写接口收紧(interrupted / files/upload)")
|
||||
@DisplayName("AC-8 匿名写接口必须要求内部令牌或合法 JWT")
|
||||
class PendingPhase1AnonymousWriteGuardTest {
|
||||
|
||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
/** 出厂默认形状:总开关开着、user-tool 那组关着、前缀名单为空。 */
|
||||
private AdminApiGuardFilter factoryDefaults(AdminAuthSupport authSupport) {
|
||||
AdminApiGuardFilter filter = new AdminApiGuardFilter(authSupport, objectMapper);
|
||||
ReflectionTestUtils.setField(filter, "enabled", true);
|
||||
ReflectionTestUtils.setField(filter, "exemptPrefixes", "");
|
||||
ReflectionTestUtils.setField(filter, "userToolGuardEnabled", false);
|
||||
ReflectionTestUtils.setField(filter, "userToolGuardPrefixes", "");
|
||||
return filter;
|
||||
}
|
||||
|
||||
private JsonNode bodyOf(MockHttpServletResponse response) throws Exception {
|
||||
return objectMapper.readTree(response.getContentAsString());
|
||||
}
|
||||
|
||||
@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/tasks/7001/interrupted");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
MockFilterChain chain = new MockFilterChain();
|
||||
|
||||
filter.doFilter(request, response, chain);
|
||||
|
||||
assertThat(chain.getRequest()).as("S0-7:匿名请求不许打到控制器").isNull();
|
||||
assertThat(bodyOf(response).path("code").asInt())
|
||||
.as("401 口径写在 body.code(HTTP 200 + 业务码),与全局异常处理一致")
|
||||
.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/upload");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
MockFilterChain chain = new MockFilterChain();
|
||||
|
||||
filter.doFilter(request, response, chain);
|
||||
|
||||
assertThat(chain.getRequest()).as("S0-7:2GB 全局上限不等于有鉴权,匿名上传必须拦").isNull();
|
||||
assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 坏令牌同样必须被拒() throws Exception {
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
when(authSupport.isTrustedInternalToken(any())).thenReturn(false);
|
||||
when(authSupport.requireUserOrInternal(any())).thenThrow(new BusinessException(401, "未登录"));
|
||||
AdminApiGuardFilter filter = factoryDefaults(authSupport);
|
||||
|
||||
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/tasks/7001/interrupted");
|
||||
request.addHeader("Authorization", "Bearer not-a-jwt");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
MockFilterChain chain = new MockFilterChain();
|
||||
|
||||
filter.doFilter(request, response, chain);
|
||||
|
||||
assertThat(chain.getRequest()).isNull();
|
||||
assertThat(bodyOf(response).path("code").asInt()).isEqualTo(401);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 内部令牌与合法会话必须放行() throws Exception {
|
||||
AdminAuthSupport internal = mock(AdminAuthSupport.class);
|
||||
when(internal.isTrustedInternalToken(any())).thenReturn(true);
|
||||
MockFilterChain internalChain = new MockFilterChain();
|
||||
factoryDefaults(internal).doFilter(
|
||||
new MockHttpServletRequest("POST", "/api/tasks/7001/interrupted"),
|
||||
new MockHttpServletResponse(), internalChain);
|
||||
assertThat(internalChain.getRequest())
|
||||
.as("蓝图 §3.1:4.0.66 客户端带内部令牌,兼容窗口内必须能用")
|
||||
.isNotNull();
|
||||
|
||||
AdminAuthSupport jwt = mock(AdminAuthSupport.class);
|
||||
when(jwt.isTrustedInternalToken(any())).thenReturn(false);
|
||||
when(jwt.requireUserOrInternal(any())).thenReturn(new AdminUserEntity());
|
||||
MockFilterChain jwtChain = new MockFilterChain();
|
||||
factoryDefaults(jwt).doFilter(
|
||||
new MockHttpServletRequest("POST", "/api/files/upload"),
|
||||
new MockHttpServletResponse(), jwtChain);
|
||||
assertThat(jwtChain.getRequest()).as("合法 JWT 必须照常上传").isNotNull();
|
||||
verify(jwt).requireUserOrInternal(any());
|
||||
verify(internal, never()).requireUserOrInternal(any());
|
||||
}
|
||||
}
|
||||
+75
@@ -0,0 +1,75 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* AC-21(R8/审计 §5、PERF_REPORT §6):补检 WARN 必须按 job/轮次收敛,全站日志必须能按请求关联。
|
||||
*
|
||||
* <p>两条实测证据:
|
||||
* <ul>
|
||||
* <li><b>补检 WARN 风暴</b>:{@code AppearancePatentDeliverySupport.java:123-124} 对同一
|
||||
* task/job 每轮补检打一条 {@code 交付缺口触发补检轮} WARN;
|
||||
* {@code docs/audit/PERF_REPORT.md:189} 实录 task 32609/job 23345 三分钟 478 条
|
||||
* (≈9,560 条/小时),任务长期停在"有 12 行未完成检测,补检一轮后重新组装"的循环里。
|
||||
* 同文件 {@code :167-201} 的 {@code scheduleFallbackRecheck} 已经有轮次闸
|
||||
* ({@code taskCacheService.recheckRounds/countRecheckRound}),
|
||||
* AC 要的正是把同一对计数键接到 {@code requestRecheckForMissingRows} 上:
|
||||
* 要么按 job/轮次限流,要么一条汇总。</li>
|
||||
* <li><b>无 MDC</b>:{@code RequestTraceFilter.java:47-51} 已经解析出
|
||||
* {@code X-Request-Id / X-Amzn-Trace-Id / Traceparent},但只塞进日志参数
|
||||
* (:63-79),从不 {@code MDC.put}——全仓 {@code grep MDC} 零命中;
|
||||
* {@code logback-spring.xml:7-8} 的两条 pattern 里也没有 {@code %X{...}},
|
||||
* 于是 571 处 log 无法按请求关联(审计 §5.2 判断:"补 MDC 比加日志量更有效")。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>客户端/worker 的单文件大小上限与保留口径统一,另有两支预置:
|
||||
* {@code app_client/tests/test_pending_phase1_日志脱敏与轮转.py}(AC-1,含大小轮转)与
|
||||
* {@code scripts/tests/test_pending_phase5_worker日志轮转与保留.py}(AC-21 的 worker 侧)。
|
||||
*/
|
||||
@Disabled("Pending Phase 5: AC-21 补检 WARN 限流/汇总与 MDC 关联")
|
||||
@DisplayName("AC-21 日志量级与请求关联契约")
|
||||
class PendingPhase5LogVolumeAndMdcTest {
|
||||
|
||||
@Test
|
||||
void 补检轮_WARN_必须按_job_或轮次收敛() {
|
||||
String support = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("AppearancePatentDeliverySupport.java"));
|
||||
String body = SourceScan.methodBody(support, "requestRecheckForMissingRows");
|
||||
|
||||
assertThat(body)
|
||||
.as("§5/PERF §6:每轮一条 WARN 就是 9,560 条/小时;必须复用 :182/:197 那对轮次计数键")
|
||||
.containsAnyOf("recheckRounds", "countRecheckRound", "throttle", "summary");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 请求入口必须把_requestId_写进_MDC() {
|
||||
String filter = SourceScan.withoutComments(SourceScan.sourceText("RequestTraceFilter.java"));
|
||||
|
||||
assertThat(filter)
|
||||
.as("§5.2:requestId 已解析却不入 MDC,571 处日志无法按请求关联")
|
||||
.contains("MDC.put");
|
||||
assertThat(filter)
|
||||
.as("退出请求必须清 MDC(线程复用会把上一请求的 id 带给下一条日志)")
|
||||
.contains("MDC.clear");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 日志_pattern_必须带出_MDC_位() throws Exception {
|
||||
Path moduleRoot = com.nanri.aiimage.testutil.SourceScan.mainSourcesRoot()
|
||||
.resolve("../../src/main/resources/logback-spring.xml")
|
||||
.normalize();
|
||||
String xml = Files.readString(moduleRoot);
|
||||
|
||||
assertThat(xml)
|
||||
.as("pattern 里没有 %X{...} 时,MDC 写了也看不见(FILE/CONSOLE 两条都要带)")
|
||||
.contains("%X{requestId}");
|
||||
}
|
||||
}
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
package com.nanri.aiimage.modules.imagehistory.controller;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* AC-7(R4/审计 S0-6 ✅):清空生成历史必须按 DataReadScope 限定公司范围。
|
||||
*
|
||||
* <p>现状(证据即本文件的判据对象):
|
||||
* <ul>
|
||||
* <li>{@code ImageHistoryController.java:57-66} 的 {@code clearHistory} 只校验
|
||||
* {@code permissionMenuService.hasAnyAdminMenu(operator, ["admin_history"])},
|
||||
* 然后把 {@code operator.getUsername()} 原样交给 service;</li>
|
||||
* <li>{@code ImageHistoryService.java:96-102} 随即
|
||||
* {@code imageHistoryMapper.delete(new LambdaQueryWrapper<>())}——**无 WHERE 全表删**。
|
||||
* 同模块的列表接口({@code :47-56})却是规规矩矩走
|
||||
* {@code dataReadScope.readScope(operator, companyId).userIdsOr(base)} 的,
|
||||
* 两条通道对同一个资源的边界口径劈叉,这才是"任一管理员能清空所有公司历史"的根。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>判据打在源码连线上(照 {@code CompanyIdParamGoesThroughReadScopeTest} 的既有范式):
|
||||
* Phase 1 必须让清空通道复用与列表同一把 scope,并把审计留痕(谁在什么时候清了哪个范围)。
|
||||
* 之所以不在这里直接断 service 行为:现在的 {@code clearAllHistory(String)} 签名里根本没有
|
||||
* 范围入参,而它一旦改成带范围,本用例的调用形状也得跟着换——那属于 Phase 1 的接口契约变更,
|
||||
* 应该在实现时以真实签名落地(蓝图 §4 Phase 1 已登记本文件的激活与改造同步点)。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-7 生成历史清空按数据范围收口")
|
||||
@DisplayName("AC-7 清空生成历史必须过 DataReadScope")
|
||||
class PendingPhase1HistoryClearScopeTest {
|
||||
|
||||
@Test
|
||||
void 清空通道必须取用与列表同一把读范围() {
|
||||
String controller = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("ImageHistoryController.java"));
|
||||
String clearBody = SourceScan.methodBody(controller, "clearHistory");
|
||||
|
||||
assertThat(clearBody)
|
||||
.as("S0-6:清空必须像列表一样先算 readScope(operator, companyId),不能再只认菜单")
|
||||
.contains("readScope");
|
||||
assertThat(clearBody)
|
||||
.as("范围必须真的传进 service(只算不用等于没改)")
|
||||
.contains("clearAllHistory");
|
||||
}
|
||||
|
||||
@Test
|
||||
void service_的删除条件必须带上范围而不是空包装器() {
|
||||
String service = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("ImageHistoryService.java"));
|
||||
String body = SourceScan.methodBody(service, "clearAllHistory");
|
||||
|
||||
assertThat(body)
|
||||
.as("S0-6:delete(new LambdaQueryWrapper<>()) 是无 WHERE 全表删,必须换成带范围的 wrapper")
|
||||
.doesNotContain("delete(new LambdaQueryWrapper<>())");
|
||||
assertThat(body)
|
||||
.as("删除条件必须落在被范围化的 user_id 集合上")
|
||||
.contains("getUserId");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 清空必须留下审计留痕() {
|
||||
String service = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("ImageHistoryService.java"));
|
||||
String body = SourceScan.methodBody(service, "clearAllHistory");
|
||||
|
||||
assertThat(body)
|
||||
.as("蓝图 §3.1:全清需要二次确认/审计——至少要有可查证的留痕,不能删完无声")
|
||||
.containsAnyOf("log.info", "log.warn", "AuditLog", "audit");
|
||||
}
|
||||
}
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
package com.nanri.aiimage.modules.shopdatacrawl.controller;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* AC-7(R4/审计 S0-6 ✅):每日档下载/删除必须按 dailyFileId 反查归属后校验。
|
||||
*
|
||||
* <p>现状:{@code AdminShopDataCrawlTasksController.java:110-137} 两支端点都调
|
||||
* {@code requireShopDataCrawlTaskAccess(request)} 却**把返回值丢掉**(对照同文件 :94 的列表端点
|
||||
* 是 {@code AdminUserEntity operator = requireShopDataCrawlTaskAccess(request);}),
|
||||
* 随后按 {@code dailyFileId} 直接 {@code resolveDailyDownload}/{@code deleteAdminDailyFile}。
|
||||
* 那是菜单级判定:有这张菜单的任何管理员,可以按 id 下载/真删别人公司的每日档。
|
||||
* 而列表接口本来就算过 {@code visibleShopKeys}({@code ShopDataCrawlAdminTasksService.java:231}),
|
||||
* 边界口径在同模块内部劈叉——与生成历史清空是同一个病形。
|
||||
*/
|
||||
@Disabled("Pending Phase 1: AC-7 每日档下载/删除按店铺归属校验")
|
||||
@DisplayName("AC-7 每日档下载/删除必须校验归属")
|
||||
class PendingPhase1DailyFileOwnershipTest {
|
||||
|
||||
private static final String CONTROLLER = "AdminShopDataCrawlTasksController.java";
|
||||
|
||||
@Test
|
||||
void 下载端点必须拿到操作人并做归属校验() {
|
||||
String source = SourceScan.withoutComments(SourceScan.sourceText(CONTROLLER));
|
||||
String body = SourceScan.methodBody(source, "downloadDailyFile");
|
||||
|
||||
assertThat(body)
|
||||
.as("S0-6:requireShopDataCrawlTaskAccess 的返回值不许再被丢掉")
|
||||
.contains("AdminUserEntity operator");
|
||||
assertThat(body)
|
||||
.as("归属校验必须发生在取 URL 之前(先查了再说就晚了)")
|
||||
.containsAnyOf("requireOwnership", "requireDailyFileAccess", "resolveOwnership");
|
||||
assertThat(body.indexOf("requireShopDataCrawlTaskAccess"))
|
||||
.as("校验必须在 resolveDailyDownload 之前")
|
||||
.isLessThan(body.indexOf("resolveDailyDownload"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 删除端点必须与下载走同一把归属尺子() {
|
||||
String source = SourceScan.withoutComments(SourceScan.sourceText(CONTROLLER));
|
||||
String body = SourceScan.methodBody(source, "deleteDailyFile");
|
||||
|
||||
assertThat(body)
|
||||
.as("S0-6:真删比下载更危险,同样必须先过归属")
|
||||
.contains("AdminUserEntity operator");
|
||||
assertThat(body)
|
||||
.as("deleteAdminDailyFile 不许再只吃一个 id")
|
||||
.containsAnyOf("requireOwnership", "requireDailyFileAccess", "resolveOwnership");
|
||||
}
|
||||
|
||||
@Test
|
||||
void service_侧的两个按_id_入口必须收到范围参数() {
|
||||
String source = SourceScan.withoutComments(SourceScan.sourceText("ShopDataCrawlAdminTasksService.java"));
|
||||
|
||||
assertThat(SourceScan.methodBody(source, "resolveDailyDownload"))
|
||||
.as("service 层的取档/删档必须把归属判定写进同一条路径,不能靠调用方自觉")
|
||||
.containsAnyOf("operator", "scope", "visibleShopKeys");
|
||||
assertThat(SourceScan.methodBody(source, "deleteAdminDailyFile"))
|
||||
.as("删档同理")
|
||||
.containsAnyOf("operator", "scope", "visibleShopKeys");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 跨公司请求必须被拒而不是返回空壳() {
|
||||
// 行为判据(Phase 1 落地后启用):A 公司管理员拿 B 公司的 dailyFileId 必须 403/业务异常,
|
||||
// 而不是"返回一个空下载地址"——空壳会让用户以为档案丢了。
|
||||
String source = SourceScan.withoutComments(SourceScan.sourceText(CONTROLLER));
|
||||
|
||||
assertThat(source)
|
||||
.as("拒绝必须走 BusinessException(403) 这条既有出口")
|
||||
.contains("BusinessException");
|
||||
}
|
||||
}
|
||||
+117
@@ -0,0 +1,117 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.core.env.PropertySource;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.boot.env.YamlPropertySourceLoader;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* AC-11(R5/审计 S1-B5、S1-B6):夜间清理必须流式/只读指针,停机必须优雅。
|
||||
*
|
||||
* <p>两条证据:
|
||||
* <ul>
|
||||
* <li><b>S1-B5</b> {@code ModuleHistoryCleanupService.java:139-143} 每批
|
||||
* {@code fileTaskMapper.selectList(...)} **不带 .select(...)**,捞的是整个
|
||||
* {@code FileTaskEntity}(含 {@code requestJson}/{@code resultJson}/{@code errorMessage}
|
||||
* 大列);{@code :364-379} 收指针的三条 {@code selectList}(chunk/scopeState/resultItem)
|
||||
* 同样整实体。500 个大采集任务的一批足以把堆打满。</li>
|
||||
* <li><b>S1-B6</b> {@code application.yml:1-2} 的 {@code server:} 块只有 {@code port},
|
||||
* 全仓 grep 无 {@code server.shutdown}、无 {@code spring.lifecycle.timeout-per-shutdown-phase};
|
||||
* {@code TaskFileJobConfig.java:78-83} 的虚拟线程池 {@code destroyMethod="shutdown"} 不 await;
|
||||
* {@code TaskResultFileJobWorker.java:430-433} 的 {@code @PreDestroy} 只关心跳池。
|
||||
* ⇒ 发版那一刻在途的上传/组装被硬切,作业只能等开机回收或 stuck 扫描。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>蓝图 §3.2 登记的收口形状:{@code server.shutdown=graceful} +
|
||||
* {@code spring.lifecycle.timeout-per-shutdown-phase=30s} + 统一 {@code @PreDestroy}。
|
||||
*/
|
||||
@Disabled("Pending Phase 3: AC-11 清理流式化与优雅停机")
|
||||
@DisplayName("AC-11 清理只读指针 + 优雅停机")
|
||||
class PendingPhase3CleanupStreamingTest {
|
||||
|
||||
@Test
|
||||
void 批次扫描必须只取指针列而不是整实体() {
|
||||
String service = SourceScan.withoutComments(SourceScan.sourceText("ModuleHistoryCleanupService.java"));
|
||||
String body = SourceScan.methodBody(service, "cleanupConfiguredModules");
|
||||
|
||||
assertThat(body)
|
||||
.as("S1-B5:批查必须 .select(...) 只取 id/module_type/status/updated_at 这类指针列")
|
||||
.contains(".select(");
|
||||
String normalized = body.replaceAll("\\s+", " ");
|
||||
assertThat(java.util.regex.Pattern
|
||||
.compile("selectList\\(new LambdaQueryWrapper<FileTaskEntity>\\(\\) ?\\.select\\(")
|
||||
.matcher(normalized).find())
|
||||
.as("S1-B5:批查必须写成带 .select(...) 的瘦投影;整实体(含 request_json/result_json)"
|
||||
+ "一批 500 行足以打满堆")
|
||||
.isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 指针收集三路也必须只取指针列() {
|
||||
String service = SourceScan.withoutComments(SourceScan.sourceText("ModuleHistoryCleanupService.java"));
|
||||
String body = SourceScan.methodBody(service, "collectPayloadPointers");
|
||||
|
||||
long selects = java.util.Arrays.stream(body.split("selectList"))
|
||||
.filter(part -> part.contains(".select("))
|
||||
.count();
|
||||
assertThat(body.split("selectList").length - 1)
|
||||
.as("chunk/scopeState/resultItem 三条查询都要瘦投影")
|
||||
.isEqualTo(3);
|
||||
assertThat(selects)
|
||||
.as("S1-B5:三条 selectList 全部带 .select(...) 投影才算流式")
|
||||
.isEqualTo(3L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 停机必须走优雅关闭并留生命周期等待() throws Exception {
|
||||
Map<String, String> flat = flatten("application.yml");
|
||||
|
||||
assertThat(flat)
|
||||
.as("S1-B6:缺 server.shutdown=发版硬切在途作业")
|
||||
.containsKey("server.shutdown");
|
||||
assertThat(flat.get("server.shutdown"))
|
||||
.as("优雅停机必须是 graceful")
|
||||
.isEqualTo("graceful");
|
||||
assertThat(flat)
|
||||
.as("蓝图 §3.2:spring.lifecycle.timeout-per-shutdown-phase 必须设(建议 30s)")
|
||||
.containsKey("spring.lifecycle.timeout-per-shutdown-phase");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 虚拟线程池销毁必须等待在途作业() {
|
||||
String config = SourceScan.withoutComments(SourceScan.sourceText("TaskFileJobConfig.java"));
|
||||
String body = SourceScan.methodBody(config, "taskQueueVirtualThreadExecutor");
|
||||
|
||||
assertThat(body)
|
||||
.as("S1-B6:destroy 只 shutdown 不 await=在途任务被进程退出直接掐掉")
|
||||
.containsAnyOf("awaitTermination", "shutdownThreadPoolExecutors", "setWaitForTasksToCompleteOnShutdown");
|
||||
}
|
||||
|
||||
/** 读 classpath 上的出厂 yml(范式照抄 {@code ClientVersionFloorConfigTest#flatten})。 */
|
||||
private static Map<String, String> flatten(String fileName) throws Exception {
|
||||
ClassPathResource resource = new ClassPathResource(fileName);
|
||||
assertThat(resource.exists()).as("classpath 上找不到 " + fileName).isTrue();
|
||||
Map<String, String> flat = new LinkedHashMap<>();
|
||||
try (InputStream in = resource.getInputStream()) {
|
||||
for (PropertySource<?> source : new YamlPropertySourceLoader().load(fileName, resource)) {
|
||||
if (source instanceof org.springframework.core.env.EnumerablePropertySource<?> enumerable) {
|
||||
for (String name : enumerable.getPropertyNames()) {
|
||||
Object value = enumerable.getProperty(name);
|
||||
flat.put(name, value == null ? "" : String.valueOf(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
assertThat(flat).as(fileName + " 解析出来的键数(0 就是解析坏了)").isNotEmpty();
|
||||
return flat;
|
||||
}
|
||||
}
|
||||
+112
@@ -0,0 +1,112 @@
|
||||
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.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessCodes;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataTaskHeartbeatSpi;
|
||||
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;
|
||||
import com.nanri.aiimage.modules.task.model.vo.TaskHeartbeatVo;
|
||||
import com.nanri.aiimage.modules.task.spi.BrandTaskHeartbeatSpi;
|
||||
import com.nanri.aiimage.modules.task.spi.TaskModuleHeartbeatSpi;
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-10(R5/审计 S1-B4):心跳必须始终表达"任务还活着",进度更新失败只能降级、不能变 TASK_BUSY。
|
||||
*
|
||||
* <p>三段拼出来的病灶:
|
||||
* <ul>
|
||||
* <li>{@code CollectDataService.java:515-527} 的 {@code updateProgress} 每次都
|
||||
* {@code acquireTaskLockOrThrow(taskId)}(:1354-1358,最长等 {@code TASK_LOCK_WAIT_MILLIS=5000},
|
||||
* 拿不到就 {@code throw new BusinessException(BusinessCodes.TASK_BUSY)}=40902);</li>
|
||||
* <li>{@code CollectDataTaskHeartbeatSpi.java:26} 单行直调 {@code collectDataService.updateProgress(...)},
|
||||
* 没有 try/catch;</li>
|
||||
* <li>{@code TaskHeartbeatService.java:209} 的 {@code handler.touchHeartbeat(...)} 同样不接异常。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>后果:结果文件组装/分片提交正持锁写库的那段时间里,客户端心跳收到 40902,
|
||||
* 按"任务不在了"处置——而 {@code TaskHeartbeatVo.alive} 表达的恰恰应该是活性。
|
||||
* 蓝图 §3.1 定的收口形状是:进度失败仍返回 200、{@code alive=true},新增
|
||||
* {@code progressDegraded=true} 与 {@code warning},只有任务终态才 {@code alive=false}。
|
||||
*/
|
||||
@Disabled("Pending Phase 3: AC-10 心跳去锁与 SPI 异常降级")
|
||||
@DisplayName("AC-10 心跳在持锁窗口内必须仍返回 alive")
|
||||
class PendingPhase3HeartbeatDegradationTest {
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), FileTaskEntity.class);
|
||||
}
|
||||
|
||||
private final FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
|
||||
private final TaskProgressSnapshotService taskProgressSnapshotService = mock(TaskProgressSnapshotService.class);
|
||||
private final BrandTaskHeartbeatSpi brandTaskHeartbeatSpi = mock(BrandTaskHeartbeatSpi.class);
|
||||
private final TaskHeartbeatLivenessService livenessService = mock(TaskHeartbeatLivenessService.class);
|
||||
|
||||
private TaskHeartbeatService serviceWith(TaskModuleHeartbeatSpi... handlers) {
|
||||
return new TaskHeartbeatService(fileTaskMapper, taskProgressSnapshotService, brandTaskHeartbeatSpi,
|
||||
livenessService, List.of(handlers));
|
||||
}
|
||||
|
||||
/**
|
||||
* 组装持锁期间的真实形状:{@code updateProgress} 抛 40902。
|
||||
* 期望(蓝图 §3.1):心跳不炸、alive=true,并把降级如实标出来。
|
||||
*/
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 进度更新被锁挡住时心跳仍须返回存活() {
|
||||
long taskId = 21500L;
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(taskId);
|
||||
task.setModuleType("COLLECT_DATA");
|
||||
task.setStatus("RUNNING");
|
||||
|
||||
CollectDataService collectDataService = mock(CollectDataService.class);
|
||||
org.mockito.Mockito.doThrow(new BusinessException(BusinessCodes.TASK_BUSY, "任务正在处理,请稍后再试"))
|
||||
.when(collectDataService).updateProgress(any(), any());
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(task);
|
||||
|
||||
TaskHeartbeatService service = serviceWith(new CollectDataTaskHeartbeatSpi(collectDataService));
|
||||
TaskHeartbeatRequest request = new TaskHeartbeatRequest();
|
||||
request.setCurrent(6);
|
||||
request.setTotal(19);
|
||||
|
||||
TaskHeartbeatVo vo = assertDoesNotThrow(() -> service.heartbeat(taskId, request),
|
||||
"S1-B4:SPI 抛出的 TASK_BUSY 必须被心跳入口降级,不许冒给客户端");
|
||||
|
||||
assertTrue(vo.isAlive(), "持锁窗口内的任务仍然在跑,alive 必须是 true");
|
||||
}
|
||||
|
||||
/**
|
||||
* 第二半:进度更新这条路本身不该再去抢任务锁(锁是给组装/提交的写路径用的)。
|
||||
* 判据打在源码上——Phase 3 把 {@code updateProgress} 改成无锁短事务后转绿。
|
||||
*/
|
||||
@Test
|
||||
void 进度更新不得再抢任务写锁() {
|
||||
String service = SourceScan.withoutComments(SourceScan.sourceText("CollectDataService.java"));
|
||||
String body = SourceScan.methodBody(service, "updateProgress");
|
||||
|
||||
assertThat(body)
|
||||
.as("S1-B4:心跳路径取任务锁=组装持锁时心跳变 40902,必须改成无锁短事务")
|
||||
.doesNotContain("acquireTaskLockOrThrow");
|
||||
}
|
||||
}
|
||||
+164
@@ -0,0 +1,164 @@
|
||||
package com.nanri.aiimage.modules.task.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.modules.task.mapper.TaskFileJobMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.testutil.MapperXmlSupport;
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.core.env.EnumerablePropertySource;
|
||||
import org.springframework.core.env.PropertySource;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.boot.env.YamlPropertySourceLoader;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-12(R5/审计 S1-B7、S1-B1、S1-B8、S1-B9):PENDING 封顶转 FAILED、视频详情 SQL、
|
||||
* statement timeout、店铺数据删除事务。
|
||||
*
|
||||
* <p>四条现形证据:
|
||||
* <ul>
|
||||
* <li><b>S1-B7</b> {@code TaskFileJobService.java:417}
|
||||
* {@code int nextRetryCount = Math.min(MAX_RETRY_COUNT - 1, retryCount + 1);}——
|
||||
* {@code PENDING} 僵尸永远被钉在 4,而 stuck 扫描判失败的条件是
|
||||
* {@code retry_count >= MAX_RETRY_COUNT}(对照组 :771 用的是
|
||||
* {@code Math.min(MAX_RETRY_COUNT, ...)})⇒ 僵尸每 5 分钟重派一次,永不到终态、
|
||||
* 永不调终态回调。</li>
|
||||
* <li><b>S1-B1</b> {@code mapper/imagevideo/ImageVideoAdminTaskMapper.xml:40} 写成
|
||||
* {@code &amp;gt;=}(双重转义),XML 解码后仍是字面量 {@code >=}
|
||||
* ⇒ 详情接口稳定报"未知列",排障入口失效。搬迁基准
|
||||
* {@code src/test/resources/sql-layering/migrated-statements.tsv:11} 记的是单转义。</li>
|
||||
* <li><b>S1-B8</b> {@code application.yml:81-85} 的 {@code mybatis-plus.configuration}
|
||||
* 只有两键,无 {@code default-statement-timeout};而 {@code :36} 的
|
||||
* {@code socketTimeout=300000}(5 分钟)配 {@code :22} 的 30 格池
|
||||
* ⇒ 一条慢 SQL 能占住连接 5 分钟,Tomcat 请求在 30s 取连接处失败。</li>
|
||||
* <li><b>S1-B9</b> {@code ShopDataCrawlAdminTasksService.java:77} 的
|
||||
* {@code deleteAdminDailyFile} 连做四次写(明细删 → 结果文件解绑 → 删档 → 回收对象)
|
||||
* 全程只有 Redis 分布式锁、没有 DB 事务;{@code ShopDataCrawlDailyFileService.java:224}
|
||||
* 的 {@code deleteDailyFile}(删成员 + 删档)同样两次写无事务 ⇒ 中途失败留半删状态。</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Disabled("Pending Phase 3: AC-12 PENDING 封顶/视频详情 SQL/statement timeout/删除事务")
|
||||
@DisplayName("AC-12 终态封顶与 DB 超时契约")
|
||||
class PendingPhase3JobTerminalTest {
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), TaskFileJobEntity.class);
|
||||
}
|
||||
|
||||
private final TaskFileJobMapper taskFileJobMapper = mock(TaskFileJobMapper.class);
|
||||
private final ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
|
||||
|
||||
@Test
|
||||
void pending_到顶必须转_FAILED_并进终态回调() {
|
||||
TaskFileJobService service = new TaskFileJobService(taskFileJobMapper, eventPublisher);
|
||||
TaskFileJobEntity zombie = new TaskFileJobEntity();
|
||||
zombie.setId(91L);
|
||||
zombie.setTaskId(9100L);
|
||||
zombie.setModuleType("SIMILAR_ASIN");
|
||||
zombie.setStatus("PENDING");
|
||||
zombie.setRetryCount(TaskFileJobService.MAX_RETRY_COUNT - 1); // 已是 4,下一轮就是顶
|
||||
zombie.setUpdatedAt(LocalDateTime.now().minusHours(2));
|
||||
when(taskFileJobMapper.selectList(any())).thenReturn(List.of(zombie));
|
||||
when(taskFileJobMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
|
||||
|
||||
TaskFileJobService.StuckJobResetResult result = service.resetStuckRunningJobsDetailed(30, 10);
|
||||
|
||||
ArgumentCaptor<LambdaUpdateWrapper<TaskFileJobEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
|
||||
org.mockito.Mockito.verify(taskFileJobMapper, org.mockito.Mockito.atLeastOnce())
|
||||
.update(isNull(), captor.capture());
|
||||
Map<String, Object> setValues = captor.getValue().getParamNameValuePairs();
|
||||
|
||||
assertThat(setValues.values())
|
||||
.as("S1-B7:retry_count 必须能到 MAX_RETRY_COUNT(%d),被 Math.min(4,...) 钉住就永远不终态",
|
||||
TaskFileJobService.MAX_RETRY_COUNT)
|
||||
.contains(TaskFileJobService.MAX_RETRY_COUNT);
|
||||
assertThat(setValues.values())
|
||||
.as("S1-B7:到顶必须把状态翻成 FAILED(现在只加计数不翻状态)")
|
||||
.contains("FAILED");
|
||||
assertThat(result.exhaustedJobs())
|
||||
.as("S1-B7:封顶的作业必须进 exhaustedJobs,终态回调才有入口(markFailureFinalized)")
|
||||
.anySatisfy(job -> assertThat(job.getId()).isEqualTo(91L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 视频详情_SQL_不许双转义() throws Exception {
|
||||
String body = MapperXmlSupport.statementBody(
|
||||
com.nanri.aiimage.modules.imagevideo.mapper.ImageVideoAdminTaskMapper.class,
|
||||
"selectAdminTaskDetail");
|
||||
|
||||
assertThat(body)
|
||||
.as("S1-B1:&gt;= 解码后是字面量 >=,MySQL 认它是未知列 ⇒ 详情必 500")
|
||||
.doesNotContain(">=");
|
||||
assertThat(body)
|
||||
.as("同一条比较必须写成可用的 >=(与 :11/:62/:79 三条同口径)")
|
||||
.contains(">=");
|
||||
}
|
||||
|
||||
@Test
|
||||
void mybatis_必须有_statement_timeout() throws Exception {
|
||||
Map<String, String> flat = flatten("application.yml");
|
||||
|
||||
assertThat(flat)
|
||||
.as("S1-B8:没有语句级超时,socketTimeout=300s 会让一条慢 SQL 占死一格连接(池只有 30)")
|
||||
.containsKey("mybatis-plus.configuration.default-statement-timeout");
|
||||
assertThat(flat.get("mybatis-plus.configuration.default-statement-timeout"))
|
||||
.as("蓝图 §3.2:建议 30–60 秒")
|
||||
.isNotEqualTo("0");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 店铺数据删除的多写必须收进一个事务() {
|
||||
String admin = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("ShopDataCrawlAdminTasksService.java"));
|
||||
String daily = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("ShopDataCrawlDailyFileService.java"));
|
||||
|
||||
assertThat(SourceScan.methodBody(admin, "deleteAdminDailyFile"))
|
||||
.as("S1-B9:删明细/解绑/删档/回收对象必须同事务(对象删除放 afterCommit)")
|
||||
.contains("@Transactional");
|
||||
assertThat(SourceScan.methodBody(daily, "deleteDailyFile"))
|
||||
.as("S1-B9:删成员 + 删档两次写必须同事务")
|
||||
.contains("@Transactional");
|
||||
}
|
||||
|
||||
private static Map<String, String> flatten(String fileName) throws Exception {
|
||||
ClassPathResource resource = new ClassPathResource(fileName);
|
||||
assertThat(resource.exists()).as("classpath 上找不到 " + fileName).isTrue();
|
||||
Map<String, String> flat = new LinkedHashMap<>();
|
||||
try (InputStream in = resource.getInputStream()) {
|
||||
for (PropertySource<?> source : new YamlPropertySourceLoader().load(fileName, resource)) {
|
||||
if (source instanceof EnumerablePropertySource<?> enumerable) {
|
||||
for (String name : enumerable.getPropertyNames()) {
|
||||
Object value = enumerable.getProperty(name);
|
||||
flat.put(name, value == null ? "" : String.valueOf(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
assertThat(flat).as(fileName + " 解析出来的键数(0 就是解析坏了)").isNotEmpty();
|
||||
return flat;
|
||||
}
|
||||
}
|
||||
+128
@@ -0,0 +1,128 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.config.InstanceMetadata;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.atLeastOnce;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-9(R5/审计 S1-B2、S1-B3):视频派发与结果文件组装必须互相隔离,背压不许转嫁给调度线程。
|
||||
*
|
||||
* <p>两条证据都在源码上:
|
||||
* <ul>
|
||||
* <li><b>S1-B2 一个 12 格的共享池</b>:{@code TaskFileJobConfig.java:106-132} 的
|
||||
* {@code taskQueueExecutor} 只按 {@code aiimage.task-queue.max-concurrent:12} 开闸,
|
||||
* 而 {@code ImageVideoAsyncTaskService.java:159/:181/:284} 每 1s/每 5s 往同一个执行器投
|
||||
* Coze 任务({@code application.yml:506} 的 Coze 读超时是 1 小时)。
|
||||
* 12 个慢 Coze 请求能把许可占满一小时,其他 43 个模块的结果文件组装只能排队或被拒。</li>
|
||||
* <li><b>S1-B3 拒绝即内联</b>:{@code TaskResultFileJobWorker.java:89-92}
|
||||
* {@code if (!dispatched) { processClaimed(job); }}——本地派发被拒时,分钟级的 Excel 组装
|
||||
* 直接压回 16 线程的调度池,拖停 stale 修复/视频派发这些兜底任务。
|
||||
* 同一件事在 {@code process()} 那条通道上早已改掉(见
|
||||
* {@code TaskResultFileJobWorkerOffloadTest#offloadRejectedRequeuesInsteadOfInlineFallback}
|
||||
* 的注释:"改为重新入队,由归属实例 15s 一轮的扫描补发"),
|
||||
* 漏的就是 scheduled worker 这一条。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>15s 轮次口径:{@code runPendingJobs} 的
|
||||
* {@code aiimage.result-file-job.local-worker-delay-ms} 默认 15000(现网 yml 覆盖为 10000),
|
||||
* 本用例判的是"一轮之内被拒的作业必须回到队列",不依赖具体毫秒数。
|
||||
*/
|
||||
@Disabled("Pending Phase 3: AC-9 视频/结果文件队列隔离与拒绝回队")
|
||||
@DisplayName("AC-9 队列隔离与背压回队")
|
||||
class PendingPhase3QueueIsolationTest {
|
||||
|
||||
private final TaskFileJobService taskFileJobService = mock(TaskFileJobService.class);
|
||||
private final TaskDistributedLockService taskDistributedLockService = mock(TaskDistributedLockService.class);
|
||||
private final TaskFileJobLocalDispatcher dispatcher = mock(TaskFileJobLocalDispatcher.class);
|
||||
private final InstanceMetadata instanceMetadata = mock(InstanceMetadata.class);
|
||||
|
||||
private TaskResultFileJobWorker buildWorker() {
|
||||
TaskResultFileJobWorker worker = new TaskResultFileJobWorker(
|
||||
taskFileJobService,
|
||||
taskDistributedLockService,
|
||||
mock(FileResultMapper.class),
|
||||
dispatcher,
|
||||
instanceMetadata,
|
||||
mock(ResultFileJobHandlerRegistry.class));
|
||||
ReflectionTestUtils.setField(worker, "localWorkerEnabled", true);
|
||||
ReflectionTestUtils.setField(worker, "batchSize", 20);
|
||||
return worker;
|
||||
}
|
||||
|
||||
private static TaskFileJobEntity job(long jobId, long taskId) {
|
||||
TaskFileJobEntity entity = new TaskFileJobEntity();
|
||||
entity.setId(jobId);
|
||||
entity.setTaskId(taskId);
|
||||
entity.setModuleType("SIMILAR_ASIN");
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Test
|
||||
void 本地派发被拒时组装不许压在调度线程上() {
|
||||
TaskResultFileJobWorker worker = spy(buildWorker());
|
||||
TaskFileJobEntity claimed = job(41L, 4100L);
|
||||
doNothing().when(worker).processClaimed(any(TaskFileJobEntity.class));
|
||||
when(taskFileJobService.claimRunnableJobsForOwner(anyInt(), any()))
|
||||
.thenReturn(List.of(claimed));
|
||||
when(dispatcher.dispatchClaimed(claimed)).thenReturn(false);
|
||||
|
||||
worker.runPendingJobs();
|
||||
|
||||
verify(worker, never()).processClaimed(claimed);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 拒绝必须把作业送回队列而不是就地消化() {
|
||||
TaskResultFileJobWorker worker = spy(buildWorker());
|
||||
TaskFileJobEntity claimed = job(42L, 4200L);
|
||||
doNothing().when(worker).processClaimed(any(TaskFileJobEntity.class));
|
||||
when(taskFileJobService.claimRunnableJobsForOwner(anyInt(), any()))
|
||||
.thenReturn(List.of(claimed));
|
||||
when(dispatcher.dispatchClaimed(claimed)).thenReturn(false);
|
||||
|
||||
worker.runPendingJobs();
|
||||
|
||||
verify(taskFileJobService, atLeastOnce()).requeue(eq(42L), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 视频派发必须用与结果文件组装隔离开的执行器() {
|
||||
String config = SourceScan.withoutComments(SourceScan.sourceText("TaskFileJobConfig.java"));
|
||||
|
||||
assertThat(config)
|
||||
.as("S1-B2:必须存在一支专属视频的执行器/信号量,而不是一只 taskQueueExecutor 通吃")
|
||||
.contains("video");
|
||||
assertThat(SourceScan.withoutComments(SourceScan.sourceText("ImageVideoAsyncTaskService.java")))
|
||||
.as("S1-B2:视频派发/轮询三处投递(:159/:181/:284)不许再落在共享的 taskQueueExecutor 上")
|
||||
.doesNotContain("taskQueueExecutor.execute");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 视频并发上限必须有独立配置键() {
|
||||
// 蓝图 §3.2 已登记新键 aiimage.task-queue.video-max-concurrent;出厂默认不许是"不限"。
|
||||
String config = SourceScan.withoutComments(SourceScan.sourceText("TaskFileJobConfig.java"));
|
||||
|
||||
assertThat(config)
|
||||
.as("隔离必须可调(与结果文件各自的 permit 数),不许写死常量")
|
||||
.contains("video-max-concurrent");
|
||||
}
|
||||
}
|
||||
+127
@@ -0,0 +1,127 @@
|
||||
package com.nanri.aiimage.modules.taskcenter.service;
|
||||
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
|
||||
import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.testutil.MapperXmlSupport;
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* AC-19(R8/审计 P1-B1、P1-B2、P1-B3、P1-B4):任务中心时间窗+keyset、关键词去 RAND、
|
||||
* 心跳瘦字段、权限菜单短 TTL 缓存。
|
||||
*
|
||||
* <p>逐条证据:
|
||||
* <ul>
|
||||
* <li><b>P1-B1</b> {@code mapper/taskcenter/TaskCenterQueryMapper.xml:57-58} 的
|
||||
* {@code selectTaskPage} 是 12 模块 UNION 之后
|
||||
* {@code ORDER BY m.createdAt DESC, m.id DESC LIMIT #{limit} OFFSET #{offset}},
|
||||
* 而 {@code TaskCenterQueryService.tasks()}(:110-139)把 {@code startTime/endTime}
|
||||
* 原样透传、服务层不填默认窗口 ⇒ 不带时间参数就是全历史 UNION + 深 OFFSET。</li>
|
||||
* <li><b>P1-B2</b> {@code mapper/keywordshare/KeywordShareMapper.xml:53} 的
|
||||
* {@code selectRandomUnused} 是 {@code ORDER BY RAND()}(全表 filesort)。</li>
|
||||
* <li><b>P1-B3</b> {@code TaskHeartbeatService.java:111-116} 的 {@code selectFileTask}
|
||||
* 没有 {@code .select(...)},捞整行 {@code FileTaskEntity}(含
|
||||
* {@code requestJson}/{@code resultJson}),而心跳只用
|
||||
* id/moduleType/status/userId/updatedAt(:166-190)。这是每单每 30s 一次的热路径。</li>
|
||||
* <li><b>P1-B4</b> {@code PermissionMenuService} 只有 3 支 mapper、无任何缓存设施,
|
||||
* {@code hasAnyAdminMenu}(:790)每次都跑 {@code loadMenus → loadDirectColumnIds →
|
||||
* expandDescendantIds} 三次 SQL/请求。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>p95 不劣化要靠 Phase 5 的 EXPLAIN/基准前后对比(蓝图 §4 Phase 5 准出),
|
||||
* 本文件钉的是"形状必须改成这样"的可判据部分。
|
||||
*/
|
||||
@Disabled("Pending Phase 5: AC-19 读路径时间窗/keyset、去 RAND、心跳瘦字段、菜单缓存")
|
||||
@DisplayName("AC-19 高频读路径治理契约")
|
||||
class PendingPhase5ReadPathTest {
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), FileTaskEntity.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 任务中心列表必须走游标而不是深_OFFSET() throws Exception {
|
||||
String body = MapperXmlSupport.statementBody(
|
||||
com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper.class, "selectTaskPage");
|
||||
|
||||
assertThat(body)
|
||||
.as("P1-B1:OFFSET 深分页要扫过全部前缀行,必须换成 (createdAt,id) 游标")
|
||||
.doesNotContain("OFFSET");
|
||||
assertThat(body)
|
||||
.as("keyset 的锚点必须落在既有的排序键 (createdAt, id) 上")
|
||||
.containsAnyOf("m.createdAt", "createdAt");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 服务层必须填默认时间窗() {
|
||||
String service = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("TaskCenterQueryService.java"));
|
||||
String body = SourceScan.methodBody(service, "tasks");
|
||||
|
||||
assertThat(body)
|
||||
.as("P1-B1:不带时间参数时服务层必须给默认窗口,不能把 null 直接透传给 UNION 全历史")
|
||||
.containsAnyOf("DEFAULT_WINDOW", "minusDays", "startOfDefaultWindow");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 关键词抽词不许再_ORDER_BY_RAND() throws Exception {
|
||||
String body = MapperXmlSupport.statementBody(
|
||||
com.nanri.aiimage.modules.keywordshare.mapper.KeywordShareMapper.class, "selectRandomUnused");
|
||||
|
||||
assertThat(body)
|
||||
.as("P1-B2:ORDER BY RAND() 对全表 filesort;要么先 count 取随机 offset,要么物化 used 标记")
|
||||
.doesNotContain("RAND()");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 心跳取任务必须只读瘦字段() {
|
||||
String service = SourceScan.withoutComments(SourceScan.sourceText("TaskHeartbeatService.java"));
|
||||
String body = SourceScan.methodBody(service, "selectFileTask");
|
||||
|
||||
assertThat(body)
|
||||
.as("P1-B3:热路径读整行大 JSON,必须 .select(id, module_type, status, user_id, updated_at)")
|
||||
.contains(".select(");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 权限菜单必须走短TTL缓存而不是每请求重算() {
|
||||
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
|
||||
UserColumnPermissionMapper columnMapper = mock(UserColumnPermissionMapper.class);
|
||||
AdminUserMapper adminUserMapper = mock(AdminUserMapper.class);
|
||||
when(menuMapper.selectList(any())).thenReturn(List.of());
|
||||
when(columnMapper.selectByUserId(any())).thenReturn(List.of());
|
||||
|
||||
PermissionMenuService service =
|
||||
new PermissionMenuService(menuMapper, columnMapper, adminUserMapper);
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
operator.setRole("company_admin");
|
||||
operator.setCompanyId(3L);
|
||||
|
||||
service.hasAnyAdminMenu(operator, List.of("admin_history"));
|
||||
service.hasAnyAdminMenu(operator, List.of("admin_history"));
|
||||
|
||||
verify(menuMapper, times(1)).selectList(any());
|
||||
}
|
||||
}
|
||||
@@ -38,13 +38,23 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
* <p><b>一处与 plan 原文不符的读数,按"先怀疑尺子"的流程处理并留在脸上</b>:plan/AGENTS §1 记的是「9 支文件」,
|
||||
* 那条数是 {@code grep -rl 'sourceText('} 数出来的,而第 9 支是 {@code SourceScan.java:22} 里
|
||||
* {@code public static String sourceText(String fileName)} 这行<b>被调方自己的声明</b>——它不是调用点。
|
||||
* 所以真实形状是 <b>15 个调用点/8 支调用方/9 支引用方文件</b>。下面第 3 格把这三个数同时钉住,
|
||||
* 所以真实形状是 <b>调用点/调用方/引用方三类数各自成立</b>(2026-10-28 v1.1 Phase 0 起调用方 16 支、
|
||||
* 裸名 22 个,增量逐笔登记在 {@code REGISTERED_BARE_NAMES} 的注释里)。下面第 3 格把这些数同时钉住,
|
||||
* 免得下一个人拿 {@code grep} 再数一遍又把声明算进去。</p>
|
||||
*/
|
||||
class SourceScanTest {
|
||||
|
||||
/** 台账里登记过的 10 个被点名裸名,逐字对撞用。 */
|
||||
/**
|
||||
* 台账里登记过的被点名裸名,逐字对撞用。
|
||||
*
|
||||
* <p>2026-10-28 v1.1 Phase 0 追加 12 名:它们全部来自本轮预置的 AC 验收契约
|
||||
* (AC-7/8/9/10/11/12/19/21 里"改的是内部形状、判据只能打在源码连线上"的那几格,
|
||||
* 见 {@code PendingPhase1*}/{@code PendingPhase3*}/{@code PendingPhase5*})。
|
||||
* 台账按设计就该在这里变红——它要的不是"别用单文件口径",而是"用了必须登记是谁的哪一笔"
|
||||
* (蓝图 {@code docs/ITERATION_PLAN.md} §4 Phase 0 的待激活清单逐支可溯源)。
|
||||
*/
|
||||
private static final Set<String> REGISTERED_BARE_NAMES = Set.of(
|
||||
// —— 立项前既有(10 名)——
|
||||
"PublishController.java",
|
||||
"PublishTaskService.java",
|
||||
"AppearancePatentTaskService.java",
|
||||
@@ -54,7 +64,20 @@ class SourceScanTest {
|
||||
"ClientVersionGuardFilter.java",
|
||||
"LockSkipWitness.java",
|
||||
"PermissionMenuService.java",
|
||||
"ShopManageController.java");
|
||||
"ShopManageController.java",
|
||||
// —— 2026-10-28 v1.1 Phase 0 预置验收契约追加(12 名)——
|
||||
"ImageHistoryController.java",
|
||||
"ImageHistoryService.java",
|
||||
"ShopDataCrawlAdminTasksService.java",
|
||||
"ShopDataCrawlDailyFileService.java",
|
||||
"TaskFileJobConfig.java",
|
||||
"ImageVideoAsyncTaskService.java",
|
||||
"CollectDataService.java",
|
||||
"ModuleHistoryCleanupService.java",
|
||||
"TaskCenterQueryService.java",
|
||||
"TaskHeartbeatService.java",
|
||||
"AppearancePatentDeliverySupport.java",
|
||||
"RequestTraceFilter.java");
|
||||
|
||||
@TempDir
|
||||
Path tmp;
|
||||
@@ -70,7 +93,7 @@ class SourceScanTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void census_唯一裸名恰为10且与已登记集合相等() {
|
||||
void census_唯一裸名恰为22且与已登记集合相等() {
|
||||
Set<String> found = SourceScan.censusSourceTextCallSites().stream()
|
||||
.map(SourceScan.CallSite::bareName)
|
||||
.collect(Collectors.toSet());
|
||||
@@ -78,11 +101,11 @@ class SourceScanTest {
|
||||
assertThat(found)
|
||||
.as("唯一裸名集合必须与类头台账逐字相等——多一个说明有人新引了单文件口径,少一个说明尺子漏扫")
|
||||
.isEqualTo(REGISTERED_BARE_NAMES)
|
||||
.hasSize(10);
|
||||
.hasSize(22);
|
||||
}
|
||||
|
||||
@Test
|
||||
void census_涉及文件恰为9() {
|
||||
void census_调用方文件恰为16而声明件在外() {
|
||||
List<SourceScan.CallSite> sites = SourceScan.censusSourceTextCallSites();
|
||||
Set<String> callerFiles = sites.stream()
|
||||
.map(SourceScan.CallSite::relativeFile)
|
||||
@@ -91,8 +114,8 @@ class SourceScanTest {
|
||||
String declarationFile = "src/test/java/com/nanri/aiimage/testutil/SourceScan.java";
|
||||
|
||||
assertThat(callerFiles)
|
||||
.as("真实字面量调用点落在 8 支调用方文件里")
|
||||
.hasSize(8);
|
||||
.as("真实字面量调用点落在 16 支调用方文件里(8 支既有 + 2026-10-28 v1.1 Phase 0 预置契约 8 支)")
|
||||
.hasSize(16);
|
||||
assertThat(callerFiles)
|
||||
.as("plan 原文记的「9 支」= grep -rl 'sourceText(' 的条数,第 9 支是被调方自己的声明行"
|
||||
+ "(SourceScan.java:22 的 `public static String sourceText(String fileName)`),"
|
||||
|
||||
Reference in New Issue
Block a user