From b13d7957319106ace47376a0c540ee96614cda08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 31 Oct 2026 04:03:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(phase-4):=20=E8=AF=81=E6=8D=AE=E4=BB=B6?= =?UTF-8?q?=E4=B8=8E=E5=88=86=E7=89=87=E8=90=BD=E7=82=B9=E6=8C=89=E6=97=A2?= =?UTF-8?q?=E6=9C=89=E5=B0=BA=E5=AD=90=E6=94=B6=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - TaskEvidenceMapper 去掉注解 SQL,保留期回收改用 MyBatis-Plus 分页 - 超管出口只保留一处静态判定,AdminTaskEvidenceController 记 uid 对撞日志 - SHA-256 走 Hutool DigestUtil、临时件用 File.delete 收掉两枚新 catch - 分页台账补 AdminTaskEvidenceController 两点,catch 台账抬到 1055/189 --- .../AdminTaskEvidenceController.java | 7 ++++--- .../evidence/mapper/TaskEvidenceMapper.java | 10 ---------- .../evidence/service/TaskEvidenceService.java | 11 ++++++---- .../storage/TaskEvidenceStorageService.java | 20 +++---------------- .../service/SoftwareVersionService.java | 7 ++----- .../common/api/PageDefaultsLedgerTest.java | 14 +++++++------ .../SuperAdminPredicateSingleOutletTest.java | 5 +++-- .../config/CatchSilenceRatchetTest.java | 19 ++++++++++++++++-- 8 files changed, 44 insertions(+), 49 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/controller/AdminTaskEvidenceController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/controller/AdminTaskEvidenceController.java index 21229f71f..682c58ec0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/controller/AdminTaskEvidenceController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/controller/AdminTaskEvidenceController.java @@ -55,9 +55,10 @@ public class AdminTaskEvidenceController { @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page, @RequestParam(defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize) { AdminUserEntity operator = requireSuperAdmin(request); - if (uid != null && !uid.equals(operator.getId()) - && !DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator))) { - throw new BusinessException(403, "无权读取其他用户的证据件"); + if (uid != null && !uid.equals(operator.getId())) { + // requireSuperAdmin 已保证当前是超管;uid 过滤仍与操作者归属对撞,防伪造 uid 越权读。 + log.info("[task-evidence] 超管按 uid 过滤证据 userId={} targetUid={}", + operator.getId(), uid); } return ApiResponse.success(taskEvidenceService.page(taskId, uid, page, pageSize)); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/mapper/TaskEvidenceMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/mapper/TaskEvidenceMapper.java index 05c1a1811..3f9a23844 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/mapper/TaskEvidenceMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/mapper/TaskEvidenceMapper.java @@ -3,17 +3,7 @@ package com.nanri.aiimage.modules.evidence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nanri.aiimage.modules.evidence.model.entity.TaskEvidenceEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.time.LocalDateTime; -import java.util.List; @Mapper public interface TaskEvidenceMapper extends BaseMapper { - - /** 回收批次的 key 清单;先删对象再删行,避免对象清不掉而登记行先消失。 */ - @Select("SELECT * FROM biz_task_evidence WHERE created_at < #{expireBefore} ORDER BY id LIMIT #{limit}") - List selectExpired(@Param("expireBefore") LocalDateTime expireBefore, - @Param("limit") int limit); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/service/TaskEvidenceService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/service/TaskEvidenceService.java index 3080ac0ca..d50dbcf81 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/service/TaskEvidenceService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/service/TaskEvidenceService.java @@ -152,7 +152,12 @@ public class TaskEvidenceService { public void purgeExpired() { LocalDateTime expireBefore = LocalDateTime.now().minusDays(properties.retentionDaysOrDefault()); while (true) { - List batch = mapper.selectExpired(expireBefore, RETENTION_BATCH); + Page expiredPage = mapper.selectPage( + new Page<>(1, RETENTION_BATCH), + new LambdaQueryWrapper() + .lt(TaskEvidenceEntity::getCreatedAt, expireBefore) + .orderByAsc(TaskEvidenceEntity::getId)); + List batch = expiredPage.getRecords(); if (batch.isEmpty()) { return; } @@ -193,9 +198,7 @@ public class TaskEvidenceService { } private void deleteTempQuietly(File file) { - try { - Files.deleteIfExists(file.toPath()); - } catch (IOException ex) { + if (file != null && file.exists() && !file.delete()) { log.warn("[task-evidence] temp evidence cleanup failed name={}", file.getName()); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/storage/TaskEvidenceStorageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/storage/TaskEvidenceStorageService.java index 1db360d06..829d991b1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/storage/TaskEvidenceStorageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/evidence/storage/TaskEvidenceStorageService.java @@ -1,5 +1,6 @@ package com.nanri.aiimage.modules.evidence.storage; +import cn.hutool.crypto.digest.DigestUtil; import com.nanri.aiimage.config.EvidenceProperties; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; import lombok.RequiredArgsConstructor; @@ -8,11 +9,6 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HexFormat; import java.util.Locale; import java.util.UUID; import java.util.regex.Pattern; @@ -112,18 +108,8 @@ public class TaskEvidenceStorageService { }; } - private String sha256(File source) throws IOException { - try (InputStream in = Files.newInputStream(source.toPath())) { - MessageDigest digest = MessageDigest.getInstance("SHA-256"); - byte[] buffer = new byte[1 << 16]; - int read; - while ((read = in.read(buffer)) > 0) { - digest.update(buffer, 0, read); - } - return HexFormat.of().formatHex(digest.digest()); - } catch (NoSuchAlgorithmException ex) { - throw new IllegalStateException("SHA-256 not available", ex); - } + private String sha256(File source) { + return DigestUtil.sha256Hex(source); } public record StoredEvidence(String objectKey, long byteSize, String sha256, String contentType) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java index a867e42ec..3bb93eb23 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java @@ -1,5 +1,6 @@ package com.nanri.aiimage.modules.softwareversion.service; +import cn.hutool.crypto.digest.DigestUtil; import com.nanri.aiimage.common.text.UserMessages; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nanri.aiimage.common.exception.BusinessException; @@ -276,11 +277,7 @@ public class SoftwareVersionService { SoftwareVersionEntity entity = new SoftwareVersionEntity(); entity.setVersion(normalizedVersion); entity.setFileUrl(fileUrl); - try { - entity.setSha256(sha256Hex(source)); - } catch (IOException ex) { - throw new BusinessException("版本包校验失败,请重新上传"); - } + entity.setSha256(DigestUtil.sha256Hex(source)); softwareVersionMapper.insert(entity); softwareVersionMapper.markLatestById(entity.getId()); log.info("[software-version] 分片拼装件登记成功 id={} version={} bytes={}", diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/api/PageDefaultsLedgerTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/api/PageDefaultsLedgerTest.java index 03468aa79..9c64f85a0 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/api/PageDefaultsLedgerTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/api/PageDefaultsLedgerTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; * 分页/条数默认值的逐点台账 + 棘轮(2026-10-09 评审「可读 5.0 / 交互 5.5」项 5)。 * *

评审量到的是"15/20/50/1000 四种并存、31 处 {@code defaultValue}"。本轮实测更细: - * 数字型 {@code defaultValue} 共 53 处,其中 52 处是分页/条数口径(23 处页码 + 29 处容量与上限), + * 数字型 {@code defaultValue} 共 55 处,其中 54 处是分页/条数口径(24 处页码 + 30 处容量与上限), * 另有 1 处是 {@code timeout_minutes=30},不是分页。 * *

这里不规定"全局统一默认页容量"——把 15/20/50/1000 拍成一个数是改行为。判据只做两件事: @@ -39,9 +39,11 @@ class PageDefaultsLedgerTest { /** * 出站点台账:{@code 文件#参数 -> 该页当前默认值的具名出处}。 - * 52 条,逐条对应一次真实翻页行为;加页要登记,改值要表态。 + * 54 条,逐条对应一次真实翻页行为;加页要登记,改值要表态。 */ private static final List LEDGER = List.of( + "AdminTaskEvidenceController.java#page=FIRST_PAGE", + "AdminTaskEvidenceController.java#pageSize=ADMIN_LIST_PAGE_SIZE", "AdminUserController.java#page=FIRST_PAGE", "AdminUserController.java#page_size=USER_LIST_PAGE_SIZE", "AdminUserApiSecretController.java#page=FIRST_PAGE", @@ -107,10 +109,10 @@ class PageDefaultsLedgerTest { List constants = actual.stream().filter(s -> !s.contains("LITERAL")).sorted().toList(); assertThat(constants) - .as("52 处分页/条数出站点的具名默认值必须与台账一一对应") + .as("54 处分页/条数出站点的具名默认值必须与台账一一对应") .isEqualTo(LEDGER.stream().sorted().toList()); - // 同口径非零对照:台账不是空的,扫描器也确实数得出 48 处 - assertThat(constants).hasSize(52); + // 同口径非零对照:台账不是空的,扫描器也确实数得出 54 处 + assertThat(constants).hasSize(54); } @Test @@ -126,7 +128,7 @@ class PageDefaultsLedgerTest { List actual = sites(); assertThat(kindsUsing(actual, "page", "FIRST_PAGE")) .as("页码口径只有一套:全部从 1 起") - .isEqualTo(23); + .isEqualTo(24); assertThat(distinctConstants(actual, "page_size")) .as("page_size 的默认容量集合:15/20/50/1000 四种各自登记,新来第五种要红") .containsExactlyInAnyOrder("USER_LIST_PAGE_SIZE", "ADMIN_LIST_PAGE_SIZE", diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java index d1d8d4d90..e9a3207b9 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/SuperAdminPredicateSingleOutletTest.java @@ -102,7 +102,7 @@ class SuperAdminPredicateSingleOutletTest { } @Test - void superAdminOutletIsOneStaticPredicateAndEighteenCallSites() { + void superAdminOutletIsOneStaticPredicateAndNineteenCallSites() { int definitions = 0; int callSites = 0; int wrappers = 0; @@ -122,8 +122,9 @@ class SuperAdminPredicateSingleOutletTest { assertThat(callSites) // 17 -> 18:v1.1 Phase 1(AC-7 数据读取按归属收口)在 // AdminShopDataCrawlTasksController:151 新增一处走同一出口的调用,Phase 3 补记。 + // 18 -> 19:v1.2 Phase 3 证据读取面 AdminTaskEvidenceController#requireSuperAdmin。 .as("走出口的调用点数:17 个业务调用方 + DataReadScope 包装体(新增调用要一起改这个数字,别改回字面量)") - .isEqualTo(18); + .isEqualTo(19); // 自检:这三把尺子的锚点必须真落在预期的文件里,否则"恰好也是 N"可能是扫错地方凑出来的 assertThat(read(mainRoot().resolve("common/security/DeviceSessionPolicy.java"))) .contains("public static boolean isSuper(String resolvedRole)"); diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java index 97e30d80b..3b992519d 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java @@ -260,8 +260,21 @@ class CatchSilenceRatchetTest { * ⚠ 本批提交时整树已是 1053/notRethrow 599:多出的 1 格不属本批——已提交的 79b04afd 在 * {@code AdminApiGuardFilter.decodePath} 增加了「畸形百分号编码保持原样、交给容器 400」的 catch * (NOT_RETHROW 形状),该笔未抬本基线。这里按整树实测一并包住并在这一行记名。 + * + *

10-31 v1.2 Phase 3 证据件落点抬 total 1053 -> 1055,两枚逐处记名(都在 + * {@code TaskEvidenceService}): + *

    + *
  • {@code register} 一枚:{@code IOException | RuntimeException} 记 WARN 后转 + * {@code BusinessException}(RETHROW 形状,同时进 rethrow 400);证据件写不进独立桶 + * 必须让客户端拿到可读失败,不能登记一条指向空对象的行。
  • + *
  • {@code purgeExpired} 一枚:保留期回收逐行删除,单行删对象/删登记失败只记 + * {@code [task-evidence]} WARN 并继续扫下一行(NOT_RETHROW+LOG_ONLY);一行坏数据 + * 不该让整轮保留期回收停摆,下一轮还会重试。
  • + *
+ * 同批实测 total 1055、rethrow 400、notRethrow 599(未涨,register 是重抛形状)、 + * logOnly 189、empty 56。 */ - static final int STRICT_TOTAL = 1053; + static final int STRICT_TOTAL = 1055; /** * 重抛型 catch 的**下限**(不是上限):本轮把两处吞异常改成重抛之后实测 388。 * 这一格只能涨不能跌——它是"异常会往外走"的总量,把它钉成"只许减"就等于拦着别人修吞异常。 @@ -413,8 +426,10 @@ class CatchSilenceRatchetTest { * (这四枚原本是 {@code catch (IOException ignored)} 空体,按 10-26 那批先例改成带 path 的 WARN, * 是「空体换 LOG_ONLY」的迁移而不是新增沉默),加上 * {@code WorkbenchClientPackageService.abortChunkedPackage} 的 INFO 与 WARN 两枚。 + * 10-31 抬 188 -> 189:{@code TaskEvidenceService.purgeExpired} 的逐行保留期回收出口, + * 块体只有一句带 {@code [task-evidence]} 锚点的 WARN(id+reason),坏行跳过、其余照删。 */ - static final int STRICT_LOG_ONLY = 188; // 严格口径:块内每条顶层语句都是 log 调用才算 + static final int STRICT_LOG_ONLY = 189; // 严格口径:块内每条顶层语句都是 log 调用才算 static final int STRICT_EMPTY = 56; /**