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()) {