From d706c09b0f64cd99c48da9384ea23e52ffc25f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 27 Sep 2026 11:25:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=89=88=E6=9C=AC=E5=8C=85):=20=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=94=B9=E4=B8=BA=E6=98=BE=E5=BC=8F=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=20+=20=E6=96=B0=E5=A2=9E=E5=8D=87=E7=BA=A7=E5=8C=85?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E6=9C=9F=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 读取侧不再靠 created_at 现场算「最新版」(补插一条老记录就会把全体客户端更新目标带偏且 无报错),改读 web_config.is_latest,与数字人版本表口径对齐;上传/补录后标记,删除到最新版 时立刻改标剩余最新一条,全无标记时回退按时间取并补标——否则客户端会以为已是最新版而停更。 标记用一条 SET is_latest = (id = ?) 的整表 UPDATE,避免「先清零再置一」的中间零标记态需要拉事务。 另新增 SoftwareVersionRetentionService:client 桶 nanri-image/versions/ 前缀只增不删, 2026-09-21 已堆到 61 个对象 / 6.2GiB(单个约 106MB)。刻意不走 MinIO ILM 按天过期—— 2026-09-08 那次全桶 30 天规则连着删掉 9 个仍被人下载的安装包,web_config 留下断链至今。 口径为「保留最近 N 个 + 最新版永不删」,删除复用 deleteSoftwareVersions 的 file_url 引用计数 (同版本重复上传共享同一 key),双节点 job 锁,默认 dry-run。 --- .../mapper/SoftwareVersionMapper.java | 13 ++ .../model/entity/SoftwareVersionEntity.java | 3 + .../SoftwareVersionRetentionService.java | 101 +++++++++ .../service/SoftwareVersionService.java | 49 ++++- .../SoftwareVersionRetentionServiceTest.java | 208 ++++++++++++++++++ .../service/SoftwareVersionServiceTest.java | 166 ++++++++++++++ 6 files changed, 532 insertions(+), 8 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionService.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionServiceTest.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionServiceTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/mapper/SoftwareVersionMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/mapper/SoftwareVersionMapper.java index bc0cd248d..768a51bcb 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/mapper/SoftwareVersionMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/mapper/SoftwareVersionMapper.java @@ -3,7 +3,20 @@ package com.nanri.aiimage.modules.softwareversion.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; @Mapper public interface SoftwareVersionMapper extends BaseMapper { + + /** + * 把指定行标成唯一的最新版,同时清掉其余行的标记。 + * + *

刻意写成一条 {@code SET is_latest = (id = #{id})} 的整表 UPDATE,而不是 + * 「先清零、再置一」两条语句:两条语句需要事务包住才不会让并发读看到一个 + * 零标记的中间态,而本方法要在 MinIO 上传流程之后调用,不值得为 62 行的表 + * 拉一个事务、还要为此绕开 Spring 自调用不走代理的问题。 + */ + @Update("UPDATE web_config SET is_latest = (id = #{id})") + int markLatestById(@Param("id") Long id); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/model/entity/SoftwareVersionEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/model/entity/SoftwareVersionEntity.java index 36943f044..8d0ce79f9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/model/entity/SoftwareVersionEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/model/entity/SoftwareVersionEntity.java @@ -24,6 +24,9 @@ public class SoftwareVersionEntity { /** 安装包可公开访问的下载链接(MinIO path-style 直链) */ private String fileUrl; + /** 是否最新版:全表至多一行为 true,由 SoftwareVersionMapper#markLatestById 单语句维护 */ + private Boolean isLatest; + /** 创建时间,由数据库 CURRENT_TIMESTAMP 兜底 */ private LocalDateTime createdAt; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionService.java new file mode 100644 index 000000000..647ee8e53 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionService.java @@ -0,0 +1,101 @@ +package com.nanri.aiimage.modules.softwareversion.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.common.service.DistributedJobLockService; +import com.nanri.aiimage.modules.softwareversion.mapper.SoftwareVersionMapper; +import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.util.List; + +/** + * 客户端升级包的保留期清理(MinIO {@code client} 桶 {@code nanri-image/versions/} 前缀)。 + * + *

升级包只增不删:约 106MB/个,2026-09-21 盘点时该前缀已堆到 61 个对象 / 6.2GiB,最老的是 + * 41 天前上传的。此前只能靠后台手删。 + * + *

刻意不用 MinIO 生命周期规则做这件事:ILM 只能按时间过期,而升级包的正确口径是 + * 「保留最近 N 个 + 最新版永不删」——发版密集时按天数会连着删掉还被人下载的版本。 + * 2026-09-08 就发生过一次:给 {@code client} 桶根加了全桶 30 天过期规则,导致 + * 3.0.24~3.0.37 共 9 个安装包被自动删除,{@code web_config} 里留下断链记录至今。 + * + *

删除复用 {@link SoftwareVersionService#deleteSoftwareVersions(List)}:同一版本重复上传会 + * 共享同一个对象 key,该方法按 file_url 做引用计数,只有已无记录引用时才真删对象。 + * + *

双节点用 job 锁保证单实例执行;默认 dry-run,只记日志不动对象,确认口径后由 + * {@code aiimage.software-version.retention-dry-run=false} 启用实际删除。 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class SoftwareVersionRetentionService { + + /** 单轮最多删除的记录数,剩余的留给下一轮,避免首次启用时一次性清掉整个历史。 */ + static final int MAX_DELETIONS_PER_RUN = 20; + + private final SoftwareVersionMapper softwareVersionMapper; + private final SoftwareVersionService softwareVersionService; + private final DistributedJobLockService distributedJobLockService; + + /** + * 保留最近的版本数;下限钳到 1,避免配成 0 时把整表算进删除候选。 + * 最新版另有 is_latest 标记兜底,见 {@link #purgeSupersededVersions()} 的过滤。 + */ + @Value("${aiimage.software-version.retention-keep-count:20}") + private int keepCount = 20; + + @Value("${aiimage.software-version.retention-dry-run:true}") + private boolean dryRun = true; + + @Scheduled(cron = "${aiimage.software-version.retention-cron:0 50 4 * * *}") + public void purgeSupersededVersions() { + int keep = Math.max(1, keepCount); + DistributedJobLockService.LockHandle lockHandle = + distributedJobLockService.tryLock("software-version:retention", Duration.ofMinutes(10)); + if (lockHandle == null) { + log.info("[version-retention] 升级包保留清理跳过:另一实例持锁"); + return; + } + try (lockHandle) { + List entities = softwareVersionMapper.selectList( + new LambdaQueryWrapper() + .orderByDesc(SoftwareVersionEntity::getCreatedAt) + .orderByDesc(SoftwareVersionEntity::getId)); + if (entities.size() <= keep) { + log.info("[version-retention] 无需清理 total={} keep={}", entities.size(), keep); + return; + } + List superseded = entities.subList(keep, entities.size()).stream() + .filter(entity -> !Boolean.TRUE.equals(entity.getIsLatest())) + .toList(); + if (superseded.isEmpty()) { + log.info("[version-retention] keep={} 之后的记录均带 is_latest 标记,本轮不删", keep); + return; + } + int beyondCap = Math.max(0, superseded.size() - MAX_DELETIONS_PER_RUN); + List ids = superseded.stream() + .limit(MAX_DELETIONS_PER_RUN) + .map(SoftwareVersionEntity::getId) + .toList(); + List versions = superseded.stream() + .limit(MAX_DELETIONS_PER_RUN) + .map(SoftwareVersionEntity::getVersion) + .toList(); + if (dryRun) { + log.info("[version-retention] dry-run 未实际删除 total={} keep={} 候选={} versions={} 留待下轮={}", + entities.size(), keep, ids.size(), versions, beyondCap); + return; + } + int deleted = softwareVersionService.deleteSoftwareVersions(ids); + log.info("[version-retention] 升级包保留清理完成 total={} keep={} deleted={} versions={} 留待下轮={}", + entities.size(), keep, deleted, versions, beyondCap); + } catch (Exception ex) { + log.warn("[version-retention] 升级包保留清理失败 keep={} msg={}", keep, ex.getMessage(), ex); + } + } +} 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 15d588c37..21e4be124 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 @@ -25,8 +25,10 @@ import java.util.Set; import java.util.regex.Pattern; /** - * 客户端软件(桌面 ShuFuAI.exe)版本管理服务:读写 web_config 表, - * 与 Flask 时代 /api/admin/versions、/api/admin/version 行为对齐(读取/追加写,无覆盖、无删除)。 + * 客户端软件(桌面 ShuFuAI.exe)版本管理服务:读写 web_config 表。 + * + *

「最新版」是 web_config 上的显式 {@code is_latest} 标记(对齐数字人版本表),不再由 + * created_at 现场算出——补插一条老记录就会把全体客户端的更新目标带偏,且无任何报错。 */ @Service @RequiredArgsConstructor @@ -75,16 +77,27 @@ public class SoftwareVersionService { } /** - * 返回客户端更新接口所需的最新版本记录。空表时保持 Flask 时代的 - * {"version": null, "file_url": null} 响应语义。 + * 返回客户端更新接口所需的最新版本记录(web_config.is_latest 标记行)。 + * 空表时保持 Flask 时代的 {"version": null, "file_url": null} 响应语义。 */ public Map latestSoftwareVersion() { log.info("[software-version] 查询客户端最新可用版本"); SoftwareVersionEntity entity = softwareVersionMapper.selectOne( new LambdaQueryWrapper() + .eq(SoftwareVersionEntity::getIsLatest, true) .orderByDesc(SoftwareVersionEntity::getCreatedAt) .orderByDesc(SoftwareVersionEntity::getId) .last("LIMIT 1")); + if (entity == null) { + // 没有任何标记行:手工删过库、或迁移前的旧备份库直接接上。回退到按时间取最新 + // 并补标,否则全体客户端会以为"已是最新版"而停更。 + entity = newestByCreatedAt(); + if (entity != null) { + log.warn("[software-version] web_config 缺少 is_latest 标记,已按创建时间回退并补标 id={} version={}", + entity.getId(), entity.getVersion()); + softwareVersionMapper.markLatestById(entity.getId()); + } + } Map result = new LinkedHashMap<>(); if (entity == null) { result.put("version", null); @@ -96,6 +109,13 @@ public class SoftwareVersionService { return result; } + private SoftwareVersionEntity newestByCreatedAt() { + return softwareVersionMapper.selectOne(new LambdaQueryWrapper() + .orderByDesc(SoftwareVersionEntity::getCreatedAt) + .orderByDesc(SoftwareVersionEntity::getId) + .last("LIMIT 1")); + } + /** * 公开版本列表:桌面端"指定版本更新"下拉的可选版本(匿名可达,同 /latest)。 * 按创建时间倒序取最近 {@link PublicVersionLookup#DEFAULT_LIST_LIMIT} 条,字段口径 @@ -120,7 +140,9 @@ public class SoftwareVersionService { /** * 上传客户端软件安装包:zip 上传 MinIO(key:nanri-image/versions/{安全版本号}.zip), - * 并向 web_config 追加一条记录(不做"设为最新",桌面端按 created_at 倒序取第一条)。 + * 向 web_config 追加一条记录并把这条新记录标成最新版。 + * + *

标记落库放在 MinIO 上传成功之后:上传失败时不会留下一行「最新版」指向不存在的对象。 */ public Map uploadSoftwareVersion(String version, MultipartFile file) { String normalizedVersion = version == null ? "" : version.trim(); @@ -165,7 +187,8 @@ public class SoftwareVersionService { entity.setFileUrl(fileUrl); // 不显式写 created_at,走数据库 CURRENT_TIMESTAMP 默认值(与 Flask 行为一致) softwareVersionMapper.insert(entity); - log.info("[software-version] 版本记录已写入 web_config id={} version={} elapsedMs={}", + softwareVersionMapper.markLatestById(entity.getId()); + log.info("[software-version] 版本记录已写入 web_config 并标为最新版 id={} version={} elapsedMs={}", entity.getId(), normalizedVersion, elapsedMs(startedAt)); Map result = new LinkedHashMap<>(); @@ -226,6 +249,7 @@ public class SoftwareVersionService { entity.setVersion(normalizedVersion); entity.setFileUrl(ossStorageService.getSoftwareVersionDownloadUrl(objectKey)); softwareVersionMapper.insert(entity); + softwareVersionMapper.markLatestById(entity.getId()); SoftwareVersionEntity saved = softwareVersionMapper.selectById(entity.getId()); return toItemMap(saved == null ? entity : saved); } @@ -259,8 +283,17 @@ public class SoftwareVersionService { removedObjects += removeSoftwareVersionObjectQuietly(url) ? 1 : 0; } } - log.info("[software-version] 批量删除版本记录 ids={} deleted={} 清理关联文件数={}", - distinctIds, deleted, removedObjects); + // 删掉的行里若有最新版,必须马上把最新版改标到剩余最新的一条, + // 否则表里再无标记,客户端会停在旧版本上不动。 + SoftwareVersionEntity promoted = null; + if (targets.stream().anyMatch(t -> Boolean.TRUE.equals(t.getIsLatest()))) { + promoted = newestByCreatedAt(); + if (promoted != null) { + softwareVersionMapper.markLatestById(promoted.getId()); + } + } + log.info("[software-version] 批量删除版本记录 ids={} deleted={} 清理关联文件数={} 最新版改标={}", + distinctIds, deleted, removedObjects, promoted == null ? "-" : promoted.getVersion()); return deleted; } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionServiceTest.java new file mode 100644 index 000000000..9b888fc09 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionRetentionServiceTest.java @@ -0,0 +1,208 @@ +package com.nanri.aiimage.modules.softwareversion.service; + +import com.nanri.aiimage.common.service.DistributedJobLockService; +import com.nanri.aiimage.modules.softwareversion.mapper.SoftwareVersionMapper; +import com.nanri.aiimage.modules.softwareversion.model.entity.SoftwareVersionEntity; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.test.util.ReflectionTestUtils; + +import java.time.LocalDateTime; +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.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 客户端升级包保留期清理:按「保留最近 N 个」而非按天数过期, + * 避免重演 2026-09-08 那次全桶 30 天 ILM 误删在用安装包。 + */ +class SoftwareVersionRetentionServiceTest { + + private final SoftwareVersionMapper versionMapper = mock(SoftwareVersionMapper.class); + private final SoftwareVersionService versionService = mock(SoftwareVersionService.class); + private final DistributedJobLockService jobLockService = mock(DistributedJobLockService.class); + + /** + * 构造 count 条版本记录并按 created_at 倒序返回(id 越大越新、排在首位), + * 与 SoftwareVersionService#listSoftwareVersions 的 ORDER BY created_at DESC, id DESC 口径一致。 + */ + private static List newestFirst(int count) { + LocalDateTime base = LocalDateTime.of(2026, 9, 1, 10, 0); + return java.util.stream.IntStream.rangeClosed(1, count).mapToObj(i -> { + SoftwareVersionEntity entity = new SoftwareVersionEntity(); + entity.setId((long) i); + entity.setVersion("4.0." + i); + entity.setCreatedAt(base.plusDays(i - 1)); + return entity; + }).sorted((a, b) -> b.getCreatedAt().compareTo(a.getCreatedAt())).toList(); + } + + private SoftwareVersionRetentionService service(int keepCount, boolean dryRun) { + SoftwareVersionRetentionService service = new SoftwareVersionRetentionService( + versionMapper, versionService, jobLockService); + ReflectionTestUtils.setField(service, "keepCount", keepCount); + ReflectionTestUtils.setField(service, "dryRun", dryRun); + return service; + } + + private DistributedJobLockService.LockHandle lockAvailable() { + DistributedJobLockService.LockHandle handle = mock(DistributedJobLockService.LockHandle.class); + when(jobLockService.tryLock(anyString(), any())).thenReturn(handle); + return handle; + } + + @SuppressWarnings("unchecked") + private List captureDeletedIds() { + ArgumentCaptor> captor = ArgumentCaptor.forClass(List.class); + verify(versionService).deleteSoftwareVersions(captor.capture()); + return captor.getValue(); + } + + @Test + void dryRunLogsCandidatesButDeletesNothing() { + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(25)); + + service(20, true).purgeSupersededVersions(); + + verify(versionService, never()).deleteSoftwareVersions(anyList()); + } + + @Test + void deletesOnlyVersionsOlderThanKeepCount() { + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(25)); + + service(20, false).purgeSupersededVersions(); + + // 25 条按新→旧排列,保留前 20(id 25..6),删除 id 5..1 + assertEquals(List.of(5L, 4L, 3L, 2L, 1L), captureDeletedIds()); + } + + @Test + void neverTouchesTheLatestVersion() { + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(3)); + + service(2, false).purgeSupersededVersions(); + + List ids = captureDeletedIds(); + assertEquals(List.of(1L), ids); + assertFalse(ids.contains(3L), "最新记录不能被选为删除候选"); + } + + @Test + void clampsKeepCountToOneWhenMisconfigured() { + // 配成 0 会算出「一个都不保留」,把 61 个安装包连同最新一并删掉 + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(3)); + + service(0, false).purgeSupersededVersions(); + + assertEquals(List.of(2L, 1L), captureDeletedIds()); + } + + @Test + void capsDeletionsPerRunAndLeavesTheRestForNextRound() { + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(25)); + + service(1, false).purgeSupersededVersions(); + + List ids = captureDeletedIds(); + assertEquals(SoftwareVersionRetentionService.MAX_DELETIONS_PER_RUN, ids.size()); + assertEquals(24L, ids.get(0), "应从次新的一条开始删"); + assertTrue(ids.contains(5L)); + assertFalse(ids.contains(4L), "超出单轮上限的留给下一轮"); + } + + @Test + void neverDeletesTheFlaggedLatestEvenOutsideTheKeepWindow() { + lockAvailable(); + // 有人把最新版回设到一个较老的版本上:它落在 keep 之外,但带 is_latest 标记就不该被清 + List rows = newestFirst(25); + rows.stream().filter(r -> r.getId() == 10L).forEach(r -> r.setIsLatest(true)); + when(versionMapper.selectList(any())).thenReturn(rows); + + service(5, false).purgeSupersededVersions(); + + List ids = captureDeletedIds(); + assertFalse(ids.contains(10L), "is_latest 标记行必须免于保留期清理"); + assertEquals(19, ids.size(), "20 个候选里被标记的那 1 个应被剔除"); + } + + @Test + void skipsTheRoundWhenEverythingOutsideTheKeepWindowIsProtected() { + lockAvailable(); + List rows = newestFirst(3); + rows.forEach(r -> r.setIsLatest(true)); + when(versionMapper.selectList(any())).thenReturn(rows); + + service(1, false).purgeSupersededVersions(); + + verify(versionService, never()).deleteSoftwareVersions(anyList()); + } + + @Test + void doesNothingWhenWithinKeepCount() { + lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(5)); + + service(20, false).purgeSupersededVersions(); + + verify(versionMapper).selectList(any()); + verify(versionService, never()).deleteSoftwareVersions(anyList()); + } + + @Test + void skipsWhenAnotherInstanceHoldsLock() { + when(jobLockService.tryLock(anyString(), any())).thenReturn(null); + + service(20, false).purgeSupersededVersions(); + + verify(versionMapper, never()).selectList(any()); + verify(versionService, never()).deleteSoftwareVersions(anyList()); + } + + @Test + void releasesJobLockAfterRun() { + DistributedJobLockService.LockHandle handle = lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(25)); + + service(20, false).purgeSupersededVersions(); + + verify(handle).close(); + } + + @Test + void queryFailureIsLoggedAndDoesNotThrow() { + lockAvailable(); + when(versionMapper.selectList(any())).thenThrow(new IllegalStateException("db down")); + + service(20, false).purgeSupersededVersions(); + + verify(versionService, never()).deleteSoftwareVersions(anyList()); + } + + @Test + void deleteFailureDoesNotThrowAndStillReleasesLock() { + DistributedJobLockService.LockHandle handle = lockAvailable(); + when(versionMapper.selectList(any())).thenReturn(newestFirst(25)); + when(versionService.deleteSoftwareVersions(anyList())).thenThrow(new IllegalStateException("oss 不可达")); + + service(20, false).purgeSupersededVersions(); + + verify(versionService, times(1)).deleteSoftwareVersions(anyList()); + verify(handle).close(); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionServiceTest.java new file mode 100644 index 000000000..9ebe1da3f --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionServiceTest.java @@ -0,0 +1,166 @@ +package com.nanri.aiimage.modules.softwareversion.service; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import com.nanri.aiimage.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.mockito.ArgumentCaptor; + +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.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 「最新版」必须是 web_config 上的显式标记,而不是按 created_at 现场算出来的。 + * 现场算的问题:补插一条 created_at 较早的记录,就会把全体客户端的更新目标静默带偏。 + */ +class SoftwareVersionServiceTest { + + private final SoftwareVersionMapper versionMapper = mock(SoftwareVersionMapper.class); + private final OssStorageService ossStorageService = mock(OssStorageService.class); + + private SoftwareVersionService service() { + return new SoftwareVersionService(versionMapper, ossStorageService); + } + + @BeforeAll + static void initializeMybatisMetadata() { + // 不初始化表元信息,LambdaQueryWrapper 解析不出列名,is_latest 的映射就无从校验 + TableInfoHelper.initTableInfo( + new MapperBuilderAssistant(new MybatisConfiguration(), ""), SoftwareVersionEntity.class); + } + + private static SoftwareVersionEntity row(long id, String version, boolean latest, int daysAgo) { + SoftwareVersionEntity entity = new SoftwareVersionEntity(); + entity.setId(id); + entity.setVersion(version); + entity.setFileUrl("https://oss.aishufu.top/client/nanri-image/versions/" + version + ".zip"); + entity.setIsLatest(latest); + entity.setCreatedAt(LocalDateTime.of(2026, 9, 1, 10, 0).minusDays(daysAgo)); + return entity; + } + + @SuppressWarnings("unchecked") + private String capturedLatestQuery() { + ArgumentCaptor> captor = + ArgumentCaptor.forClass(LambdaQueryWrapper.class); + verify(versionMapper).selectOne(captor.capture()); + return captor.getValue().getSqlSegment(); + } + + @Test + void isLatestFieldMapsToTheMigrationColumn() { + when(versionMapper.selectOne(any())).thenReturn(row(1, "4.0.32", true, 0)); + + service().latestSoftwareVersion(); + + // V136 建的列名就是 is_latest;实体字段若改名,这里会先红,而不是等到生产 + assertTrue(capturedLatestQuery().contains("is_latest"), + "最新版查询应过滤 is_latest 列,实际 SQL 片段: " + capturedLatestQuery()); + } + + @Test + void returnsTheFlaggedRowWithoutTouchingTheFlag() { + when(versionMapper.selectOne(any())).thenReturn(row(1, "4.0.32", true, 0)); + + Map result = service().latestSoftwareVersion(); + + assertEquals("4.0.32", result.get("version")); + verify(versionMapper, never()).markLatestById(any()); + } + + @Test + void fallsBackToNewestByCreatedAtAndReMarksWhenNothingIsFlagged() { + // 第一次查(按标记)落空,第二次查(按时间)才拿到——手工删库或旧备份库接上时的形态 + SoftwareVersionEntity newest = row(77, "4.0.31", false, 1); + when(versionMapper.selectOne(any())).thenReturn(null, newest); + + Map result = service().latestSoftwareVersion(); + + assertEquals("4.0.31", result.get("version")); + verify(versionMapper).markLatestById(77L); + } + + @Test + void emptyTableStillReturnsNullVersion() { + when(versionMapper.selectOne(any())).thenReturn(null); + + Map result = service().latestSoftwareVersion(); + + assertEquals(null, result.get("version")); + assertEquals(null, result.get("file_url")); + verify(versionMapper, never()).markLatestById(any()); + } + + @Test + void confirmUploadMarksTheNewRowAsLatest() { + String objectKey = SoftwareVersionService.STORAGE_PATH_PREFIX + "4.0.33.zip"; + when(ossStorageService.softwareVersionObjectSize(objectKey)).thenReturn(1024L * 1024); + when(ossStorageService.getSoftwareVersionDownloadUrl(objectKey)) + .thenReturn("https://oss.aishufu.top/" + objectKey); + when(versionMapper.insert(any(SoftwareVersionEntity.class))).thenAnswer(invocation -> { + ((SoftwareVersionEntity) invocation.getArgument(0)).setId(200L); + return 1; + }); + when(versionMapper.selectById(200L)).thenReturn(row(200, "4.0.33", true, 0)); + + service().confirmSoftwareVersion("4.0.33"); + + verify(versionMapper).markLatestById(200L); + } + + @Test + void deletingTheFlaggedRowPromotesTheNewestRemaining() { + when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(9, "4.0.32", true, 0))); + when(versionMapper.deleteById(9L)).thenReturn(1); + when(versionMapper.selectCount(any())).thenReturn(0L); + when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null); + when(versionMapper.selectOne(any())).thenReturn(row(8, "4.0.31", false, 1)); + + service().deleteSoftwareVersions(List.of(9L)); + + verify(versionMapper).markLatestById(8L); + } + + @Test + void deletingNonFlaggedRowsLeavesTheFlagAlone() { + when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(5, "4.0.28", false, 4))); + when(versionMapper.deleteById(5L)).thenReturn(1); + when(versionMapper.selectCount(any())).thenReturn(0L); + when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null); + + service().deleteSoftwareVersions(List.of(5L)); + + verify(versionMapper, never()).markLatestById(any()); + verify(versionMapper, never()).selectOne(any()); + } + + @Test + void deletingTheOnlyRowDoesNotMarkAnything() { + when(versionMapper.selectBatchIds(anyList())).thenReturn(List.of(row(9, "4.0.32", true, 0))); + when(versionMapper.deleteById(9L)).thenReturn(1); + when(versionMapper.selectCount(any())).thenReturn(0L); + when(ossStorageService.resolveObjectKey(anyString())).thenReturn(null); + when(versionMapper.selectOne(any())).thenReturn(null); + + service().deleteSoftwareVersions(List.of(9L)); + + verify(versionMapper, never()).markLatestById(any()); + } +}