refactor(phase-4): 解散万能 util——similarasin/util 与 common/util 按域归位

similarasin/util 7 支:
- 域内件(SimilarAsinImageEmbedder/PuzzleImageMerger/SimilarAsinLogSupport/
  BoundedImageCache)并入既有 service/support 先例;
- 通用 Excel 件(ExcelCellImageWriter/WpsCellImageWriter)归 common/excel;
- 仅测试用的 SimilarAsinPerfFixture 移出生产源到 src/test。

common/util 13 支解散为四个关注点包:excel(读/写/单元格图片)、
text(BrandLabel/SecretMasking/UserMessages)、task(行过滤/分组传播/判死文案/
删除台账/锁跳过留痕)、support(LRU/下载头/线程池)。老 util 目录不再存在。

纯粹的包搬迁与 import 重写(diff 219 增 / 217 删),零行为改动:
搬迁前后由 SimilarAsinCreateTaskSnapshotTest 的建单入口 golden 对撞相等;
新增 MovedComponentScanTest 钉住三枚 @Component 仍被根包扫描发现、老包零残留。
This commit is contained in:
2026-10-23 00:59:53 +08:00
parent 8f6913fb4a
commit dbe35dfcb5
162 changed files with 282 additions and 217 deletions
@@ -0,0 +1,63 @@
package com.nanri.aiimage.common;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Phase 4 归位的装配面护栏:@Component 换了包,组件扫描必须还能发现它。
*
* <p>为什么单立一条:本机没有可起的隔离 MySQL/Redis(Phase 3 已登记同一缺口),
* {@code mvn -o spring-boot:run} 只能连线上库,不能为这次判据去碰它。这里改用
* Spring 自己的扫描器按应用根包 {@code com.nanri.aiimage} 实扫一遍——
* 扫描根没变、Bean 简单名没变,被搬动的三枚组件必须仍然在候选集里;
* 同时钉住「解散后的包不得再有组件」这条,防止老包被重新写回。
*/
class MovedComponentScanTest {
private static final Set<String> MOVED_COMPONENTS = Set.of(
"com.nanri.aiimage.common.task.LockSkipWitness",
"com.nanri.aiimage.modules.similarasin.service.support.PuzzleImageMerger",
"com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder");
private static Set<String> componentsUnder(String basePackage) {
ClassPathScanningCandidateComponentProvider provider =
new ClassPathScanningCandidateComponentProvider(false) {
@Override
protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
return beanDefinition.getMetadata().isIndependent();
}
};
provider.addIncludeFilter(new AnnotationTypeFilter(Component.class));
List<BeanDefinition> found = provider.findCandidateComponents(basePackage).stream().toList();
return found.stream().map(BeanDefinition::getBeanClassName).collect(Collectors.toSet());
}
@Test
void movedComponentsAreStillDiscoveredFromTheApplicationRootPackage() {
Set<String> discovered = componentsUnder("com.nanri.aiimage");
assertFalse(discovered.isEmpty(), "组件扫描一个候选都没找到——扫描根或类路径接错了");
for (String bean : MOVED_COMPONENTS) {
assertTrue(discovered.contains(bean),
"归位后组件扫描抓不到 " + bean + "(Bean 装配会缺件)");
}
}
@Test
void dissolvedPackagesHaveNoComponentsLeft() {
assertTrue(componentsUnder("com.nanri.aiimage.common.util").isEmpty(),
"common.util 已解散,老包里不许再有 @Component");
assertTrue(componentsUnder("com.nanri.aiimage.modules.similarasin.util").isEmpty(),
"modules.similarasin.util 已解散,老包里不许再有 @Component");
}
}
@@ -0,0 +1,166 @@
package com.nanri.aiimage.common.excel;
import org.junit.jupiter.api.Test;
import java.time.Duration;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ExcelCellImageWriterTest {
@Test
void patchedCellImageValueMetadataUsesOneBasedVmIndexes() throws Exception {
Path dir = Files.createTempDirectory("excel-cell-image-test-");
Path xlsx = dir.resolve("result.xlsx");
writeMinimalWorkbook(xlsx);
ExcelCellImageWriter.Session session = ExcelCellImageWriter.createSession();
session.registerImage(1, 9, new byte[]{1, 2, 3});
session.registerImage(1, 10, new byte[]{4, 5, 6});
ExcelCellImageWriter.patchXlsxFile(xlsx.toFile(), session);
try (ZipFile zip = new ZipFile(xlsx.toFile())) {
String sheet = read(zip, "xl/worksheets/sheet1.xml");
// cell @vm 是 [MS-XLSX] 规范里的 1-based 索引(0 表示"无 metadata")。
assertTrue(sheet.contains("<c r=\"J2\" t=\"e\" vm=\"1\"><v>#VALUE!</v></c>"));
assertTrue(sheet.contains("<c r=\"K2\" t=\"e\" vm=\"2\"><v>#VALUE!</v></c>"));
// futureMetadata 内部块仍然是 0-based。
String metadata = read(zip, "xl/metadata.xml");
assertTrue(metadata.contains("<xlrd:rvb i=\"0\"/>"));
assertTrue(metadata.contains("<xlrd:rvb i=\"1\"/>"));
assertEquals(2, maxVm(sheet));
}
}
@Test
void streamsRegisteredImagePathIntoWorkbookMedia() throws Exception {
Path dir = Files.createTempDirectory("excel-cell-image-path-test-");
Path xlsx = dir.resolve("result.xlsx");
Path image = dir.resolve("thumb.jpeg");
byte[] imageBytes = new byte[]{7, 8, 9, 10};
writeMinimalWorkbook(xlsx);
Files.write(image, imageBytes);
ExcelCellImageWriter.Session session = ExcelCellImageWriter.createSession();
session.registerImage(1, 9, image);
ExcelCellImageWriter.patchXlsxFile(xlsx.toFile(), session);
try (ZipFile zip = new ZipFile(xlsx.toFile())) {
assertArrayEquals(imageBytes,
zip.getInputStream(zip.getEntry("xl/media/excelcellimage1.jpeg")).readAllBytes());
}
}
@Test
void patchesTenThousandImageCellsWithinLinearTimeBudget() {
assertTimeoutPreemptively(Duration.ofSeconds(10), () -> {
Path dir = Files.createTempDirectory("excel-cell-image-linear-test-");
Path xlsx = dir.resolve("result.xlsx");
writeWorkbookWithImageCells(xlsx, 10_000);
ExcelCellImageWriter.Session session = ExcelCellImageWriter.createSession();
for (int row = 1; row <= 10_000; row++) {
session.registerImage(row, 9, new byte[]{1});
}
ExcelCellImageWriter.patchXlsxFile(xlsx.toFile(), session);
try (ZipFile zip = new ZipFile(xlsx.toFile())) {
String sheet = read(zip, "xl/worksheets/sheet1.xml");
assertEquals(10_000, maxVm(sheet));
assertTrue(sheet.contains("<c r=\"J10001\" t=\"e\" vm=\"10000\"><v>#VALUE!</v></c>"));
}
});
}
private static int maxVm(String sheet) {
Matcher matcher = Pattern.compile("vm=\"(\\d+)\"").matcher(sheet);
int max = -1;
while (matcher.find()) {
max = Math.max(max, Integer.parseInt(matcher.group(1)));
}
return max;
}
private static String read(ZipFile zip, String name) throws Exception {
return new String(zip.getInputStream(zip.getEntry(name)).readAllBytes(), StandardCharsets.UTF_8);
}
private static void writeMinimalWorkbook(Path xlsx) throws Exception {
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(xlsx))) {
write(out, "[Content_Types].xml", """
<?xml version="1.0" encoding="UTF-8"?>
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
<Default Extension="xml" ContentType="application/xml"/>
<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
<Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>
</Types>
""");
write(out, "_rels/.rels", """
<?xml version="1.0" encoding="UTF-8"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>
</Relationships>
""");
write(out, "xl/workbook.xml", """
<?xml version="1.0" encoding="UTF-8"?>
<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
<sheets><sheet name="Sheet1" r:id="rId1" sheetId="1"/></sheets>
</workbook>
""");
write(out, "xl/_rels/workbook.xml.rels", """
<?xml version="1.0" encoding="UTF-8"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/>
</Relationships>
""");
write(out, "xl/worksheets/sheet1.xml", """
<?xml version="1.0" encoding="UTF-8"?>
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
<sheetData>
<row r="2">
<c r="J2" t="inlineStr"><is><t>main</t></is></c>
<c r="K2" t="inlineStr"><is><t>puzzle</t></is></c>
</row>
</sheetData>
</worksheet>
""");
}
}
private static void writeWorkbookWithImageCells(Path xlsx, int imageCount) throws Exception {
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(xlsx))) {
write(out, "[Content_Types].xml", "<Types></Types>");
write(out, "xl/_rels/workbook.xml.rels", "<Relationships></Relationships>");
StringBuilder sheet = new StringBuilder("<worksheet><sheetData>");
for (int row = 2; row <= imageCount + 1; row++) {
sheet.append("<row r=\"").append(row).append("\"><c r=\"J").append(row)
.append("\" t=\"inlineStr\"><is><t>image</t></is></c></row>");
}
sheet.append("</sheetData></worksheet>");
write(out, "xl/worksheets/sheet1.xml", sheet.toString());
}
}
private static void write(ZipOutputStream out, String name, String content) throws Exception {
out.putNextEntry(new ZipEntry(name));
out.write(content.getBytes(StandardCharsets.UTF_8));
out.closeEntry();
}
}
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.excel;
import com.alibaba.excel.EasyExcel;
import com.nanri.aiimage.common.exception.BusinessException;
@@ -0,0 +1,142 @@
package com.nanri.aiimage.common.excel;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.junit.jupiter.api.Test;
import javax.imageio.ImageIO;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.zip.ZipFile;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* WPS DISPIMG 协议回归测试:真实写入流水线(SXSSF 写公式格 → patch)产出的 part 必须与
* WPS 12.1 实测通过的原生形态一致。2026-09-09 曾因三处协议细节与 WPS 原生产物不一致
* (Content-Type / workbook 关系类型 / 公式格形态)导致 WPS 打开显示 #REF,本测试锁死这些契约。
*/
class WpsCellImageWriterProtocolTest {
private static byte[] jpeg(int size) throws Exception {
BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
Graphics2D g = image.createGraphics();
g.setColor(Color.WHITE);
g.fillRect(0, 0, size, size);
g.dispose();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(ImageIO.write(image, "jpg", baos), "JPEG writer should be available");
return baos.toByteArray();
}
@Test
void patchedWorkbookMatchesWpsNativeShape() throws Exception {
File xlsx = File.createTempFile("wps-dispimg-protocol-", ".xlsx");
xlsx.deleteOnExit();
try {
WpsCellImageWriter.Session session = WpsCellImageWriter.createSession();
byte[] jpeg = jpeg(300);
String imageId = session.registerImage(jpeg, 300, 300);
assertNotNull(imageId, "图片注册应返回 ID");
assertTrue(imageId.matches("ID_[0-9A-F]{32}"), "图片 ID 应为 WPS 风格 ID_+32hex, got=" + imageId);
try (SXSSFWorkbook workbook = new SXSSFWorkbook(200)) {
Sheet sheet = workbook.createSheet("相似asin检测");
CellStyle headerStyle = workbook.createCellStyle();
Font font = workbook.createFont();
font.setBold(true);
headerStyle.setFont(font);
sheet.setColumnWidth(12, 80 * 256);
Row header = sheet.createRow(0);
header.createCell(0).setCellValue("id");
sheet.createRow(1).createCell(0).setCellValue("827665");
Row row = sheet.createRow(1);
row.setHeightInPoints(409f);
row.createCell(12).setCellFormula(WpsCellImageWriter.dispImgFormula(imageId));
try (var fos = Files.newOutputStream(xlsx.toPath())) {
workbook.write(fos);
}
workbook.dispose();
}
WpsCellImageWriter.patchXlsxFile(xlsx, session);
try (ZipFile zf = new ZipFile(xlsx)) {
String sheetXml = readEntry(zf, "xl/worksheets/sheet1.xml");
assertTrue(sheetXml.contains("<f t=\"shared\" ref=\"M2\">_xlfn.DISPIMG(\"" + imageId + "\",1)</f>"),
"公式格应为 WPS 原生形态(f t=shared/ref+公式字符串 v), got=" + snippet(sheetXml, "M2"));
assertTrue(sheetXml.contains("<v>=DISPIMG(\"" + imageId + "\",1)</v>"),
"公式格 <v> 应为 =DISPIMG(...) 形态");
String ct = readEntry(zf, "[Content_Types].xml");
assertTrue(ct.contains("application/vnd.wps-officedocument.cellimage+xml"),
"cellimages Content-Type 应为 vnd.wps-officedocument.cellimage+xml");
String rels = readEntry(zf, "xl/_rels/workbook.xml.rels");
assertTrue(rels.contains("http://www.wps.cn/officeDocument/2020/cellImage"),
"cellimages 关系类型应为 wps.cn/officeDocument/2020/cellImage");
String cellImages = readEntry(zf, "xl/cellimages.xml");
assertTrue(cellImages.contains("r:embed=\"rId1\""), "cellimages.xml 应引用 rId1");
assertTrue(cellImages.contains("<a:xfrm>"), "spPr 应含 a:xfrm");
assertTrue(cellImages.contains("cx=\"2857500\""), "a:ext 应按 300px×9525EMU 换算");
assertTrue(cellImages.contains("name=\"" + imageId + "\""), "cNvPr name 应为图片 ID");
String cellImagesRels = readEntry(zf, "xl/_rels/cellimages.xml.rels");
assertTrue(cellImagesRels.contains("Target=\"media/cellimage1.jpeg\""), "rels 应指向 media/cellimage1.jpeg");
}
} finally {
Files.deleteIfExists(xlsx.toPath());
}
}
@Test
void repatchIsIdempotent() throws Exception {
File xlsx = File.createTempFile("wps-dispimg-idempotent-", ".xlsx");
xlsx.deleteOnExit();
try {
WpsCellImageWriter.Session session = WpsCellImageWriter.createSession();
String imageId = session.registerImage(jpeg(64), 64, 64);
try (SXSSFWorkbook workbook = new SXSSFWorkbook(200)) {
Sheet sheet = workbook.createSheet("s");
Row row = sheet.createRow(1);
row.setHeightInPoints(409f);
row.createCell(12).setCellFormula(WpsCellImageWriter.dispImgFormula(imageId));
try (var fos = Files.newOutputStream(xlsx.toPath())) {
workbook.write(fos);
}
workbook.dispose();
}
WpsCellImageWriter.patchXlsxFile(xlsx, session);
WpsCellImageWriter.patchXlsxFile(xlsx, session);
try (ZipFile zf = new ZipFile(xlsx)) {
String sheetXml = readEntry(zf, "xl/worksheets/sheet1.xml");
assertTrue(sheetXml.contains("<f t=\"shared\" ref=\"M2\">_xlfn.DISPIMG(\"" + imageId + "\",1)</f>"),
"重复 patch 不应破坏公式格");
assertTrue(!sheetXml.contains("<f>_xlfn.DISPIMG"),
"不应残留未规范化的裸公式格");
}
} finally {
Files.deleteIfExists(xlsx.toPath());
}
}
private static String readEntry(ZipFile zf, String name) throws Exception {
try (var in = zf.getInputStream(zf.getEntry(name))) {
return new String(in.readAllBytes(), StandardCharsets.UTF_8);
}
}
private static String snippet(String xml, String cellRef) {
int idx = xml.indexOf("r=\"" + cellRef + "\"");
return idx < 0 ? "<not found>" : xml.substring(Math.max(0, idx), Math.min(xml.length(), idx + 160));
}
}
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import org.junit.jupiter.api.Test;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import org.junit.jupiter.api.Test;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import org.junit.jupiter.api.Test;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.text;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.text;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;