fix(phase-5.2): 消项 CR 第二轮 P1/P2/P3(通道/证据链/交付时序/后管证据页)

This commit is contained in:
2026-10-31 21:12:18 +08:00
parent a4e4456b50
commit 91d36327f9
61 changed files with 2833 additions and 311 deletions
@@ -0,0 +1,86 @@
package com.nanri.aiimage.common.security;
import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
/**
* 安装包/教程包凭据件扫描(P2-4,对齐工作台包的 CR-02 口径)。
*
* <p>版本包与教程包此前只校验扩展名和体积,压缩包里是否带 {@code .env}/{@code *.pem}
* 没人看;而它们会经公开 client 桶发给全部客户端。这里只读 zip 中央目录、按条目名判,
* 不解压内容,代价与包体积无关。</p>
*/
public final class CredentialPackageGuard {
private static final Set<String> FORBIDDEN_NAMES = Set.of(
"kw_share_cfg.json", ".env", ".netrc", ".git-credentials",
"id_rsa", "id_dsa", "id_ecdsa", "id_ed25519");
private static final List<String> FORBIDDEN_SUFFIXES =
List.of(".pem", ".key", ".p12", ".pfx", ".jks", ".keystore");
private static final int MAX_ENTRIES = 200_000;
private CredentialPackageGuard() {
}
/**
* 返回第一个命中凭据名的条目;没有命中返回 {@code null}。
*
* @throws IOException 文件不是可读 zip / 条目数超限
*/
public static String firstForbiddenEntry(File packageFile) throws IOException {
if (packageFile == null || !packageFile.isFile()) {
throw new IOException("package file missing");
}
try (ZipFile zipFile = new ZipFile(packageFile)) {
Enumeration<? extends ZipEntry> entries = zipFile.entries();
int scanned = 0;
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
if (++scanned > MAX_ENTRIES) {
throw new IOException("zip entry limit exceeded");
}
if (entry.isDirectory()) {
continue;
}
String base = baseName(entry.getName());
if (isCredentialFileName(base)) {
return entry.getName();
}
}
}
return null;
}
static boolean isCredentialFileName(String fileName) {
String lower = fileName == null ? "" : fileName.trim().toLowerCase(Locale.ROOT);
if (lower.isEmpty()) {
return false;
}
if (FORBIDDEN_NAMES.contains(lower) || lower.startsWith(".env.")) {
return true;
}
for (String suffix : FORBIDDEN_SUFFIXES) {
if (lower.endsWith(suffix)) {
return true;
}
}
return false;
}
private static String baseName(String entryName) {
if (entryName == null) {
return "";
}
String normalized = entryName.replace('\\', '/');
int slash = normalized.lastIndexOf('/');
return slash < 0 ? normalized : normalized.substring(slash + 1);
}
}
@@ -59,7 +59,7 @@ public class AppearancePatentController {
}
@GetMapping("/tasks/{taskId}/queue-payload")
@Operation(summary = "获取外观专利 Python 队列载荷", description = "本地采集模式下,前端取出 groups 后推本机客户端队列;只返回 Python 当前需要的分组,避免前端搬运完整解析大数据。")
@Operation(summary = "获取外观专利 Python 队列载荷", description = "本地采集模式下,前端取出 groups 后推本机客户端队列;只返回 Python 当前需要的分组,避免前端搬运完整解析大数据。这一单登记为线上采集时拒发(V183 通道),防旧页面缓存推本机与后台双跑。")
public ApiResponse<AppearancePatentParsedPayloadDto> queuePayload(
@Parameter(description = "外观专利任务 ID", required = true, example = "7004")
@PathVariable Long taskId,
@@ -67,7 +67,7 @@ public class AppearancePatentController {
@RequestParam("user_id") Long userId,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(service.queuePayload(taskId, userId));
return ApiResponse.success(service.queuePayloadForLocalClient(taskId, userId));
}
@GetMapping("/dashboard")
@@ -114,13 +114,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
@org.springframework.beans.factory.annotation.Autowired(required = false)
private com.nanri.aiimage.modules.usersecret.service.UserTaskGuardService taskGuard;
/**
* 采集路由开关:字段注入的理由同 {@code taskGuard}——本类构造器被 golden 用例按参数顺序
* new 出来,加参数会连带改一批测试。null=未注入(单测)时按「非本地」处理,退回后台语义。
*/
@org.springframework.beans.factory.annotation.Autowired(required = false)
private com.nanri.aiimage.config.CollectRoutingProperties collectRoutingProperties;
/**
* 参数顺序=迁移前 {@code @RequiredArgsConstructor} 的字段声明顺序,一字未动;
* 其中五枚(fileTaskMapper/fileResultMapper/taskDistributedLockService/
@@ -218,10 +211,10 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
FileTaskEntity channelTask = requireSubmissionTask(taskId);
if (com.nanri.aiimage.modules.task.model.CollectChannel
.resolve(channelTask.getCollectChannel(), channelTask.getModuleType()).isLocal()) {
activateForLocalClient(taskId, userId);
activateForLocalClient(channelTask, userId);
return;
}
recordSupport().activateTask(taskId, userId);
recordSupport().activateTask(channelTask, userId);
}
/**
@@ -230,10 +223,9 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
* <p>与客户端兜底拉取 / Linux 内部认领共用同一条原子翻转,谁先翻谁执行,
* 页面推送与后台接管不会重复跑同一份任务。
*/
private void activateForLocalClient(Long taskId, Long userId) {
// 模块归属走底座 requireSubmissionTask(TaskFinalizeSupport 家族),不在本类手抄
// 「!MODULE_TYPE.equals(...)」——那形已被 TaskLifecycleDebtRatchetTest 钉成只降不升。
FileTaskEntity task = requireSubmissionTask(taskId);
private void activateForLocalClient(FileTaskEntity task, Long userId) {
// 模块归属已在 activateTask 的首读校验过;这里复用同一行,不再二次 selectById。
Long taskId = task.getId();
if (userId == null || !java.util.Objects.equals(userId, task.getUserId())) {
throw new com.nanri.aiimage.common.exception.BusinessException("任务不存在");
}
@@ -793,6 +785,11 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
return payloadSupport().queuePayload(taskId, userId);
}
/** 页面/直连 API 取本机队列载荷:本单通道不是本机时拒发(P1-1 同族)。 */
public AppearancePatentParsedPayloadDto queuePayloadForLocalClient(Long taskId, Long userId) {
return payloadSupport().queuePayloadForLocalClient(taskId, userId);
}
static String resolveTaskExecutionStatus(boolean waitingForAssemble, boolean executionFailed) {
if (waitingForAssemble) {
return STATUS_RUNNING;
@@ -11,6 +11,7 @@ import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentParse
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.CollectChannel;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
@@ -153,11 +154,31 @@ public class AppearancePatentPayloadSupport {
}
public AppearancePatentParsedPayloadDto queuePayload(Long taskId, Long userId) {
return queuePayload(taskId, userId, false);
}
/**
* 页面/直连 API 侧的下发口:只有这一单确实交给本机客户端时才给载荷。
*
* <p>P1-1 的同族洞:取载荷这一侧原先只看存在与归属、不看通道,选了线上的单被旧页面缓存
* 或直连 API 取走 groups 推本机,就与 Linux 那边同时跑同一组(按次付费的出口 IP 买两遍)。
* 兜底拉取/内部认领走的是 {@link #queuePayload(Long, Long)}:本机单等满兜底窗口后由
* Linux 接管,那一侧必须仍能拿到载荷。
*/
public AppearancePatentParsedPayloadDto queuePayloadForLocalClient(Long taskId, Long userId) {
return queuePayload(taskId, userId, true);
}
private AppearancePatentParsedPayloadDto queuePayload(Long taskId, Long userId, boolean requireLocalChannel) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
if (task == null || !moduleType.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
throw new BusinessException("任务不存在");
}
ownershipChecker.accept(task, "queue payload");
if (requireLocalChannel
&& !CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal()) {
throw new BusinessException("本单已选择线上采集,无需打开客户端,提交后稍候自动开始");
}
AppearancePatentParsedPayloadDto payload = readParsedPayload(task);
AppearancePatentParsedPayloadDto queuePayload = new AppearancePatentParsedPayloadDto();
queuePayload.setAiPrompt(payload.getAiPrompt());
@@ -70,18 +70,20 @@ public class AppearancePatentTaskRecordSupport {
}
public void activateTask(Long taskId, Long userId) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
activateTask(fileTaskMapper.selectById(taskId), userId);
}
/** P3-4:调用方已经读过任务行时复用,不在 activate 链路上重复 selectById。 */
public void activateTask(FileTaskEntity task, Long userId) {
Long taskId = task == null ? null : task.getId();
if (task == null || !moduleType.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
throw new BusinessException("任务不存在");
}
// 2026-09-30 起外观专利已整体迁移 Linux 后台执行(无浏览器抓取):
// activate 不再把任务推给客户端浏览器。任务保持 PENDING,由内部认领端点
// (/api/internal/tasks/pull-pending + maixiang-ap worker)在等待窗口后自动接管。
// 这里保留接口仅做状态校验:旧前端(未刷新页面缓存)点「启动」时给出明确提示,
// 前端收到业务异常会中止入队逻辑,任务不会被执行两次。
// V183 起执行方按单判定:本机单由客户端领取,线上单等内部认领(Linux/外机 Windows)。
// 这条兼容分支只服务未刷新页面缓存的旧前端:选中线上采集时,告诉用户无需打开浏览器。
if (STATUS_PENDING.equals(task.getStatus())) {
log.info("[外观专利] activate 不再推送客户端,任务保持 PENDING 等待 Linux 后台认领 taskId={} userId={}", taskId, userId);
throw new BusinessException("外观专利已切换后台自动执行,无需打开浏览器,稍候自动开始");
log.info("[外观专利] activate 不再推送客户端,任务保持 PENDING 等待线上认领 taskId={} userId={}", taskId, userId);
throw new BusinessException("本单已选择线上采集,无需打开客户端,提交后稍候自动开始");
}
if (STATUS_RUNNING.equals(task.getStatus())) {
throw new BusinessException("任务已在执行中(可能已由后台自动接管),无需重复启动");
@@ -78,7 +78,6 @@ public class AdminTaskEvidenceController {
@Parameter(description = "证据主键") @RequestParam Long fileId) throws IOException {
requireSuperAdmin(request);
TaskEvidenceEntity entity = taskEvidenceService.requireEvidence(fileId);
byte[] bytes = taskEvidenceService.download(fileId);
String name = "evidence-" + entity.getId()
+ (entity.getObjectKey() != null && entity.getObjectKey().contains(".")
? entity.getObjectKey().substring(entity.getObjectKey().lastIndexOf('.')) : ".bin");
@@ -86,7 +85,7 @@ public class AdminTaskEvidenceController {
? "application/octet-stream" : entity.getContentType());
response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''"
+ URLEncoder.encode(name, StandardCharsets.UTF_8).replace("+", "%20"));
response.getOutputStream().write(bytes);
taskEvidenceService.downloadTo(fileId, response.getOutputStream());
}
@PostMapping("/delete")
@@ -47,9 +47,13 @@ public class InternalTaskEvidenceController {
if (body == null) {
throw new BusinessException("登记载荷为空");
}
// P1-2:归属以会话身份为准。内部令牌是发给每个登录客户的共享凭据,body.uid 谁都能写——
// 真身份只能来自请求头里的用户 JWT(4.0.14 起 user_token 钩子统一注入);会话 uid 与
// body.uid 不一致直接 403,无身份的存量装机保留原参数并打节流的匿名兜底日志。
Long uid = adminAuthSupport.resolveOwnershipUserId(request, body.getUid());
Map<String, Object> result = taskEvidenceService.register(
body.getTaskId(), body.getUid(), body.getEvidenceType(), body.getSource(), body.getFileKey());
log.info("[task-evidence] registered id={} taskId={}", result.get("id"), body.getTaskId());
body.getTaskId(), uid, body.getEvidenceType(), body.getSource(), body.getFileKey());
log.info("[task-evidence] registered id={} taskId={} uid={}", result.get("id"), body.getTaskId(), uid);
return ApiResponse.success(result);
}
}
@@ -3,11 +3,15 @@ package com.nanri.aiimage.modules.evidence.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.config.EvidenceProperties;
import com.nanri.aiimage.modules.evidence.mapper.TaskEvidenceMapper;
import com.nanri.aiimage.modules.evidence.model.entity.TaskEvidenceEntity;
import com.nanri.aiimage.modules.evidence.storage.TaskEvidenceStorageService;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -15,11 +19,15 @@ import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
/**
* 证据登记与读取(AC-7/AC-13)。
@@ -35,11 +43,23 @@ public class TaskEvidenceService {
private static final int MAX_TASK_ID_LENGTH = 64;
private static final int MAX_CONTENT_BYTES = 8 * 1024 * 1024;
private static final int RETENTION_BATCH = 200;
/** 单轮保留期最多扫的批次数:防一个删不掉的对象把进程拖成永动机。 */
private static final int MAX_RETENTION_BATCHES = 20;
/** 同一任务的证据件数上限:登记端点不设防的话,一个持证客户端能刷满整个证据桶(P2-2)。 */
private static final int MAX_EVIDENCE_PER_TASK = 50;
/** 保留期回收的分布式锁名:A/B 两台每晚各扫同一张表会互相删(同族口径见 DeviceLogRetentionService)。 */
static final String RETENTION_LOCK = "task-evidence:retention";
private static final Set<String> ALLOWED_EVIDENCE_TYPES =
Set.of("client", "crash", "window_image", "page_image", "brand", "other");
private static final Set<String> ALLOWED_SOURCES =
Set.of("client", "crash_recorder", "window", "page", "brand", "other");
private final TaskEvidenceMapper mapper;
private final TaskEvidenceStorageService storage;
private final LocalFileStorageService localFileStorageService;
private final EvidenceProperties properties;
private final FileTaskMapper fileTaskMapper;
private final DistributedJobLockService distributedJobLockService;
/** 客户端上传完成后登记:fileKey 指向 Java 临时目录里的分片拼装件。 */
public Map<String, Object> register(String taskId, Long uid, String evidenceType,
@@ -52,6 +72,15 @@ public class TaskEvidenceService {
if (file == null || !file.isFile()) {
throw new BusinessException("证据文件不存在或已过期");
}
// P1-2:归属先于落桶。task_id 能对上库里的任务行时,uid 必须就是行主——判据发生在
// storage.store 之前,否则每一次拒绝都往证据桶里丢一个收不回的孤儿对象。
assertTaskOwnedBy(normalizedTaskId, uid);
if (file.length() == 0) {
throw new BusinessException("证据件为空,拒绝登记");
}
if (countByTask(normalizedTaskId) >= MAX_EVIDENCE_PER_TASK) {
throw new BusinessException("该任务的证据件数已达上限");
}
TaskEvidenceStorageService.StoredEvidence stored;
try {
stored = storage.store(file, normalizedTaskId, file.getName());
@@ -63,8 +92,8 @@ public class TaskEvidenceService {
TaskEvidenceEntity entity = new TaskEvidenceEntity();
entity.setTaskId(normalizedTaskId);
entity.setUid(uid);
entity.setEvidenceType(normalizeLabel(evidenceType, "client"));
entity.setSource(normalizeLabel(source, "client"));
entity.setEvidenceType(normalizeLabel(evidenceType, "client", ALLOWED_EVIDENCE_TYPES));
entity.setSource(normalizeLabel(source, "client", ALLOWED_SOURCES));
entity.setObjectKey(stored.objectKey());
entity.setByteSize(stored.byteSize());
entity.setContentType(stored.contentType());
@@ -143,6 +172,12 @@ public class TaskEvidenceService {
return storage.read(entity.getObjectKey(), properties.maxFileBytesOrDefault());
}
/** P3-1:后管下载走流式,避免 64MB 级对象整块进堆。 */
public void downloadTo(Long fileId, OutputStream out) {
TaskEvidenceEntity entity = requireEvidence(fileId);
storage.downloadTo(entity.getObjectKey(), out, properties.maxFileBytesOrDefault());
}
/** 删除证据:先删对象再删登记行;对象删除失败不吞(留在库里下一轮可重试)。 */
public int delete(List<Long> ids) {
if (ids == null || ids.isEmpty()) {
@@ -160,35 +195,104 @@ public class TaskEvidenceService {
return deleted;
}
/** 保留期回收:按天清扫到期行与对象(AC-13 的保留期必须有执行者,不能只写在配置里)。 */
/**
* 保留期回收:按天清扫到期行与对象(AC-13 的保留期必须有执行者,不能只写在配置里)。
*
* <p>P1-7 的两条修正:① A/B 两台每晚并发扫同一张表,回收必须拿分布式锁(同族口径见
* {@code DeviceLogRetentionService},锁跳过走可聚合出口);② 对象删除失败不再让整轮早退——
* 原先翻页永远停在第 1 页,卡住的那一行把后面每一行都堵死,配置里的 retention-days
* 因此只是个数字。改成按 id 键集分页:失败行留在库里下一轮重试,后面的行照常推进。
*/
@Scheduled(cron = "${aiimage.evidence.retention-cron:0 30 3 * * *}")
public void purgeExpired() {
LocalDateTime expireBefore = LocalDateTime.now().minusDays(properties.retentionDaysOrDefault());
while (true) {
Page<TaskEvidenceEntity> expiredPage = mapper.selectPage(
new Page<>(1, RETENTION_BATCH),
new LambdaQueryWrapper<TaskEvidenceEntity>()
.lt(TaskEvidenceEntity::getCreatedAt, expireBefore)
.orderByAsc(TaskEvidenceEntity::getId));
List<TaskEvidenceEntity> batch = expiredPage.getRecords();
DistributedJobLockService.LockHandle lockHandle =
distributedJobLockService.tryLock(RETENTION_LOCK, Duration.ofMinutes(15));
if (lockHandle == null) {
// 点位字面量必须写死(LockSkipSilentExitGuardrailTest 的判据),与 RETENTION_LOCK 同值。
LockSkipWitness.skipped("task-evidence:retention");
log.info("[task-evidence] 保留期清理跳过:另一实例持锁");
return;
}
try (lockHandle) {
purgeExpiredLocked(LocalDateTime.now().minusDays(properties.retentionDaysOrDefault()));
} catch (Exception ex) {
log.warn("[task-evidence] 保留期清理失败 reason={}", ex.getMessage(), ex);
}
}
private void purgeExpiredLocked(LocalDateTime expireBefore) {
long afterId = 0L;
int removed = 0;
int failed = 0;
int batches = 0;
while (batches < MAX_RETENTION_BATCHES) {
List<TaskEvidenceEntity> batch = mapper.selectList(new LambdaQueryWrapper<TaskEvidenceEntity>()
.gt(TaskEvidenceEntity::getId, afterId)
.lt(TaskEvidenceEntity::getCreatedAt, expireBefore)
.orderByAsc(TaskEvidenceEntity::getId)
.last("limit " + RETENTION_BATCH));
if (batch.isEmpty()) {
return;
break;
}
int removed = 0;
batches++;
for (TaskEvidenceEntity entity : batch) {
afterId = entity.getId();
try {
storage.delete(entity.getObjectKey());
removed += mapper.deleteById(entity.getId());
} catch (RuntimeException ex) {
// 只跳过这一行:登记行留着,下一轮按同一条键集再试;后面的行绝不陪葬。
failed++;
log.warn("[task-evidence] retention delete failed id={} reason={}",
entity.getId(), ex.getMessage());
}
}
if (removed == 0) {
return;
}
log.info("[task-evidence] retention purge removed={} before={}", removed, expireBefore);
}
if (failed > 0) {
log.warn("[task-evidence] retention purge finished with failures removed={} failed={} batches={}",
removed, failed, batches);
} else if (removed > 0 || batches > 0) {
log.info("[task-evidence] retention purge removed={} batches={}", removed, batches);
}
}
/**
* P1-2 的归属判定:task_id 对得上库里的任务行时 uid 必须就是行主;对不上行(客户端本地
* 任务号,如商品采集的自有作业 id)只要求带 uid 自证——否则任何一个持内部令牌的客户端
* 都能往别人的取证面里挂证据。
*/
private void assertTaskOwnedBy(String taskId, Long uid) {
Long ownerId = resolveTaskOwnerId(taskId);
if (uid == null) {
throw new BusinessException(403, "证据登记必须携带任务归属用户");
}
if (ownerId != null && !ownerId.equals(uid)) {
throw new BusinessException(403, "证据件只能登记到本人任务上");
}
}
/** 数字串按主键查(超长数字串会溢出,降级走 task_no),其余按 task_no 点查。 */
private Long resolveTaskOwnerId(String taskId) {
FileTaskEntity row = null;
if (taskId.chars().allMatch(Character::isDigit)) {
try {
row = fileTaskMapper.selectById(Long.parseLong(taskId));
} catch (NumberFormatException overflow) {
row = null;
}
}
if (row == null) {
row = fileTaskMapper.selectOne(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getTaskNo, taskId)
.last("limit 1"));
}
return row == null ? null : row.getUserId();
}
private long countByTask(String taskId) {
Long count = mapper.selectCount(new LambdaQueryWrapper<TaskEvidenceEntity>()
.eq(TaskEvidenceEntity::getTaskId, taskId));
return count == null ? 0L : count;
}
private String normalizeTaskId(String taskId) {
@@ -202,13 +306,15 @@ public class TaskEvidenceService {
return value;
}
private String normalizeLabel(String value, String fallback) {
String text = value == null ? "" : value.trim();
private String normalizeLabel(String value, String fallback, Set<String> allowed) {
String text = value == null ? "" : value.trim().toLowerCase(Locale.ROOT);
if (text.isEmpty()) {
return fallback;
}
// 列宽是 VARCHAR(32),超长标签在这里截断而不是让 insert 抛数据截断错。
return text.length() > 32 ? text.substring(0, 32) : text;
// 列宽是 VARCHAR(32),超长标签在这里截断而不是让 insert 抛数据截断错;
// 不在白名单内的标签一律落 other,不让客户端自造类型污染取证面。
String normalized = text.length() > 32 ? text.substring(0, 32) : text;
return allowed.contains(normalized) ? normalized : "other";
}
private void deleteTempQuietly(File file) {
@@ -51,6 +51,11 @@ public class TaskEvidenceStorageService {
properties.bucketOrDefault(), objectKey, maxBytes);
}
/** P3-1:下载走流式,不把整个证据件读进堆。 */
public void downloadTo(String objectKey, java.io.OutputStream out, long maxBytes) {
ossStorageService.readObjectToStream(properties.bucketOrDefault(), objectKey, out, maxBytes);
}
public void delete(String objectKey) {
if (objectKey == null || objectKey.isBlank()) {
return;
@@ -51,13 +51,13 @@ public class ChunkedUploadService {
private static final ObjectMapper JSON = new ObjectMapper();
private static final String META_NAME = "meta.json";
/** 单个分片上限:比前端 16MB 分片留足余量,防一次请求把临时盘打满。 */
/** 单个分片上限:两端与客户端实际片大小均为 8MB(各自独立构建根,无共享常量),这里留 8 倍余量。 */
private static final long MAX_PART_BYTES = 64L * 1024 * 1024;
private final StorageProperties storageProperties;
/** 同一会话的落片/拼装/放弃串行化;会话结束即回收,避免长期驻留。 */
private final ConcurrentHashMap<String, Object> sessionLocks = new ConcurrentHashMap<>();
/** 同一会话的落片/拼装/放弃串行化;static 让统一清理(LocalTempCleanupService)拿到同一把锁。 */
private static final ConcurrentHashMap<String, Object> SESSION_LOCKS = new ConcurrentHashMap<>();
@Value("${aiimage.file.chunk-upload.max-total-bytes:2147483648}")
private long maxTotalBytes = 2L * 1024 * 1024 * 1024;
@@ -194,7 +194,7 @@ public class ChunkedUploadService {
"拼装后大小与声明不一致:声明 " + meta.totalBytes + ",实际 " + total);
}
deleteQuietly(sessionDir(uploadId));
sessionLocks.remove(uploadId);
SESSION_LOCKS.remove(uploadId);
String sha256 = HexFormat.of().formatHex(digest.digest());
log.info("[chunk-upload] 拼装完成 uploadId={} fileName={} bytes={} sha256={}",
uploadId, meta.fileName, total, sha256);
@@ -208,7 +208,7 @@ public class ChunkedUploadService {
synchronized (lockOf(uploadId)) {
deleteQuietly(sessionDir(uploadId));
}
sessionLocks.remove(uploadId);
SESSION_LOCKS.remove(uploadId);
log.info("[chunk-upload] 已放弃分片会话 uploadId={} fileName={}", uploadId, meta.fileName);
}
@@ -273,7 +273,21 @@ public class ChunkedUploadService {
}
private Object lockOf(String uploadId) {
return sessionLocks.computeIfAbsent(uploadId, key -> new Object());
return sessionLockOf(uploadId);
}
/**
* P2-3:统一清理与 savePart/complete 必须是<b>同一把</b>锁,所以锁身份收在这里而不是
* 各自 new 一份 map(两份 map 等于没锁)。锁的是盘上目录名,进程内互斥即够——
* 每台实例只清自己的 local-temp 目录,跨实例不存在同一块盘。
*/
public static Object sessionLockOf(String uploadId) {
return SESSION_LOCKS.computeIfAbsent(uploadId, key -> new Object());
}
/** 会话目录名形状(32 位十六进制);统一清理按它决定要不要拿会话锁。 */
public static boolean isSessionDirectoryName(String name) {
return name != null && UPLOAD_ID_PATTERN.matcher(name).matches();
}
/**
@@ -88,7 +88,7 @@ public class LocalTempCleanupService {
continue;
}
if (child.isDirectory() && CHUNK_UPLOAD_DIR_NAME.equals(child.getName())) {
deletedSourceCount += deleteExpiredChildrenRecursively(child, sourceExpireBefore);
deletedSourceCount += deleteExpiredChunkUploads(child, sourceExpireBefore);
// 删片会刷新会话目录 mtime,按"过期"再判目录会留下空壳;这里按空目录自底向上收口。
deleteEmptyDirectoriesDeep(child, tempDir);
}
@@ -126,6 +126,33 @@ public class LocalTempCleanupService {
return 0;
}
/**
* P2-3:分片会话的过期件回收必须与 savePart/complete 共用同一把会话锁——原来裸删,
* 在飞上传的半截会话可能被整点回收腰斩,用户的大档从 0 重来(正是断点续传要消灭的事)。
* 非会话名的残留(历史上漏下的散件)保持原路径。
*/
private int deleteExpiredChunkUploads(File chunkRoot, Instant expireBefore) {
int deletedCount = 0;
File[] sessions = chunkRoot.listFiles();
if (sessions == null) {
return 0;
}
for (File session : sessions) {
if (!PathSafetyGuard.isInside(chunkRoot, session)) {
log.warn("local temp cleanup skipped unsafe path: {}", session.getAbsolutePath());
continue;
}
if (ChunkedUploadService.isSessionDirectoryName(session.getName())) {
synchronized (ChunkedUploadService.sessionLockOf(session.getName())) {
deletedCount += deleteExpiredChildrenRecursively(session, expireBefore);
}
} else {
deletedCount += deleteExpiredChildrenRecursively(session, expireBefore);
}
}
return deletedCount;
}
private void deleteEmptyDirectories(File directory, File stopAt) {
File current = directory;
while (current != null && !current.equals(stopAt) && isDirectoryEmpty(current)) {
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
@@ -541,6 +542,35 @@ public class OssStorageService {
}
}
/**
* 流式读对象(P3-1):证据件下载不再把整对象读进堆;超上限时中止并抛 IllegalArgumentException。
*/
public void readObjectToStream(String bucket, String objectKey, OutputStream out, long maxBytes) {
String normalizedBucket = requireStorageName(bucket, "bucket");
String normalizedObjectKey = requireStorageName(objectKey, "objectKey");
try (var stream = buildClient().getObject(GetObjectArgs.builder()
.bucket(normalizedBucket)
.object(normalizedObjectKey)
.build())) {
byte[] buffer = new byte[64 * 1024];
long total = 0;
int read;
while ((read = stream.read(buffer)) != -1) {
total += read;
if (total > maxBytes) {
throw new IllegalArgumentException("对象过大,超过读取上限 " + maxBytes + " 字节: "
+ normalizedBucket + "/" + normalizedObjectKey);
}
out.write(buffer, 0, read);
}
out.flush();
} catch (IllegalArgumentException ex) {
throw ex;
} catch (Exception ex) {
throw storageFailure("read", normalizedBucket + "/" + normalizedObjectKey, ex);
}
}
/**
* Reads a managed result object from either its object key or stored public URL.
* This overload keeps callers from depending on the configured bucket name.
@@ -54,7 +54,8 @@ public class PermissionMenuService {
/** 角色内在闸门菜单:非超管看不见、谁也授不出去(设计文档 §8.1)。
* 与前端 src/config/company-scope.ts 的 SUPER_ADMIN_ONLY_MENU_KEYS 必须同值,由 Task 7 的跨端用例钉住。 */
private static final Set<String> SUPER_ADMIN_ONLY_KEYS = Set.of("admin_companies");
private static final Set<String> SUPER_ADMIN_ONLY_KEYS =
Set.of("admin_companies", "admin_task_evidence");
/**
* 管理/平台配置类菜单:出口仍是 {@code requireAdmin}(用户、菜单、分组、密钥、公司、版本、教程、
@@ -214,12 +214,6 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
private final SimilarAsinImagePrefetchService imagePrefetchService;
private final UserApiSecretService userApiSecretService;
/**
* 采集路由开关:字段注入,避免给 {@code @RequiredArgsConstructor} 加参数而牵连一批
* 手工 new 本类的测试。null(单测未注入)按「本地」处理,保持 activate 的原有行为。
*/
@org.springframework.beans.factory.annotation.Autowired(required = false)
private com.nanri.aiimage.config.CollectRoutingProperties collectRoutingProperties;
/**
* Task 89:Excel 行解析器(表头/单元格读取、别名匹配、空行跳过、单字段截断)。
* 由 parseAndCreateTask 委托;解析语义与搬移前 parseWorkbook 完全一致。
@@ -1409,7 +1409,9 @@ public class SimilarAsinPipelineSupport {
}
LlmBatchContext context = SimilarAsinPayloadSupport.readLlmBatchContext(objectMapper, state);
if (context == null || context.resultId() == null) {
markLlmStateTerminal(state, LLM_STATUS_FAILED, "LLM 批次上下文缺失");
markLlmStateTerminal(state, LLM_STATUS_FAILED, "LLM 异步工作流丢失批次上下文");
// S-4:异步分支同样要给"欠费/坏密钥"留整单判死出口;非致命错误时该方法是 no-op。
host.terminalizeOnFatalLlmFailure(taskForPoll(taskId), state.getLlmError());
continue;
}
List<SimilarAsinResultRowDto> batchRows = readLlmBatchRows(state);
@@ -1423,8 +1425,10 @@ public class SimilarAsinPipelineSupport {
allRowsByBaseId);
}
markLlmStateTerminal(state, LLM_STATUS_FAILED, "LLM 异步工作流轮询超时");
// S-4:轮询超时本身不是欠费;但若 state 上已带 LLM 欠费/坏密钥归因,走同一判死出口。
host.terminalizeOnFatalLlmFailure(task, state.getLlmError());
maybeFinalizeLlmJob(taskId, context);
log.warn("[similar-asin] 文件任务超时兜底已将 LLM pending 批次置为失败 taskId={} stateId={} jobId={}",
log.warn("[similar-asin] 异步工作流轮询超时,本批按行失败收口 taskId={} stateId={} jobId={}",
taskId, state.getId(), context.jobId());
}
}
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.softwareversion.service;
import cn.hutool.crypto.digest.DigestUtil;
import com.nanri.aiimage.common.security.CredentialPackageGuard;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
@@ -281,6 +282,7 @@ public class SoftwareVersionService {
deleteTempQuietly(source);
return toItemMap(existing);
}
rejectCredentialFiles(source);
String objectKey = softwareVersionObjectKey(normalizedVersion);
String fileUrl = ossStorageService.uploadSoftwareVersionPackage(source, objectKey);
SoftwareVersionEntity entity = new SoftwareVersionEntity();
@@ -296,6 +298,28 @@ public class SoftwareVersionService {
return toItemMap(saved == null ? entity : saved);
}
/**
* P2-4:版本包会进公开 client 桶、发给所有客户端;压缩包里带 .env/*.pem 的一律拒绝。
* 只读 zip 条目名,不解压内容。
*/
private void rejectCredentialFiles(File source) {
String entry;
try {
entry = CredentialPackageGuard.firstForbiddenEntry(source);
} catch (IOException ex) {
log.warn("[software-version] 安装包无法读取,拒绝发布 name={} reason={}",
source.getName(), ex.getMessage());
deleteTempQuietly(source);
throw new BusinessException("安装包无法读取或不是有效 zip,拒绝发布");
}
if (entry != null) {
log.warn("[software-version] 安装包含凭据文件,拒绝发布 name={} entry={}",
source.getName(), entry);
deleteTempQuietly(source);
throw new BusinessException("安装包含凭据文件,拒绝发布");
}
}
private void deleteTempQuietly(File file) {
if (file != null && file.exists() && !file.delete()) {
log.warn("[software-version] 清理分片临时件失败 path={}", file.getAbsolutePath());
@@ -25,4 +25,35 @@ public interface FileTaskMapper extends BaseMapper<FileTaskEntity> {
List<Long> selectExpiredTerminalTaskIds(@Param("moduleType") String moduleType,
@Param("cutoff") LocalDateTime cutoff,
@Param("batchSize") int batchSize);
/**
* 客户端兜底拉取候选:本用户 + 指定状态 + 白名单模块 + 创建早于 cutoff,且<b>这一单走本机通道</b>。
*
* <p>通道判定必须在 SQL 里、在 {@code LIMIT} 之前。2026-10-31 的 P1-1 把它写在 Java 侧
* (先 {@code limit 5} 取页、再 {@code filter(isLocal())}),混通道时只要排队里较老的 5 条是
* ONLINE,本机通道的单本轮及以后都领不到——不是延后,是排到队尾之前永久饿死。
*
* <p>只投影认领与组装载荷要用的列(其余字段由调用方 {@code selectById} 再取),
* 与迁移前的 Wrapper {@code select(...)} 逐字同形。
*/
List<FileTaskEntity> selectLocalChannelPendingTasks(@Param("userId") Long userId,
@Param("status") String status,
@Param("moduleTypes") List<String> moduleTypes,
@Param("localDefaultModules") List<String> localDefaultModules,
@Param("cutoff") LocalDateTime cutoff,
@Param("limit") int limit);
/**
* 服务端内部认领候选(Linux 后台 worker):指定状态 + 白名单模块 + 创建早于 cutoff,
* 且「不是本机通道」或「本机通道已等满兜底窗口 {@code localCutoff}」。
*
* <p>同样是 SQL 侧谓词:原先先按 {@code cutoff}(2 分钟)取页、再在 Java 里按 30 分钟让位,
* 一页里全是让位中的本机单时本轮线上单零吞吐。
*/
List<FileTaskEntity> selectInternalClaimCandidates(@Param("status") String status,
@Param("moduleTypes") List<String> moduleTypes,
@Param("localDefaultModules") List<String> localDefaultModules,
@Param("cutoff") LocalDateTime cutoff,
@Param("localCutoff") LocalDateTime localCutoff,
@Param("limit") int limit);
}
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.model;
import com.nanri.aiimage.config.CollectRoutingProperties;
import java.util.List;
import java.util.Locale;
/**
@@ -23,17 +24,28 @@ public enum CollectChannel {
/** 线上采集:Linux 后台 worker 或外机 Windows。 */
ONLINE;
private static final List<String> LOCAL_DEFAULT_MODULES = List.of(
CollectRoutingProperties.MODULE_APPEARANCE_PATENT,
CollectRoutingProperties.MODULE_SIMILAR_ASIN);
/**
* 未登记通道时读作 {@link #LOCAL} 的模块清单。
*
* <p>{@link #defaultFor(String)} 与 mapper 里那条通道谓词({@code FileTaskMapper.xml} 的
* {@code resolvedChannelCase})共用这一处真源:SQL 侧要的是同一份「哪些模块默认本机」,
* 两边各写一套就会出现「Java 认为该让位、SQL 却把它捞进候选」的分裂判据。
*/
public static List<String> localDefaultModuleTypes() {
return LOCAL_DEFAULT_MODULES;
}
/** 该模块在没有显式登记通道时的默认执行方。 */
public static CollectChannel defaultFor(String moduleType) {
if (moduleType == null || moduleType.isBlank()) {
return ONLINE;
}
String key = moduleType.trim().toUpperCase(Locale.ROOT);
if (CollectRoutingProperties.MODULE_APPEARANCE_PATENT.equals(key)
|| CollectRoutingProperties.MODULE_SIMILAR_ASIN.equals(key)) {
return LOCAL;
}
return ONLINE;
return LOCAL_DEFAULT_MODULES.contains(key) ? LOCAL : ONLINE;
}
/** 解析库里存的通道值;空或不可识别时回落到该模块的默认(不让一个脏值把单子永久饿死)。 */
@@ -1,6 +1,5 @@
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.config.CollectRoutingProperties;
import com.nanri.aiimage.config.InstanceMetadata;
@@ -139,22 +138,14 @@ public class TaskClientPullService {
log.warn("[client-task-pull] 模块白名单为空,本次不拉取 userId={}", userId);
return List.of();
}
// 通道由这一单自己说(V183 collect_channel):选了线上的单子客户端不能领,领了就是抢跑。
// 通道由这一单自己说(V183 collect_channel):选了线上的单子客户端不能领,领了就是抢跑,
// 所以判定必须发生在 SQL 里——先按 limit 取页、回到 Java 再 filter 的话,混通道时较老的
// N 条是 ONLINE 就把本机单永久挡在队尾之后(不是延后,是饿死)。
long startedAt = System.currentTimeMillis();
LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, minPendingMinutes));
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType,
FileTaskEntity::getCollectChannel, FileTaskEntity::getCreatedAt)
.eq(FileTaskEntity::getUserId, userId)
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
.in(FileTaskEntity::getModuleType, types)
.lt(FileTaskEntity::getCreatedAt, cutoff)
.orderByAsc(FileTaskEntity::getCreatedAt)
.last("limit " + safeLimit))
.stream()
.filter(task -> CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal())
.toList();
List<FileTaskEntity> candidates = fileTaskMapper.selectLocalChannelPendingTasks(
userId, STATUS_PENDING, types, CollectChannel.localDefaultModuleTypes(), cutoff, safeLimit);
if (candidates.isEmpty() && !types.isEmpty()) {
log.info("[client-task-pull] 白名单内没有本机通道的排队任务,本次不拉取 userId={} moduleTypes={}",
userId, moduleTypes);
@@ -195,27 +186,10 @@ public class TaskClientPullService {
Math.max(1L, internalMinPendingMinutes));
LocalDateTime localCutoff = now.minusMinutes(localFallbackMinutes);
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType,
FileTaskEntity::getCollectChannel, FileTaskEntity::getCreatedAt)
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
.in(FileTaskEntity::getModuleType, types)
.lt(FileTaskEntity::getCreatedAt, cutoff)
.orderByAsc(FileTaskEntity::getCreatedAt)
.last("limit " + safeLimit));
if (!candidates.isEmpty()) {
int before = candidates.size();
// 让位只看这一单的通道:本机通道的单子等满兜底窗口才接管,选了线上的立刻可领
candidates = candidates.stream()
.filter(task -> !CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal()
|| task.getCreatedAt() == null
|| !task.getCreatedAt().isAfter(localCutoff))
.toList();
if (candidates.size() < before) {
log.info("[client-task-pull] 内部认领让位本机:本轮跳过 {} 条 LOCAL 通道的排队任务(兜底窗口 {} 分钟)",
before - candidates.size(), localFallbackMinutes);
}
}
// 让位判定同样在 SQL 里(与客户端拉取同一个形状):原先按 cutoff 取一页再在 Java 里按
// localCutoff 让位,整页都是「本机通道且还没等满兜底窗口」时,本轮线上单一条也领不到。
List<FileTaskEntity> candidates = fileTaskMapper.selectInternalClaimCandidates(
STATUS_PENDING, types, CollectChannel.localDefaultModuleTypes(), cutoff, localCutoff, safeLimit);
if (candidates.isEmpty()) {
return List.of();
}
@@ -240,17 +240,20 @@ public class TaskFileJobService {
}
/**
* 终态父任务的 job 直接拉满重试:不执行、不再被下一轮扫到。
* 终态父任务的 job 也放行认领(P1-13 根治):这张表只有 ASSEMBLE_RESULT 一种作业,
* 它的唯一职责是把<b>已回传的数据</b>拼成表,不消耗任何外部资源——父任务已终态恰恰
* 意味着数据已定型,此时出表才是对的。原先在这里无条件判死,出表只剩「卡死扫描
* 捞 FAILED+retry 到顶」一条补偿路径:至少一个扫描周期的窗口里用户停在红字,
* 兜底再一失败那张本可以出的表就永远出不来(2026-10-31 现网任务 33062 取证)。
*
* <p>终态回调要留给卡死扫描的失败兜底({@code fallbackAssembleOnFailure}):外观专利等模块
* 靠它用已回传分片出部分结果文件,「起码失败了也可以下载」才不会被 B28 的终态守卫顺手掐掉。
* 这里若直接打 {@code terminal_callback_at},兜底扫描再也捞不到这行,用户只剩红字、连半张表都没有。
* <p>终态守卫的本意是「终态后别再继续检测、停心跳续期」,保留在
* {@code TaskResultFileJobWorker} 的心跳层(stage=TERMINAL_STOP_RENEW);
* 出表执行与任务结论脱钩(铁律 14):组装只写 biz_file_result,biz_file_task
* 的 status/error_message 一字不动。
*/
private void skipJobOfTerminalTask(TaskFileJobEntity job, String stage) {
String message = "父任务已终态,结果作业不再执行";
markFailedPermanentAwaitingFallback(job, message);
log.info("[task-file-job] skipped because parent task is terminal jobId={} taskId={} moduleType={} stage={}",
job.getId(), job.getTaskId(), job.getModuleType(), stage);
private void noteTerminalTaskStillDeliverable(TaskFileJobEntity job) {
log.info("[task-file-job] parent task terminal; ASSEMBLE_RESULT still delivers jobId={} taskId={} moduleType={} stage=TERMINAL_ASSEMBLE",
job.getId(), job.getTaskId(), job.getModuleType());
}
private List<TaskFileJobEntity> claimCandidates(List<TaskFileJobEntity> candidates) {
@@ -263,8 +266,7 @@ public class TaskFileJobService {
continue;
}
if (isOwningTaskTerminal(candidate.getTaskId())) {
skipJobOfTerminalTask(candidate, "CLAIM");
continue;
noteTerminalTaskStillDeliverable(candidate);
}
if (markRunning(candidate.getId())) {
claimedIds.add(candidate.getId());
@@ -629,8 +631,8 @@ public class TaskFileJobService {
}
TaskFileJobEntity existing = taskFileJobMapper.selectById(jobId);
if (existing != null && isOwningTaskTerminal(existing.getTaskId())) {
skipJobOfTerminalTask(existing, "CLAIM_RUNNING");
return null;
// P1-13:终态父任务也放行认领(见 noteTerminalTaskStillDeliverable),出表不因终态停摆。
noteTerminalTaskStillDeliverable(existing);
}
if (!markRunning(jobId)) {
return null;
@@ -260,12 +260,9 @@ public class TaskResultFileJobWorker {
}
private void processClaimedWithHeartbeat(TaskFileJobEntity job, TaskFileJobEntity claim) {
if (taskFileJobService.isOwningTaskTerminal(job.getTaskId())) {
taskFileJobService.markFailedPermanentAwaitingFallback(job, "父任务已终态,结果作业不再执行");
log.info("[task-file-job] skipped because parent task is terminal jobId={} taskId={} moduleType={} stage=TERMINAL_SKIP",
job.getId(), job.getTaskId(), job.getModuleType());
return;
}
// P1-13:不再在执行入口按父任务终态判死——这张表只有纯出表作业,终态恰恰说明数据
// 已定型,此时出表才是对的(2026-10-31 现网任务 33062:守卫判死 + 兜底 50 秒后才有表,
// 窗口里用户只剩红字)。终态的「别再检测」语义保留在心跳层(stage=TERMINAL_STOP_RENEW)。
if (!taskFileJobService.activateRunningClaim(claim)) {
log.info("[task-file-job] queued claim expired before execution jobId={} taskId={} moduleType={} claimUpdatedAt={}",
job.getId(), job.getTaskId(), job.getModuleType(), claim.getUpdatedAt());
@@ -295,7 +292,9 @@ public class TaskResultFileJobWorker {
job.getId(), job.getTaskId(), job.getModuleType());
return;
}
taskFileJobService.markFailedPermanentAwaitingFallback(job, "父任务已终态,结果作业不再执行");
// P1-13:这条只该在「执行真的没产出结果」时走到——出表已放行,没出成表才是遗骸,
// 留给兜底扫描出部分结果(幂等重入)。
taskFileJobService.markFailedPermanentAwaitingFallback(job, "父任务已终态且本次执行未产出结果文件");
log.info("[task-file-job] parent task terminal after execution; failed job for fallback jobId={} taskId={} moduleType={} stage=TERMINAL_AFTER_EXECUTION",
job.getId(), job.getTaskId(), job.getModuleType());
}
@@ -328,14 +327,6 @@ public class TaskResultFileJobWorker {
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId());
return;
}
if (taskFileJobService.isOwningTaskTerminal(job.getTaskId())) {
try (lockHandle) {
taskFileJobService.markFailedPermanentAwaitingFallback(job, "父任务已终态,结果作业不再执行");
}
log.info("[task-file-job] skipped after acquiring lock because parent task is terminal jobId={} taskId={} moduleType={} stage=TERMINAL_AFTER_LOCK",
job.getId(), job.getTaskId(), job.getModuleType());
return;
}
activeLockHandles.put(job.getId(), lockHandle);
try (lockHandle) {
latest = taskFileJobService.findById(job.getId());
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.tutorial.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.CredentialPackageGuard;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.tutorial.mapper.TutorialPackageMapper;
@@ -11,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -160,6 +162,7 @@ public class TutorialPackageService {
}
return toItemMap(existing);
}
rejectCredentialFiles(source);
String generatedKey = OBJECT_KEY_PREFIX + OBJECT_NAME_FORMATTER.format(LocalDateTime.now())
+ "-" + safeFileName(normalizedName);
ossStorageService.uploadTutorialPackage(source, generatedKey);
@@ -262,6 +265,29 @@ public class TutorialPackageService {
}
}
/** P2-4:教程包同样进公开 client 桶,压缩包里带 .env/*.pem 的一律拒绝。 */
private void rejectCredentialFiles(java.io.File source) {
String entry;
try {
entry = CredentialPackageGuard.firstForbiddenEntry(source);
} catch (IOException ex) {
log.warn("[tutorial] 教程包无法读取,拒绝发布 name={} reason={}",
source.getName(), ex.getMessage());
if (source.exists() && !source.delete()) {
log.warn("[tutorial] 清理拒绝的临时件失败 path={}", source.getAbsolutePath());
}
throw new BusinessException("教程包无法读取或不是有效 zip,拒绝发布");
}
if (entry != null) {
log.warn("[tutorial] 教程包含凭据文件,拒绝发布 name={} entry={}",
source.getName(), entry);
if (source.exists() && !source.delete()) {
log.warn("[tutorial] 清理拒绝的临时件失败 path={}", source.getAbsolutePath());
}
throw new BusinessException("教程包含凭据文件,拒绝发布");
}
}
private String requireZipFileName(String fileName) {
String normalized = fileName == null ? "" : fileName.trim();
if (normalized.isEmpty()) {
@@ -37,6 +37,8 @@ AIIMAGE_OSS_ACCESS_KEY_SECRET=change-me
# 任务异常现场证据件(v1.2 Phase 3):独立桶与保留期必须显式配置;桶不得复用 nanri-ai-images。
AIIMAGE_EVIDENCE_OSS_BUCKET=task-evidence
AIIMAGE_EVIDENCE_RETENTION_DAYS=7
AIIMAGE_EVIDENCE_RETENTION_CRON=0 30 3 * * *
AIIMAGE_EVIDENCE_MAX_FILE_BYTES=67108864
AIIMAGE_EVIDENCE_KEY_PREFIX=task-evidence/
# 工作台客户端包直传预签名有效期(秒);90MB 级包在慢公网入口需要更长窗口。
@@ -0,0 +1,50 @@
-- V184: 兜底拉取与证据保留期两条取页路径的缺失索引(CR 第二轮 P1-1 同批 / P2-1)
--
-- 1) biz_file_task(status, module_type, created_at)
-- TaskClientPullService 的通道谓词从 Java 侧下推进 SQL 之后,内部认领(Linux worker)这一支
-- 的真实谓词就是 status='PENDING' AND module_type IN (...) AND created_at < ? ORDER BY created_at。
-- 现有索引里没有一条以 status 打头再跟 module_type(V120 是 (status, updated_at)、
-- V34 是 (module_type, user_id, created_at)、V92 是 (owner_instance_id, status, updated_at)),
-- 于是每轮按 PENDING 全集排序。
-- collect_channel 有意不进索引:通道判定写成 CASE(NULL 值在 SQL 三值逻辑下必须兜成模块默认,
-- 直接比值会让「未登记通道的非本机模块」被 NOT 判成 UNKNOWN 而永久领不到),表达式谓词不吃索引;
-- PENDING 本身是被本索引筛小的那一层,量级 = 在排队的单子。
-- 2) biz_task_evidence(created_at)
-- V182 只建了 (task_id, created_at):保留期回收的谓词是单列 created_at < ?,前导列不符 ⇒
-- purgeExpired 每一批全表扫,而这张表按「异常即产件」只增不减。
--
-- 风险:ALTER TABLE ADD INDEX 需申请元数据锁(MySQL 8 在线 DDL,INPLACE),建议低峰执行;
-- 本迁移按 information_schema 判存,重跑不会因索引已存在而失败。
-- 回滚(手工):
-- ALTER TABLE biz_file_task DROP INDEX idx_biz_file_task_status_module_created;
-- ALTER TABLE biz_task_evidence DROP INDEX idx_task_evidence_created_at;
SET @db_name = DATABASE();
-- 1) biz_file_task(status, module_type, created_at)
SET @idx_exists := (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_file_task'
AND INDEX_NAME = 'idx_biz_file_task_status_module_created'
);
SET @sql := IF(@idx_exists = 0,
'ALTER TABLE biz_file_task ADD INDEX idx_biz_file_task_status_module_created (status, module_type, created_at)',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- 2) biz_task_evidence(created_at)
SET @idx_exists := (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_task_evidence'
AND INDEX_NAME = 'idx_task_evidence_created_at'
);
SET @sql := IF(@idx_exists = 0,
'ALTER TABLE biz_task_evidence ADD INDEX idx_task_evidence_created_at (created_at)',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
@@ -0,0 +1,15 @@
-- 迁移 V185:后台菜单「任务证据」(v1.2 P1-9 / R3 后管可视)
--
-- 证据件读取面 /api/admin/task-evidence/** 已按 requireSuperAdmin 收口,但后台没有入口,
-- 等于「能上传、能登记、没人看得见」。这里只新增一条菜单行,挂在「记录与版本」分组下,
-- 幂等插入:column_key 已存在时不再写第二行。
--
-- 回滚:DELETE FROM columns WHERE column_key='admin_task_evidence';
INSERT INTO columns (name, column_key, menu_type, route_path, sort_order, parent_id)
SELECT '任务证据', 'admin_task_evidence', 'admin', 'records/task-evidence', 84, parent.id
FROM columns parent
WHERE parent.column_key = 'admin_group_record'
AND NOT EXISTS (
SELECT 1 FROM columns WHERE column_key = 'admin_task_evidence'
);
@@ -11,4 +11,48 @@
ORDER BY id ASC
LIMIT #{batchSize}
</select>
<!-- 这一单的执行通道,SQL 侧的 CollectChannel.resolve:登记过就按登记的算,
没登记(NULL)或存了不可识别值的按模块默认兜(localDefaultModules 由
CollectChannel.localDefaultModuleTypes() 传进来,两边共用一处真源)。
写成 CASE 而不是 collect_channel = 'LOCAL' OR …:后者在列为 NULL 时整个谓词吃三值逻辑
变成 UNKNOWN,NOT 之后仍不成立,会被默认兜成 ONLINE 的模块(COLLECT_DATA 等)就此领不到。 -->
<sql id="resolvedChannelCase">
CASE
WHEN collect_channel IN ('LOCAL', 'ONLINE') THEN collect_channel
WHEN module_type IN
<foreach collection="localDefaultModules" item="localDefaultModule" open="(" separator="," close=")">#{localDefaultModule}</foreach>
THEN 'LOCAL'
ELSE 'ONLINE'
END
</sql>
<!-- 客户端兜底拉取候选(P1-1):通道谓词与 status/模块/时间窗口同在 WHERE 里,LIMIT 之后不再有 Java 过滤。 -->
<select id="selectLocalChannelPendingTasks"
resultType="com.nanri.aiimage.modules.task.model.entity.FileTaskEntity">
SELECT id, module_type, collect_channel, created_at
FROM biz_file_task
WHERE user_id = #{userId}
AND status = #{status}
AND module_type IN
<foreach collection="moduleTypes" item="module" open="(" separator="," close=")">#{module}</foreach>
AND created_at &lt; #{cutoff}
AND <include refid="resolvedChannelCase"/> = 'LOCAL'
ORDER BY created_at ASC
LIMIT #{limit}
</select>
<!-- 服务端内部认领候选(P1-1 同形状):本机通道的单要让位给本地客户端,等满兜底窗口才接管。 -->
<select id="selectInternalClaimCandidates"
resultType="com.nanri.aiimage.modules.task.model.entity.FileTaskEntity">
SELECT id, module_type, collect_channel, created_at
FROM biz_file_task
WHERE status = #{status}
AND module_type IN
<foreach collection="moduleTypes" item="module" open="(" separator="," close=")">#{module}</foreach>
AND created_at &lt; #{cutoff}
AND (NOT (<include refid="resolvedChannelCase"/> = 'LOCAL') OR created_at &lt;= #{localCutoff})
ORDER BY created_at ASC
LIMIT #{limit}
</select>
</mapper>
@@ -74,7 +74,9 @@ class MigratedSqlEquivalenceTest {
// 99 → 100:Phase 5(AC-19)为任务中心深翻页新增窄锚点语句 {@code TaskCenterQueryMapper#selectTaskPageAnchor}
// (两列投影算页首游标),同轮点名进 NOT_MIGRATED;同轮的 selectTaskPage 改写让它从账本搬进
// NOT_MIGRATED(select 总数不变,只是记账位置换了)。
private static final int XML_SELECT_TOTAL = 100;
// 100 → 102:P1-1 把两条认领查询的通道谓词下推进 SQL,FileTaskMapper 新写 2 条 select,
// 逐条点名进 NOT_MIGRATED(SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 144 → 146)。
private static final int XML_SELECT_TOTAL = 102;
/**
* 不是「从注解搬过来」的语句:注解时代没有原文可对撞,等价性这支只能跳过它们。
@@ -135,7 +137,13 @@ class MigratedSqlEquivalenceTest {
// 所以整行从 migrated-statements.tsv 摘掉、点名到这里(LEDGER_ROWS 85→84)。
// selectTaskPageAnchor —— 本轮新写的两列窄投影,从来没有注解原文可对撞。
"TaskCenterQueryMapper#selectTaskPage",
"TaskCenterQueryMapper#selectTaskPageAnchor");
"TaskCenterQueryMapper#selectTaskPageAnchor",
// P1-1(2026-10-31):客户端兜底拉取与服务端内部认领的通道谓词从 Java 层下推进 SQL
// ——先 limit 取页再 filter(isLocal()) 会让本机单被前面的线上单永久挡死。两条都是
// 本轮新写的 select,从来没有注解原文可对撞(XML_SELECT_TOTAL 同轮 100 → 102,
// SqlLayeringConventionTest.XML_STATEMENT_TOTAL 同轮 144 → 146)。
"FileTaskMapper#selectLocalChannelPendingTasks",
"FileTaskMapper#selectInternalClaimCandidates");
/** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */
private static final int LEDGER_COLUMNS = 5;
@@ -91,7 +91,11 @@ class SqlLayeringConventionTest {
// 143 → 144:Phase 5(AC-19/P1-B1)为任务中心深翻页新增窄锚点语句
// {@code TaskCenterQueryMapper#selectTaskPageAnchor}(两列投影算页首游标),
// 同轮登记进 MigratedSqlEquivalenceTest.NOT_MIGRATED(该文件的 XML_SELECT_TOTAL 同轮 99 → 100)。
private static final int XML_STATEMENT_TOTAL = 144;
// 144 → 146:P1-1(2026-10-31)把「这一单交本机还是交线上」的判定从 Java 层下推进 SQL——
// 原形状是先 limit 取页再 filter(isLocal()),混通道时较老的 N 条是 ONLINE 就把本机单永久饿死。
// FileTaskMapper 新写 2 条 select(客户端兜底拉取 / 服务端内部认领),同轮登记进
// MigratedSqlEquivalenceTest.NOT_MIGRATED(该文件 XML_SELECT_TOTAL 同轮 100 → 102)。
private static final int XML_STATEMENT_TOTAL = 146;
/**
* wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数:
@@ -0,0 +1,68 @@
package com.nanri.aiimage.common.security;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/** P2-4:版本包/教程包发布前的压缩包凭据件扫描。 */
class CredentialPackageGuardTest {
@TempDir
Path tempDir;
private File zipWith(String... entries) throws IOException {
File zip = tempDir.resolve("pkg-" + System.nanoTime() + ".zip").toFile();
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(zip.toPath()))) {
for (String entry : entries) {
out.putNextEntry(new ZipEntry(entry));
out.write("x".getBytes(StandardCharsets.UTF_8));
out.closeEntry();
}
}
return zip;
}
@Test
void nestedDotEnvIsRejected() throws IOException {
File pkg = zipWith("app/readme.txt", "app/conf/.env");
assertEquals("app/conf/.env", CredentialPackageGuard.firstForbiddenEntry(pkg));
}
@Test
void envVariantAndKeyMaterialAreRejected() throws IOException {
assertEquals("docs/.env.production",
CredentialPackageGuard.firstForbiddenEntry(zipWith("docs/.env.production")));
assertEquals("certs/server.PEM",
CredentialPackageGuard.firstForbiddenEntry(zipWith("certs/server.PEM")));
assertEquals("tools/kw_share_cfg.json",
CredentialPackageGuard.firstForbiddenEntry(zipWith("tools/kw_share_cfg.json")));
}
@Test
void ordinaryPackagePasses() throws IOException {
assertNull(CredentialPackageGuard.firstForbiddenEntry(
zipWith("app/readme.txt", "app/config/app.yml", "app/update/update.exe")));
}
@Test
void missingOrNonZipFileFailsClosed() throws IOException {
File notZip = tempDir.resolve("not-a-zip.zip").toFile();
Files.writeString(notZip.toPath(), "plain text");
IOException missing = assertThrows(IOException.class,
() -> CredentialPackageGuard.firstForbiddenEntry(tempDir.resolve("absent.zip").toFile()));
assertTrue(missing.getMessage().contains("missing"));
assertThrows(IOException.class, () -> CredentialPackageGuard.firstForbiddenEntry(notZip));
}
}
@@ -62,7 +62,8 @@ class CatchSilenceRatchetTest {
// 10-30 用户端代理白名单(极客/青果)抬 591 -> 598(7 处逐一记名见 STRICT_TOTAL 上方注释;
// 实测量到 599,多出的 1 格来自已提交的 79b04afd(AdminApiGuardFilter 编码绕过 catch),见同处说明)。
// 10-31 Phase 5.1:证据登记失败回收对象一枚(内层回收失败只 WARN),599 -> 600。
static final int GIVEN_NOT_RETHROW = 600;
// 10-31 CR 消项:证据保留期清理失败 WARN 兜底 + 任务号溢出回落 task_no,新增 2 处非抛分支,600 -> 602。
static final int GIVEN_NOT_RETHROW = 602;
static final int GIVEN_LOG_ONLY = 249;
static final int GIVEN_EMPTY = 56;
@@ -280,7 +281,8 @@ class CatchSilenceRatchetTest {
* 后转业务错误(RETHROW+rethrow 401);内层 catch 是对象回收本身失败只 WARN
* (LOG_ONLY+logOnly 190)。两处误差方向都是「不让孤儿对象永久占桶」。
*/
static final int STRICT_TOTAL = 1057;
// 10-31 CR 消项:版本包/教程包凭据扫描新增 6 处 catch(均转业务异常或带 WARN),1057 -> 1063。
static final int STRICT_TOTAL = 1063;
/**
* 重抛型 catch 的**下限**(不是上限):本轮把两处吞异常改成重抛之后实测 388。
* 这一格只能涨不能跌——它是"异常会往外走"的总量,把它钉成"只许减"就等于拦着别人修吞异常。
@@ -404,7 +406,7 @@ class CatchSilenceRatchetTest {
* (畸形编码保持原样交给容器 400),非本批新增,说明见 STRICT_TOTAL 上方。
*/
// 10-31 Phase 5.1:同 GIVEN_NOT_RETHROW,证据登记补偿回收失败只 WARN,599 -> 600。
static final int STRICT_NOT_RETHROW = 600;
static final int STRICT_NOT_RETHROW = 602;
/**
* 10-17 抬 172 -> 173,出处就是上面点名过的 {@code TaskHeartbeatLivenessService.stamp()}:
* 块体只有「取到 key 名 + log.warn」一句,写心跳证据失败时既不重试也不抛出——
@@ -9,7 +9,6 @@ import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.service.ResultDownloadResolver;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.config.CollectRoutingProperties;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient;
@@ -68,7 +67,7 @@ class AppearancePatentActivateRoutingTest {
FileTaskEntity task = pendingTask(com.nanri.aiimage.modules.task.model.CollectChannel.LOCAL);
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
AppearancePatentTaskService service = service(new CollectRoutingProperties());
AppearancePatentTaskService service = service();
service.activateTask(TASK_ID, USER_ID);
@@ -85,12 +84,12 @@ class AppearancePatentActivateRoutingTest {
void 线上通道的单_activate_保持后台语义并明确拒绝() {
when(fileTaskMapper.selectById(TASK_ID))
.thenReturn(pendingTask(com.nanri.aiimage.modules.task.model.CollectChannel.ONLINE));
AppearancePatentTaskService service = service(new CollectRoutingProperties());
AppearancePatentTaskService service = service();
BusinessException error = assertThrows(BusinessException.class,
() -> service.activateTask(TASK_ID, USER_ID));
assertTrue(String.valueOf(error.getMessage()).contains("后台自动执行"), error.getMessage());
assertTrue(String.valueOf(error.getMessage()).contains("线上采集"), error.getMessage());
verify(fileTaskMapper, never()).update(isNull(), any());
}
@@ -100,7 +99,7 @@ class AppearancePatentActivateRoutingTest {
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
service(new CollectRoutingProperties()).activateTask(TASK_ID, USER_ID);
service().activateTask(TASK_ID, USER_ID);
verify(taskCacheService).touchTaskHeartbeat(TASK_ID);
}
@@ -115,7 +114,7 @@ class AppearancePatentActivateRoutingTest {
return task;
}
private AppearancePatentTaskService service(CollectRoutingProperties routing) {
private AppearancePatentTaskService service() {
AppearancePatentTaskService service = new AppearancePatentTaskService(
mock(com.nanri.aiimage.modules.file.service.LocalFileStorageService.class),
null,
@@ -139,7 +138,6 @@ class AppearancePatentActivateRoutingTest {
mock(InstanceMetadata.class),
mock(TaskProgressLightAssembler.class),
mock(UserApiSecretService.class));
ReflectionTestUtils.setField(service, "collectRoutingProperties", routing);
return service;
}
@@ -0,0 +1,189 @@
package com.nanri.aiimage.modules.evidence.service;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.config.EvidenceProperties;
import com.nanri.aiimage.modules.evidence.mapper.TaskEvidenceMapper;
import com.nanri.aiimage.modules.evidence.model.entity.TaskEvidenceEntity;
import com.nanri.aiimage.modules.evidence.storage.TaskEvidenceStorageService;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
/**
* 证据登记的归属与保留期的执行保证(CR 第二轮 P1-2/P1-7/P2-2)。
*
* <p>P1-2 的判据是「归属先于落桶」:task_id 对得上任务行而 uid 不是行主 ⇒ 403 且
* {@code storage.store} 一次都不许被调——校验晚于落桶的话,每一次拒绝都在证据桶里
* 留一个收不回的孤儿对象。P1-7 的判据是「保留期必须有执行者且不堵车」:拿不到分布式锁
* 要走可聚合出口;单个对象删除失败只牺牲那一行,键集继续往前走。
*/
class TaskEvidenceOwnershipAndRetentionTest {
private static final String TASK_ID = "33062";
private final TaskEvidenceMapper mapper = mock(TaskEvidenceMapper.class);
private final TaskEvidenceStorageService storage = mock(TaskEvidenceStorageService.class);
private final LocalFileStorageService localFiles = mock(LocalFileStorageService.class);
private final EvidenceProperties properties = new EvidenceProperties();
private final FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
private final DistributedJobLockService locks = mock(DistributedJobLockService.class);
@TempDir
Path tempDir;
@Test
void 他人任务的证据必须403且一次都不落桶() throws Exception {
stubTaskOwner(7L);
stubUploadableFile();
BusinessException ex = assertThrows(BusinessException.class,
() -> service().register(TASK_ID, 8L, "client", "goods-spider", "evidence.json"));
assertEquals(403, ex.getCode().intValue(), "冒名登记必须 403,不是 500 也不是静默成功");
verify(storage, never()).store(any(), any(), any());
verify(mapper, never()).insert(any(TaskEvidenceEntity.class));
}
@Test
void 无归属uid的登记必须拒绝() throws Exception {
stubTaskOwner(7L);
stubUploadableFile();
assertThrows(BusinessException.class,
() -> service().register(TASK_ID, null, "client", "goods-spider", "evidence.json"));
verify(storage, never()).store(any(), any(), any());
}
@Test
void 本人任务照常登记且登记行带上uid() throws Exception {
stubTaskOwner(7L);
Path file = stubUploadableFile();
when(storage.store(any(), eq(TASK_ID), eq("evidence.json"))).thenReturn(
new TaskEvidenceStorageService.StoredEvidence("task-evidence/k", 3L, "sha", "application/json"));
when(mapper.insert(any(TaskEvidenceEntity.class))).thenReturn(1);
service().register(TASK_ID, 7L, "client", "goods-spider", "evidence.json");
org.mockito.ArgumentCaptor<TaskEvidenceEntity> captor =
org.mockito.ArgumentCaptor.forClass(TaskEvidenceEntity.class);
verify(mapper).insert(captor.capture());
assertEquals(7L, captor.getValue().getUid(), "登记行的 uid 必须是行主本人");
assertEquals(TASK_ID, captor.getValue().getTaskId());
assertTrue(Files.notExists(file) || Files.exists(file), "临时件清理失败只留 warn,不影响登记");
}
@Test
void 客户端本地任务号带uid自证即可登记() throws Exception {
when(fileTaskMapper.selectById(anyLong())).thenReturn(null);
when(fileTaskMapper.selectOne(any())).thenReturn(null);
stubUploadableFile();
when(storage.store(any(), any(), any())).thenReturn(
new TaskEvidenceStorageService.StoredEvidence("task-evidence/k", 3L, "sha", "application/json"));
when(mapper.insert(any(TaskEvidenceEntity.class))).thenReturn(1);
service().register("local-job-abc", 5L, "client", "goods-spider", "evidence.json");
verify(storage).store(any(), eq("local-job-abc"), eq("evidence.json"));
}
@Test
void 零字节证据件拒绝登记() throws Exception {
when(fileTaskMapper.selectById(anyLong())).thenReturn(null);
when(fileTaskMapper.selectOne(any())).thenReturn(null);
Path empty = Files.createFile(tempDir.resolve("empty.png"));
when(localFiles.findLocalSourceFile("empty.png")).thenReturn(empty.toFile());
assertThrows(BusinessException.class,
() -> service().register(TASK_ID, 7L, "client", "goods-spider", "empty.png"));
verify(storage, never()).store(any(), any(), any());
}
@Test
void 同任务证据件数到上限必须拒绝() throws Exception {
when(fileTaskMapper.selectById(anyLong())).thenReturn(null);
when(fileTaskMapper.selectOne(any())).thenReturn(null);
when(mapper.selectCount(any())).thenReturn(50L);
stubUploadableFile();
assertThrows(BusinessException.class,
() -> service().register(TASK_ID, 7L, "client", "goods-spider", "evidence.json"));
verify(storage, never()).store(any(), any(), any());
}
@Test
void 清理拿不到锁必须走可聚合出口且不碰库() {
long before = LockSkipWitness.countOf(TaskEvidenceService.RETENTION_LOCK);
when(locks.tryLock(eq(TaskEvidenceService.RETENTION_LOCK), any())).thenReturn(null);
service().purgeExpired();
assertEquals(before + 1, LockSkipWitness.countOf(TaskEvidenceService.RETENTION_LOCK),
"锁跳过必须有 [lock-skip] 可聚合出口,静默 return 就是 P1-7 的另一半");
verifyNoInteractions(mapper, storage);
}
@Test
void 单个对象删除失败不堵后面的行() {
when(locks.tryLock(eq(TaskEvidenceService.RETENTION_LOCK), any()))
.thenReturn(mock(DistributedJobLockService.LockHandle.class));
TaskEvidenceEntity first = evidenceRow(1L, "k1");
TaskEvidenceEntity stuck = evidenceRow(2L, "k2");
TaskEvidenceEntity third = evidenceRow(3L, "k3");
when(mapper.selectList(any())).thenReturn(List.of(first, stuck, third), List.of());
doThrow(new RuntimeException("oss unavailable")).when(storage).delete("k2");
when(mapper.deleteById(anyLong())).thenReturn(1);
service().purgeExpired();
verify(mapper).deleteById(1L);
verify(mapper, never()).deleteById(2L);
verify(mapper).deleteById(3L);
}
private TaskEvidenceService service() {
return new TaskEvidenceService(mapper, storage, localFiles, properties, fileTaskMapper, locks);
}
private void stubTaskOwner(long uid) {
FileTaskEntity row = new FileTaskEntity();
row.setId(Long.parseLong(TASK_ID));
row.setUserId(uid);
when(fileTaskMapper.selectById(Long.parseLong(TASK_ID))).thenReturn(row);
}
private Path stubUploadableFile() throws Exception {
Path file = tempDir.resolve("evidence.json");
Files.writeString(file, "{\"traceback\": \"boom\"}");
when(localFiles.findLocalSourceFile("evidence.json")).thenReturn(file.toFile());
return file;
}
private static TaskEvidenceEntity evidenceRow(long id, String objectKey) {
TaskEvidenceEntity row = new TaskEvidenceEntity();
row.setId(id);
row.setTaskId(TASK_ID);
row.setObjectKey(objectKey);
return row;
}
}
@@ -0,0 +1,145 @@
package com.nanri.aiimage.modules.softwareversion.service;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.softwareversion.mapper.SoftwareVersionMapper;
import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.ArgumentCaptor;
import org.springframework.test.util.ReflectionTestUtils;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
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.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* 版本包「分片拼装件 → confirm 搬桶落库」这条通道的契约(CR 第二轮 P1-8)。
*
* <p>新重载 {@code confirmSoftwareVersion(version, fileKey)} 写好之后长期没有任何执行证据
* (后端整量绿也覆盖不到没被调用的分支)。幂等命中、临时件清理、缺件拒绝这三条是发版
* 判据:任何一条破掉,要么重试会插出双版本行,要么临时件永远堆在盘上。
*/
class SoftwareVersionServiceChunkConfirmTest {
private final SoftwareVersionMapper versionMapper = mock(SoftwareVersionMapper.class);
private final OssStorageService ossStorageService = mock(OssStorageService.class);
private final LocalFileStorageService localFiles = mock(LocalFileStorageService.class);
@TempDir
Path tempDir;
@BeforeAll
static void initializeMybatisMetadata() {
TableInfoHelper.initTableInfo(
new MapperBuilderAssistant(new MybatisConfiguration(), ""), SoftwareVersionEntity.class);
}
private SoftwareVersionService service() {
SoftwareVersionService service = new SoftwareVersionService(versionMapper, ossStorageService);
ReflectionTestUtils.setField(service, "localFileStorageService", localFiles);
return service;
}
@Test
void 分片确认搬桶落库并标记最新且临时件清掉() throws Exception {
Path zip = writeZip("4.0.69.zip");
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(zip.toFile());
when(ossStorageService.uploadSoftwareVersionPackage(any(), any()))
.thenReturn("https://oss.aishufu.top/client/nanri-image/versions/4.0.69.zip");
when(versionMapper.insert(any(SoftwareVersionEntity.class))).thenAnswer(invocation -> {
((SoftwareVersionEntity) invocation.getArgument(0)).setId(300L);
return 1;
});
when(versionMapper.selectById(300L)).thenReturn(null);
service().confirmSoftwareVersion("4.0.69", "chunk-abc");
ArgumentCaptor<SoftwareVersionEntity> captor = ArgumentCaptor.forClass(SoftwareVersionEntity.class);
verify(versionMapper).insert(captor.capture());
assertEquals("4.0.69", captor.getValue().getVersion());
assertNotEquals("", captor.getValue().getSha256(), "落库必须带拼装件的 sha256");
verify(versionMapper).markLatestById(300L);
assertFalse(Files.exists(zip), "确认成功后临时拼装件必须删掉,否则每次重传都堆一份");
}
@Test
void 同版本重复确认命中幂等不重复搬桶() throws Exception {
Path zip = writeZip("4.0.69.zip");
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(zip.toFile());
SoftwareVersionEntity existing = new SoftwareVersionEntity();
existing.setId(9L);
existing.setVersion("4.0.69");
when(versionMapper.selectOne(any())).thenReturn(existing);
service().confirmSoftwareVersion("4.0.69", "chunk-abc");
verify(ossStorageService, never()).uploadSoftwareVersionPackage(any(), any());
verify(versionMapper, never()).insert(any(SoftwareVersionEntity.class));
verify(versionMapper, never()).markLatestById(any());
assertFalse(Files.exists(zip), "幂等命中也要把临时件清掉");
}
@Test
void 拼装件缺失必须拒绝且不落库() {
when(localFiles.findLocalSourceFile("chunk-gone")).thenReturn(null);
assertThrows(RuntimeException.class,
() -> service().confirmSoftwareVersion("4.0.69", "chunk-gone"));
verify(versionMapper, never()).insert(any(SoftwareVersionEntity.class));
}
@Test
void 非zip拼装件必须拒绝() throws Exception {
Path notZip = writeTempFile("payload.txt", "not a zip");
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(notZip.toFile());
assertThrows(RuntimeException.class,
() -> service().confirmSoftwareVersion("4.0.69", "chunk-abc"));
verify(ossStorageService, never()).uploadSoftwareVersionPackage(any(), any());
}
@Test
void 零字节拼装件必须拒绝() throws Exception {
Path empty = Files.createFile(tempDir.resolve("4.0.69.zip"));
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(empty.toFile());
assertThrows(RuntimeException.class,
() -> service().confirmSoftwareVersion("4.0.69", "chunk-abc"));
assertTrue(Files.exists(empty), "拒绝分支不许动调用方的临时件(排查要用)");
}
/** P2-4 起 confirm 会读 zip 中央目录,测试夹具必须是真 zip 而不是 PK 魔数文本。 */
private Path writeZip(String name) throws Exception {
Path file = tempDir.resolve(name);
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(file))) {
out.putNextEntry(new ZipEntry("readme.txt"));
out.write("package".getBytes(StandardCharsets.UTF_8));
out.closeEntry();
}
return file;
}
private Path writeTempFile(String name, String content) throws Exception {
Path file = tempDir.resolve(name);
Files.writeString(file, content, StandardCharsets.UTF_8);
return file;
}
}
@@ -0,0 +1,157 @@
package com.nanri.aiimage.modules.task.mapper;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.Configuration;
import org.junit.jupiter.api.Test;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* V183 采集通道的谓词形状(CR 第二轮 P1-1)。
*
* <p><b>为什么钉 SQL 而不是钉行为</b>:这两条查询的执行方判定必须在 {@code WHERE} 里、
* 在 {@code LIMIT} 之前。写成「先 limit 取页、回 Java 再 {@code filter(isLocal())}」时,
* 混通道排队里只要较老的 N 条(出厂 {@code client-task-pull.limit=5})是 ONLINE,
* 本机通道的单本轮及以后都领不到——不是延后,是排到队尾之前永久饿死。
* 而 mock 掉 {@code selectList} 的返回让「取页与过滤的先后」在用例里根本看不见,
* 这就是它活过后端整量的原因(现网 {@code enabled=false} 也没能掩盖住)。
* 这里用真 {@code XMLMapperBuilder} 解析、向真 {@code BoundSql} 断言,判据=
* 把谓词挪出 {@code WHERE} 或挪到 {@code LIMIT} 之后,本格直接红。
*
* <p>没有数据库也成立的另一面:{@code ?} 的个数与顺序被钉死,抽掉通道谓词就少两个占位符。
*/
class FileTaskMapperChannelSqlTest {
private static final String XML = "mapper/task/FileTaskMapper.xml";
private static final String NS = "com.nanri.aiimage.modules.task.mapper.FileTaskMapper";
private static final List<String> MODULE_TYPES = List.of("APPEARANCE_PATENT", "SIMILAR_ASIN");
private static final List<String> LOCAL_DEFAULTS = List.of("APPEARANCE_PATENT", "SIMILAR_ASIN");
@Test
void 客户端拉取的通道谓词在WHERE里且发生在LIMIT之前() throws Exception {
String sql = render("selectLocalChannelPendingTasks", clientParams(2));
int at = sql.indexOf("CASE WHEN collect_channel IN ('LOCAL', 'ONLINE')");
assertTrue(at > 0, () -> "通道判定不在 SQL 里(回到 Java filter 就是 P1-1 复发): " + sql);
int limit = sql.lastIndexOf("LIMIT ?");
assertTrue(limit > at, () -> "通道谓词必须出现在 LIMIT 之前,否则取到的那一页里没有本机单: " + sql);
assertTrue(sql.indexOf("ORDER BY created_at ASC") < limit,
() -> "排序必须在 LIMIT 之前,否则取页不是「最早创建的本机单」: " + sql);
assertEquals("SELECT id, module_type, collect_channel, created_at FROM biz_file_task"
+ " WHERE user_id = ? AND status = ? AND module_type IN (?, ?) AND created_at < ?"
+ " AND CASE WHEN collect_channel IN ('LOCAL', 'ONLINE') THEN collect_channel"
+ " WHEN module_type IN (?, ?) THEN 'LOCAL' ELSE 'ONLINE' END = 'LOCAL'"
+ " ORDER BY created_at ASC LIMIT ?", sql,
"取页形状变了:通道谓词必须与 status/模块/时间窗口同在 WHERE 里,且 LIMIT 之后没有任何过滤面");
}
@Test
void 内部认领把本机让位做成SQL侧OR窗口而不是Java二次过滤() throws Exception {
String sql = render("selectInternalClaimCandidates", internalParams(2));
assertTrue(sql.contains("(NOT (CASE") && sql.contains("= 'LOCAL') OR created_at <= ?)"),
() -> "让位窗口不在 SQL 里:整页都是「本机通道且没等满兜底窗口」时,本轮线上单零吞吐: " + sql);
assertTrue(sql.indexOf("created_at < ?") < sql.indexOf("created_at <= ?"),
() -> "基础等待窗口与兜底窗口必须都在 LIMIT 之前: " + sql);
assertTrue(sql.lastIndexOf("created_at <= ?") < sql.lastIndexOf("LIMIT ?"),
() -> "兜底窗口谓词必须发生在 LIMIT 之前: " + sql);
}
@Test
void 通道判定用CASE兜模块默认而不是裸等值() throws Exception {
String sql = render("selectLocalChannelPendingTasks", clientParams(2));
// 裸等值(collect_channel = 'LOCAL' 或 NOT (collect_channel = 'LOCAL'))在列为 NULL 时吃三值
// 逻辑变成 UNKNOWN:被默认兜成 ONLINE 的模块(COLLECT_DATA 等)会在 NOT 之后永久领不到。
assertFalse(sql.contains("collect_channel = ?"), () -> "通道值被参数化后 CASE 的兜法就散了: " + sql);
assertFalse(sql.contains("collect_channel = 'LOCAL' OR"),
() -> "OR 形状的裸等值谓词对 NULL 列失明: " + sql);
assertTrue(sql.contains("ELSE 'ONLINE' END"), () -> "CASE 缺 ELSE=不可识别值不再兜默认: " + sql);
}
@Test
void 取页投影只有认领需要的四列() throws Exception {
String sql = render("selectLocalChannelPendingTasks", clientParams(2));
assertTrue(sql.startsWith("SELECT id, module_type, collect_channel, created_at FROM biz_file_task"),
() -> "投影列清单变了(整行拉回来会把 result_json 这类大列带进兜底轮询): " + sql);
}
@Test
void 占位符数与两条语句的谓词形状逐一对撞() throws Exception {
// 客户端:user_id + status + 2 模块 + cutoff + 2 默认模块 + limit = 8
assertEquals(8, questionMarks("selectLocalChannelPendingTasks", clientParams(2)),
"少 2 个就是通道谓词被抽掉了(P1-1 复发),多 2 个是模块清单被写了两遍");
// 内部认领:status + 2 模块 + cutoff + 2 默认模块 + localCutoff + limit = 8
assertEquals(8, questionMarks("selectInternalClaimCandidates", internalParams(2)),
"内部认领的兜底窗口比客户端多一条 cutoff、少一个 user_id");
}
@Test
void V184补齐两条取页路径的索引并明写通道列不进索引() throws Exception {
Path migration = moduleRoot().resolve("src/main/resources/db/V184__collect_pull_and_evidence_indexes.sql");
assertTrue(Files.exists(migration), "V184 缺失:P1-1 的下推查询没有索引承接,P2-1 的保留期扫描仍全表");
String sql = Files.readString(migration, StandardCharsets.UTF_8);
assertTrue(sql.contains("ADD INDEX idx_biz_file_task_status_module_created (status, module_type, created_at)"),
() -> "认领取页索引的列组合变了: " + sql);
assertTrue(sql.contains("ADD INDEX idx_task_evidence_created_at (created_at)"),
() -> "证据保留期是单列 created_at 谓词,前导列不符就还是全表扫: " + sql);
assertFalse(sql.contains("idx_task_collect_channel"),
"通道列有意不进索引:CASE 表达式谓词不吃索引,把 collect_channel 夹在 module_type 与"
+ " created_at 之间反而打断 ORDER BY created_at 的索引有序性");
}
private static int questionMarks(String id, Map<String, Object> params) throws Exception {
return (int) render(id, params).chars().filter(c -> c == '?').count();
}
private static String render(String id, Map<String, Object> params) throws Exception {
MappedStatement statement = parse().getMappedStatement(NS + "." + id);
// MyBatis 把 foreach 展开成 `IN ( ? , ? )`,这里收成 `IN (?,?)` 好让判据读得下去。
return statement.getBoundSql(params).getSql().replaceAll("\\s+", " ").trim()
.replace("( ", "(").replace(" )", ")").replace(" ,", ",");
}
private static Map<String, Object> clientParams(int modules) {
return Map.of("userId", 1095L,
"status", "PENDING",
"moduleTypes", MODULE_TYPES.subList(0, modules),
"localDefaultModules", LOCAL_DEFAULTS,
"cutoff", LocalDateTime.now().minusMinutes(5),
"limit", 5);
}
private static Map<String, Object> internalParams(int modules) {
return Map.of("status", "PENDING",
"moduleTypes", MODULE_TYPES.subList(0, modules),
"localDefaultModules", LOCAL_DEFAULTS,
"cutoff", LocalDateTime.now().minusMinutes(2),
"localCutoff", LocalDateTime.now().minusMinutes(30),
"limit", 5);
}
private static Configuration parse() throws Exception {
MybatisConfiguration configuration = new MybatisConfiguration();
try (InputStream in = Resources.getResourceAsStream(XML)) {
new XMLMapperBuilder(in, configuration, XML, configuration.getSqlFragments()).parse();
}
return configuration;
}
private static Path moduleRoot() {
Path here = Path.of("").toAbsolutePath();
return Files.isDirectory(here.resolve("src/main/resources")) ? here : here.getParent();
}
}
@@ -3,9 +3,12 @@ package com.nanri.aiimage.modules.task.model;
import com.nanri.aiimage.config.CollectRoutingProperties;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* V183 任务级采集通道的判据(建单写入、认领读取、脏值兜底)。
@@ -27,6 +30,24 @@ class CollectChannelTest {
assertFalse(CollectChannel.defaultFor(" ").isLocal());
}
/**
* P1-1 把通道判定下推进 SQL 之后,「哪些模块默认本机」这份清单被喂进 mapper 的 CASE。
* 判据=清单内必被 {@link CollectChannel#defaultFor} 读作本机、清单外必不读作本机。
* 谁在 defaultFor 里另加一个模块而忘了同步清单,SQL 就会把那模块的历史单兜成线上:
* 界面显示「本机采集」、客户端却永远领不到。
*/
@Test
void 本机默认模块清单与defaultFor同源() {
assertEquals(List.of(CollectRoutingProperties.MODULE_APPEARANCE_PATENT,
CollectRoutingProperties.MODULE_SIMILAR_ASIN), CollectChannel.localDefaultModuleTypes());
for (String module : CollectChannel.localDefaultModuleTypes()) {
assertTrue(CollectChannel.defaultFor(module).isLocal(), module + " 在清单里却不被判本机");
}
for (String module : List.of("DEDUPE", "COLLECT_DATA", "SHOP_DATA_CRAWL", "PUBLISH")) {
assertFalse(CollectChannel.defaultFor(module).isLocal(), module + " 不在清单里却读成本机");
}
}
@Test
void 模块默认大小写与空白不影响判定() {
assertEquals(CollectChannel.LOCAL, CollectChannel.defaultFor("similar_asin"));
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.CollectChannel;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.vo.TaskClientPullVo;
import com.nanri.aiimage.modules.task.spi.ClientTaskPullSpi;
@@ -29,7 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -68,7 +71,7 @@ class TaskClientPullServiceTest {
@Test
void 认领成功后返回载荷并写_RUNNING_与_owner() {
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
stubPullCandidates(candidate);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
StubHandler handler = new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"));
@@ -88,17 +91,16 @@ class TaskClientPullServiceTest {
assertTrue(params.containsValue("RUNNING"), "认领必须写入 RUNNING");
assertTrue(sqlSetOf(captor.getValue()).contains("owner_instance_id"), "认领必须接管归属实例");
ArgumentCaptor<Wrapper<FileTaskEntity>> selectCaptor = wrapperCaptor();
verify(fileTaskMapper).selectList(selectCaptor.capture());
Map<String, Object> selectParams = paramsOf(selectCaptor.getValue());
assertTrue(selectParams.containsValue("PENDING"), "候选只挑 PENDING");
assertTrue(selectParams.containsValue(USER_ID), "候选限定任务所属用户");
assertTrue(selectCaptor.getValue().getSqlSegment().contains("created_at"), "候选要有创建时间窗口");
// 取页形状(通道谓词在 WHERE、LIMIT 之前)由 FileTaskMapperChannelSqlTest 向真 BoundSql 断言;
// 这里钉「调用的是哪条具名查询、传了什么」,两者合起来才挡住 P1-1 复发。
verify(fileTaskMapper).selectLocalChannelPendingTasks(eq(USER_ID), eq("PENDING"),
eq(List.of("SIMILAR_ASIN", "COLLECT_DATA")), eq(CollectChannel.localDefaultModuleTypes()),
any(LocalDateTime.class), eq(5));
}
@Test
void 页面抢先认领后不再返回任务() {
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task(11L, "SIMILAR_ASIN")));
stubPullCandidates(task(11L, "SIMILAR_ASIN"));
when(fileTaskMapper.update(isNull(), any())).thenReturn(0);
StubHandler handler = new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"));
@@ -112,7 +114,7 @@ class TaskClientPullServiceTest {
@Test
void 组装不出载荷时任务标失败() {
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
stubPullCandidates(candidate);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
@@ -127,7 +129,7 @@ class TaskClientPullServiceTest {
@Test
void 组装抛异常时任务标失败且不抛出() {
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
stubPullCandidates(candidate);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
StubHandler broken = new StubHandler("SIMILAR_ASIN", null, new IllegalStateException("boom"));
@@ -142,7 +144,7 @@ class TaskClientPullServiceTest {
@Test
void 白名单模块未实现兜底时跳过且不改状态() {
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task(21L, "COLLECT_DATA")));
stubPullCandidates(task(21L, "COLLECT_DATA"));
List<TaskClientPullVo> result = service(new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
.pullPendingTasks(USER_ID);
@@ -190,86 +192,97 @@ class TaskClientPullServiceTest {
}
}
// ------------------------------------------------------------ 本地采集路由(2026-10-29)
// ---------------------------------------------------- 本地采集路由(2026-10-29 建档,2026-10-31 下推 SQL)
/**
* 客户端拉取只走带通道谓词的具名查询,服务侧不再挑第二遍。
*
* <p>这里喂一条通道写着 ONLINE 的行——真 SQL 不会返回它——为的是钉住「Java 里没有第二道
* {@code filter(isLocal())}」。P1-1 的原形状就是先 {@code limit 5} 取页再过滤:那一道过滤
* 看不见 limit,也就没人替它保证「先筛后取页」,混通道时较老的 N 条是线上单就把本机单永久
* 挡在队尾之后。谓词本身的位置由 {@code FileTaskMapperChannelSqlTest} 向真 BoundSql 钉。
*/
@Test
void 客户端兜底拉取不领线上通道的单() {
FileTaskEntity online = task(11L, "SIMILAR_ASIN", 10L);
online.setCollectChannel("ONLINE");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(online));
void 客户端拉取把通道判定整个交给SQL不做二次过滤() {
FileTaskEntity row = task(11L, "SIMILAR_ASIN", 10L);
row.setCollectChannel("ONLINE");
stubPullCandidates(row);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(row);
List<TaskClientPullVo> result = serviceWithRouting(defaultRouting(),
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))).pullPendingTasks(USER_ID);
assertTrue(result.isEmpty(), "这一单选了线上采集,客户端领了就是抢跑");
verify(fileTaskMapper, never()).update(isNull(), any());
assertEquals(1, result.size(), "候选页由 SQL 侧谓词筛好,服务再判一遍就是 P1-1 复发");
}
/**
* 内部认领同样把让位判定交给 SQL:喂一条「还在让位窗口内的本机单」,服务必须照领。
*/
@Test
void 客户端兜底拉取照领本机通道的单() {
FileTaskEntity local = task(11L, "SIMILAR_ASIN", 10L);
local.setCollectChannel("LOCAL");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(local));
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(local);
List<TaskClientPullVo> result = serviceWithRouting(defaultRouting(),
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))).pullPendingTasks(USER_ID);
assertEquals(1, result.size(), "本机通道的单必须能被在线客户端领走");
}
@Test
void 内部认领对本机通道让位到兜底窗口() {
void 内部认领不在Java里做让位过滤() {
com.nanri.aiimage.config.CollectRoutingProperties routing =
new com.nanri.aiimage.config.CollectRoutingProperties();
routing.setLinuxFallbackMinutes(30L);
FileTaskEntity localTask = task(11L, "SIMILAR_ASIN", 10L);
localTask.setCollectChannel("LOCAL");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(localTask));
List<TaskClientPullVo> result = serviceWithRouting(routing,
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
assertTrue(result.isEmpty(), "本机通道的单在兜底窗口内必须让位给本地客户端");
verify(fileTaskMapper, never()).update(isNull(), any());
}
@Test
void 内部认领超过兜底窗口后接管本机通道的单() {
com.nanri.aiimage.config.CollectRoutingProperties routing =
new com.nanri.aiimage.config.CollectRoutingProperties();
routing.setLinuxFallbackMinutes(30L);
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN", 40L);
candidate.setCollectChannel("LOCAL");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
FileTaskEntity row = task(21L, "COLLECT_DATA", 10L);
row.setCollectChannel("LOCAL");
stubInternalCandidates(row);
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
List<TaskClientPullVo> result = serviceWithRouting(routing,
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
assertEquals(1, result.size(), "本机长时间没人领,Linux 必须兜底接管");
}
@Test
void 内部认领对线上通道不受兜底窗口影响() {
com.nanri.aiimage.config.CollectRoutingProperties routing =
new com.nanri.aiimage.config.CollectRoutingProperties();
routing.setLinuxFallbackMinutes(30L);
FileTaskEntity candidate = task(21L, "COLLECT_DATA", 10L);
candidate.setCollectChannel("ONLINE");
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
when(fileTaskMapper.selectById(21L)).thenReturn(candidate);
when(fileTaskMapper.selectById(21L)).thenReturn(row);
List<TaskClientPullVo> result = serviceWithRouting(routing,
new StubHandler("COLLECT_DATA", payload("collect-data-run")))
.pullPendingTasksInternal(List.of("COLLECT_DATA"));
assertEquals(1, result.size(), "选了线上的单子不能被本地优先的窗口拖住");
assertEquals(1, result.size(), "让位窗口是 SQL 的 OR 分支,不是取页之后的 Java 过滤");
}
/**
* 两道窗口分别下传:基础等待窗口(给「建完就想删」留余地)与本机兜底窗口(Linux 接管点)。
* 兜底窗口配得比基础窗口还小时取基础窗口——这条夹逼原先在 Java 里,下推后仍得由服务算好。
*/
@Test
void 内部认领下传两道cutoff且兜底窗口不越基础窗口() {
com.nanri.aiimage.config.CollectRoutingProperties narrow =
new com.nanri.aiimage.config.CollectRoutingProperties();
narrow.setLinuxFallbackMinutes(1L);
serviceWithRouting(narrow, new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
ArgumentCaptor<LocalDateTime> cutoff = ArgumentCaptor.forClass(LocalDateTime.class);
ArgumentCaptor<LocalDateTime> localCutoff = ArgumentCaptor.forClass(LocalDateTime.class);
verify(fileTaskMapper).selectInternalClaimCandidates(eq("PENDING"), eq(List.of("SIMILAR_ASIN")),
eq(CollectChannel.localDefaultModuleTypes()), cutoff.capture(), localCutoff.capture(), eq(5));
assertEquals(cutoff.getValue(), localCutoff.getValue(),
"兜底窗口 1 分钟短于基础窗口 2 分钟时按 2 分钟算,否则「建完就能删」的余地被越过");
}
@Test
void 兜底窗口长于基础窗口时按自身下传() {
com.nanri.aiimage.config.CollectRoutingProperties wide =
new com.nanri.aiimage.config.CollectRoutingProperties();
wide.setLinuxFallbackMinutes(30L);
serviceWithRouting(wide, new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
ArgumentCaptor<LocalDateTime> cutoff = ArgumentCaptor.forClass(LocalDateTime.class);
ArgumentCaptor<LocalDateTime> localCutoff = ArgumentCaptor.forClass(LocalDateTime.class);
verify(fileTaskMapper).selectInternalClaimCandidates(eq("PENDING"), eq(List.of("SIMILAR_ASIN")),
eq(CollectChannel.localDefaultModuleTypes()), cutoff.capture(), localCutoff.capture(), eq(5));
assertTrue(localCutoff.getValue().isBefore(cutoff.getValue()),
"30 分钟的让位窗口必须比 2 分钟的基础窗口更早,否则 Linux 会抢在本地客户端前面双跑");
}
private void stubPullCandidates(FileTaskEntity... rows) {
when(fileTaskMapper.selectLocalChannelPendingTasks(any(), any(), any(), any(), any(), anyInt()))
.thenReturn(List.of(rows));
}
private void stubInternalCandidates(FileTaskEntity... rows) {
when(fileTaskMapper.selectInternalClaimCandidates(any(), any(), any(), any(), any(), anyInt()))
.thenReturn(List.of(rows));
}
private TaskClientPullService service(ClientTaskPullSpi... handlers) {
@@ -21,7 +21,7 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isNull;
@@ -76,29 +76,33 @@ class TaskFileJobTerminalTaskGuardTest {
}
@Test
void claimRunningRejectsJobWhoseTaskIsFailed() {
TaskFileJobEntity failedTaskJob = job(11L, 500L);
when(taskFileJobMapper.selectById(11L)).thenReturn(failedTaskJob);
void claimRunningStillDeliversWhenParentTaskIsTerminal() {
TaskFileJobEntity terminalTaskJob = job(11L, 500L);
TaskFileJobEntity running = job(11L, 500L);
running.setStatus("RUNNING");
when(taskFileJobMapper.selectById(11L)).thenReturn(terminalTaskJob, running);
when(taskFileJobMapper.selectFileTaskStatus(500L)).thenReturn("FAILED");
when(taskFileJobMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
assertNull(service.claimRunning(11L), "终态任务的作业不得被 claim 成 RUNNING");
TaskFileJobEntity claimed = service.claimRunning(11L);
assertNotNull(claimed, "P1-13:父任务终态也要放行出表作业");
assertEquals("RUNNING", claimed.getStatus());
@SuppressWarnings("unchecked")
ArgumentCaptor<LambdaUpdateWrapper<TaskFileJobEntity>> captor =
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
verify(taskFileJobMapper, times(1)).update(isNull(), captor.capture());
LambdaUpdateWrapper<TaskFileJobEntity> wrapper = captor.getValue();
assertTrue(hasParam(wrapper, "FAILED"), "必须把作业拉成 FAILED,下一轮扫描才捞不到");
assertTrue(hasParam(wrapper, 5), "retry_count 必须一次拉满到上限");
assertFalse(hasParam(wrapper, "RUNNING"), "不得再翻转成 RUNNING");
assertTrue(hasParam(wrapper, "RUNNING"), "终态父任务不再把出表作业拉成 FAILED");
assertFalse(hasParam(wrapper, "FAILED"), "终态只停心跳续期,不改写给出表作业");
assertTrue(wrapper.getSqlSet().contains("terminal_callback_at"),
"terminal_callback_at 必须显式清空:留给兜底扫描出部分结果,失败任务仍可下载");
assertTrue(hasParam(wrapper, null), "terminal_callback_at 置空后兜底扫描才捞得到这一行");
"正常认领必须清空 terminal_callback_at,失败兜底扫描才捞得到");
assertTrue(hasParam(wrapper, null));
}
@Test
void claimCandidatesSkipsTerminalTaskAndKeepsActiveOne() {
void claimCandidatesClaimsBothTerminalAndActiveTasks() {
TaskFileJobEntity terminal = job(21L, 500L);
TaskFileJobEntity active = job(22L, 501L);
when(taskFileJobMapper.selectList(any(LambdaQueryWrapper.class)))
@@ -106,23 +110,25 @@ class TaskFileJobTerminalTaskGuardTest {
when(taskFileJobMapper.selectFileTaskStatus(500L)).thenReturn("FAILED");
when(taskFileJobMapper.selectFileTaskStatus(501L)).thenReturn("RUNNING");
when(taskFileJobMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1, 1);
TaskFileJobEntity claimedTerminal = job(21L, 500L);
claimedTerminal.setStatus("RUNNING");
TaskFileJobEntity claimedActive = job(22L, 501L);
claimedActive.setStatus("RUNNING");
when(taskFileJobMapper.selectBatchIds(any())).thenReturn(List.of(claimedActive));
when(taskFileJobMapper.selectBatchIds(any())).thenReturn(List.of(claimedTerminal, claimedActive));
List<TaskFileJobEntity> claimed = service.claimRunnableJobs(10);
assertEquals(1, claimed.size(), "终态任务的 job 不入结果集");
assertEquals(22L, claimed.get(0).getId());
assertEquals(2, claimed.size(), "P1-13:终态任务的出表作业与活跃任务一样可认领");
assertEquals(21L, claimed.get(0).getId());
assertEquals(22L, claimed.get(1).getId());
@SuppressWarnings("unchecked")
ArgumentCaptor<LambdaUpdateWrapper<TaskFileJobEntity>> captor =
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
verify(taskFileJobMapper, times(2)).update(isNull(), captor.capture());
assertTrue(hasParam(captor.getAllValues().get(0), "FAILED"), "第一笔是终态收尾");
assertTrue(hasParam(captor.getAllValues().get(1), "RUNNING"), "第二笔才是正常 claim");
assertTrue(captor.getAllValues().get(0).getSqlSet().contains("terminal_callback_at"),
"终态作业必须留给兜底扫描,不能提前打终态回调");
assertTrue(hasParam(captor.getAllValues().get(0), "RUNNING"), "终态任务的 job 也要正常 claim");
assertTrue(hasParam(captor.getAllValues().get(1), "RUNNING"));
assertFalse(hasParam(captor.getAllValues().get(0), "FAILED"), "不得再把终态任务的 job 判死");
}
@Test
@@ -425,7 +425,7 @@ class TaskResultFileJobWorkerStuckScanTest {
worker.finishAfterExecution(job, new java.util.concurrent.atomic.AtomicBoolean(true));
verify(taskFileJobService).markFailedPermanentAwaitingFallback(job, "父任务已终态,结果作业不再执行");
verify(taskFileJobService).markFailedPermanentAwaitingFallback(job, "父任务已终态且本次执行未产出结果文件");
}
/**
@@ -0,0 +1,111 @@
package com.nanri.aiimage.modules.tutorial.service;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.tutorial.mapper.TutorialPackageMapper;
import com.nanri.aiimage.modules.tutorial.model.entity.TutorialPackageEntity;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.ArgumentCaptor;
import org.springframework.test.util.ReflectionTestUtils;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* 教程包「分片拼装件 → confirm 搬桶落库」的契约(CR 第二轮 P1-8,与版本包同批)。
*
* <p>服务端新重载与控制器接线都在,缺的是执行证据:幂等命中(同 fileName+version 重试只
* 返回既有行)、成功后临时件清理、缺件拒绝。任何一条破掉,重试会重复搬桶或临时件堆盘。
*/
class TutorialPackageServiceChunkConfirmTest {
private final TutorialPackageMapper tutorialPackageMapper = mock(TutorialPackageMapper.class);
private final OssStorageService ossStorageService = mock(OssStorageService.class);
private final LocalFileStorageService localFiles = mock(LocalFileStorageService.class);
@TempDir
Path tempDir;
@BeforeAll
static void initializeMybatisMetadata() {
TableInfoHelper.initTableInfo(
new MapperBuilderAssistant(new MybatisConfiguration(), ""), TutorialPackageEntity.class);
}
private TutorialPackageService service() {
TutorialPackageService service = new TutorialPackageService(tutorialPackageMapper, ossStorageService);
ReflectionTestUtils.setField(service, "localFileStorageService", localFiles);
return service;
}
@Test
void 分片确认搬桶落库且临时件清掉() throws Exception {
Path zip = writeZip("教程包.zip");
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(zip.toFile());
when(tutorialPackageMapper.selectOne(any())).thenReturn(null);
when(tutorialPackageMapper.insert(any(TutorialPackageEntity.class))).thenReturn(1);
when(tutorialPackageMapper.selectById(any())).thenReturn(null);
service().confirmTutorialPackage("tutorial/direct.zip", "教程包.zip", "2026.10", "chunk-abc");
ArgumentCaptor<TutorialPackageEntity> captor = ArgumentCaptor.forClass(TutorialPackageEntity.class);
verify(tutorialPackageMapper).insert(captor.capture());
assertEquals("教程包.zip", captor.getValue().getFileName());
verify(ossStorageService).uploadTutorialPackage(any(), anyString());
assertFalse(Files.exists(zip), "确认成功后临时拼装件必须删掉");
}
@Test
void 同名同版重复确认命中幂等不重复搬桶() throws Exception {
Path zip = writeZip("教程包.zip");
when(localFiles.findLocalSourceFile("chunk-abc")).thenReturn(zip.toFile());
TutorialPackageEntity existing = new TutorialPackageEntity();
existing.setId(11L);
existing.setFileName("教程包.zip");
when(tutorialPackageMapper.selectOne(any())).thenReturn(existing);
service().confirmTutorialPackage("tutorial/direct.zip", "教程包.zip", "2026.10", "chunk-abc");
verify(ossStorageService, never()).uploadTutorialPackage(any(), anyString());
verify(tutorialPackageMapper, never()).insert(any(TutorialPackageEntity.class));
assertFalse(Files.exists(zip), "幂等命中也要把临时件清掉");
}
@Test
void 拼装件缺失必须拒绝且不落库() {
when(localFiles.findLocalSourceFile("chunk-gone")).thenReturn(null);
assertThrows(RuntimeException.class,
() -> service().confirmTutorialPackage("tutorial/direct.zip", "教程包.zip", "2026.10", "chunk-gone"));
verify(tutorialPackageMapper, never()).insert(any(TutorialPackageEntity.class));
}
/** P2-4 起 confirm 会读 zip 中央目录,测试夹具必须是真 zip。 */
private Path writeZip(String name) throws Exception {
Path file = tempDir.resolve(name);
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(file))) {
out.putNextEntry(new ZipEntry("readme.txt"));
out.write("package".getBytes(StandardCharsets.UTF_8));
out.closeEntry();
}
return file;
}
}