From 6e5c0df1a41946e9fa2b507716b6f415aa591d8e 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:24:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=B8=8A=E6=9E=B6):=20=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=84=E5=8F=96=E5=B9=B6=E5=8F=91=E6=8C=89=20IO=20=E6=94=B6?= =?UTF-8?q?=E5=8F=A3=20+=20=E7=BC=BA=E5=9B=BE=E5=B0=B1=E5=9C=B0=E8=A1=A5?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E4=BF=AE=E7=BA=BF=E4=B8=8A=2014591=20?= =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E7=89=87=E5=8D=95=E5=85=83=E6=A0=BC=E9=9D=99?= =?UTF-8?q?=E9=BB=98=E7=95=99=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 线上日志证据:4 核机器上 `image pool initialized requested=2 effective=2 cpuBoundLimit=2`, 8 个下载 worker 被 CPU 核数压到 2;一次组装 total=4045 行只完成 1968 行就撞上 1800s 预算, 尾部 URL 全部预取不到,落单元格时直接留空且用户无感知。 三层修复: 1. 下载池与缩放池解耦——下载是 IO 等待,默认 8、上限只挡配置写错(64);缩放仍按 CPU 收口。 OkHttp 连接池随之放大,否则默认 5 条空闲连接会让 3 个 worker 反复重做 TLS 握手。 2. 预取未覆盖到的 URL 在写单元格时就地补下载(单张落盘、不驻堆),共用一个 300s 窗口; 窗口从「预取收工、开始写单元格」起算且首个 workbook 独占——在建 spool 时 arm 会被 1800s 预取整个吃满,等于没有兜底。已预取失败的 URL 记入失败集跳过,避免每个死源站 再烧掉一次 下载超时×重试 的预算。 3. 交付不再静默:缺行/缺图写入 result.notice(状态仍为 SUCCESS,不碰 task.errorMessage, 否则会被 completeLlmFileJob 的失败判据读成整单失败)。 imagePrefetchBudgetSeconds 在生产配置里无人读取,改名 imageEmbedFallbackBudgetSeconds 并 接上实际用途。 --- .../aiimage/config/SimilarAsinProperties.java | 18 +- .../support/SimilarAsinResultTextSupport.java | 38 +++- .../SimilarAsinResultWorkbookAssembler.java | 96 +++++++++-- .../util/SimilarAsinImageEmbedder.java | 163 ++++++++++++++---- .../src/main/resources/application.yml | 19 +- .../util/SimilarAsinImageEmbedderTest.java | 85 +++++++-- 6 files changed, 338 insertions(+), 81 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java index 47a038be0..95f81d289 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java @@ -41,9 +41,10 @@ public class SimilarAsinProperties { private int llmFlushPendingMinutes = 1; /** - * 图片下载、解码和缩放共享该池;4 核生产机默认 2,避免图片任务占满整机 CPU。 + * 图片下载并发。下载是 IO 等待,不再按 CPU 核数收口(resize 的 CPU 槽位由 + * SimilarAsinImageEmbedder 单独限流),所以 4 核生产机也可以开到 8。 */ - private int imageDownloadPoolSize = 2; + private int imageDownloadPoolSize = 8; /** * 单张图片下载超时(秒)。 @@ -53,7 +54,7 @@ public class SimilarAsinProperties { */ private int imageDownloadTimeoutSeconds = 5; - /** 单个结果文件整批图片预取预算,耗尽后缺图单元格降级为 URL。 */ + /** 单个结果文件整批图片预取预算;耗尽后剩余的 URL 交给 embed 阶段按补图预算兜底。 */ private int imagePrefetchTimeoutSeconds = 1800; /** 多源结果文件组装的单任务硬上限;运行期间由文件任务 heartbeat 保活。 */ @@ -139,11 +140,14 @@ public class SimilarAsinProperties { private int imageCacheTouchFlushThreshold = 1000; /** - * Task 16:图片预取短预算(秒)。assemble 阶段预取在预算内 best-effort - * 尽力完成,预算耗尽即取消在途任务并回退 URL,避免整批预取拖垮结果组装。 - * 该值仅作用于 assemble 阶段预取;后台预热仍使用 imagePrefetchTimeoutSeconds。 + * embed(写单元格)阶段的缺图补下载预算(秒)。预取预算 imagePrefetchTimeoutSeconds + * 耗尽后没落到临时目录的 URL,过去直接留空;现在写单元格时在这个时间窗内就地补下载 + * (单张落盘、不把字节留在堆上),窗耗尽才留空并计入交付缺失提示。 + * + *
窗口从第一个 workbook 进入写单元格阶段起算,跨 workbook 共享同一个窗口, + * 所以它直接叠加到结果组装总耗时上:默认 300s,远小于 result-file-timeout-minutes。 */ - private int imagePrefetchBudgetSeconds = 60; + private int imageEmbedFallbackBudgetSeconds = 300; /** * 货源查询直连 LLM 模式开关(默认 true:新任务与存量 PENDING 批次都走直连 LLM, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java index c4ce13bdb..b7c3b100d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java @@ -15,7 +15,7 @@ import java.util.regex.Pattern; *
行数不全的典型成因是客户端采不到货源(扩展不可用、商品页抓取失败),
+ * 这些行在结果里显示"未检测"。任务状态按产品决定仍保持成功,但必须让用户
+ * 看出"这批只跑了一部分"——否则 1000 行的文件里 790 行空白会被当成
+ * "跑了但没结果"(2026-09-20 任务 28551)。
+ */
+ public static String incompleteRowsMessage(long resolvedRows, int totalRows) {
+ long undetectedRows = (long) totalRows - resolvedRows;
+ if (undetectedRows <= 0) {
+ return null;
+ }
+ return "仅完成 " + resolvedRows + "/" + totalRows
+ + " 行,其余 " + undetectedRows + " 行未采到数据(未检测)";
+ }
+
+ /**
+ * 图片单元格缺口提示,与 {@link #incompleteRowsMessage} 同一产品口径:任务状态保持成功,
+ * 但交付缺图必须让用户看出来——过去预取预算耗尽后这些格子是静默留白的
+ * (线上 14591 个单元格),用户只能自己打开文件逐行发现。
+ */
+ public static String blankImageCellsMessage(long blankCells) {
+ if (blankCells <= 0) {
+ return null;
+ }
+ return "另有 " + blankCells + " 个图片单元格未能嵌入(图片源站响应过慢),数据列不受影响";
+ }
+
public static boolean isExportableResultRow(SimilarAsinResultRowDto row) {
if (row == null) {
return false;
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java
index c5e94afba..7818ffa4e 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java
@@ -152,6 +152,7 @@ public class SimilarAsinResultWorkbookAssembler {
? properties.getImageCacheMaxBytes()
: BoundedImageCache.DEFAULT_MAX_BYTES;
BoundedImageCache taskImageCache = new BoundedImageCache(imageCacheMaxBytes);
+ SimilarAsinImageEmbedder.ImageSpool imageSpool = createTaskImageSpool(outputDir);
try {
int timeoutMinutes = Math.max(1, properties.getResultFileTimeoutMinutes());
long deadlineNanos = System.nanoTime() + TimeUnit.MINUTES.toNanos(timeoutMinutes);
@@ -185,7 +186,7 @@ public class SimilarAsinResultWorkbookAssembler {
List.of("不符合"),
"[similar-asin] taskId=" + task.getId()
);
- writeResultWorkbook(xlsx, captured.rows(), sourceResultMap, taskImageCache);
+ writeResultWorkbook(xlsx, captured.rows(), sourceResultMap, taskImageCache, imageSpool);
ensureResultAssemblyNotInterrupted();
return new SourceResultWorkbook(
xlsx, filename, captured.rows().size(), persistedRows,
@@ -269,7 +270,9 @@ public class SimilarAsinResultWorkbookAssembler {
result.setResultFileSize(uploadFile.length());
result.setResultContentType(contentType);
result.setRowCount(parsedRows.size());
+ applyPartialDeliveryNotice(task, result, resolvedRows, parsedRows.size(), imageSpool);
} finally {
+ closeTaskImageSpool(imageSpool, task.getId());
taskImageCache.clear();
for (File workbookFile : workbookFiles) {
if (workbookFile.exists() && !workbookFile.delete()) {
@@ -337,6 +340,7 @@ public class SimilarAsinResultWorkbookAssembler {
? properties.getImageCacheMaxBytes()
: BoundedImageCache.DEFAULT_MAX_BYTES;
BoundedImageCache taskImageCache = new BoundedImageCache(imageCacheMaxBytes);
+ SimilarAsinImageEmbedder.ImageSpool imageSpool = createTaskImageSpool(outputDir);
try {
// 单源和多源统一提交真实 Future,确保超时取消能中断实际 workbook 线程。
// 所有源文件共享同一个绝对 deadline,避免逐个 Future 各等待一轮完整超时。
@@ -356,7 +360,7 @@ public class SimilarAsinResultWorkbookAssembler {
workbookFiles.add(xlsx);
futures.add(assembleExecutor.submit(() -> {
ensureResultAssemblyNotInterrupted();
- writeResultWorkbook(xlsx, captured.rows(), resultMap, taskImageCache);
+ writeResultWorkbook(xlsx, captured.rows(), resultMap, taskImageCache, imageSpool);
ensureResultAssemblyNotInterrupted();
return new SourceResultWorkbook(xlsx, filename, captured.rows().size());
}));
@@ -426,7 +430,9 @@ public class SimilarAsinResultWorkbookAssembler {
result.setResultFileSize(uploadFile.length());
result.setResultContentType(contentType);
result.setRowCount(SimilarAsinPayloadSupport.resolveAllRows(parsed).size());
+ applyPartialDeliveryNotice(task, result, resolvedRows, parsedRows.size(), imageSpool);
} finally {
+ closeTaskImageSpool(imageSpool, task.getId());
for (File workbookFile : workbookFiles) {
if (workbookFile.exists() && !workbookFile.delete()) {
log.warn("[similar-asin] delete temp xlsx failed file={}", workbookFile);
@@ -747,18 +753,14 @@ public class SimilarAsinResultWorkbookAssembler {
private void writeResultWorkbook(File xlsx,
List spool 是任务级的、多个 workbook 并行写,所以第一个进来 arm 的 workbook 定下截止点,
+ * 后来的不续期:否则每个 workbook 各要一个窗口,补图能烧掉的时间就没有上界了。
+ */
+ public void allowFallbackDownload(long budgetSeconds) {
+ if (budgetSeconds <= 0L) {
+ return;
+ }
+ fallbackDeadlineNanos.compareAndSet(Long.MIN_VALUE,
+ System.nanoTime() + TimeUnit.SECONDS.toNanos(budgetSeconds));
+ }
+
+ boolean fallbackAllowed() {
+ return System.nanoTime() < fallbackDeadlineNanos.get();
+ }
+
+ /** 补下载成功的张数与最终留空的单元格数:交付完整性口径,供结果提示与日志使用。 */
+ public int fallbackDownloaded() {
+ return fallbackDownloaded.get();
+ }
+
+ public int blankCells() {
+ return blankCells.get();
+ }
+
+ void countedFallbackDownload() {
+ fallbackDownloaded.incrementAndGet();
+ }
+
+ void countedBlankCell() {
+ blankCells.incrementAndGet();
+ }
+
+ /** 记下"预取试过这张但失败了",embed 阶段的补下载据此跳过,不把有限的窗口喂给死站。 */
+ void markPrefetchFailed(String url) {
+ if (url != null && !url.isBlank()) {
+ prefetchFailed.add(url.trim());
+ }
+ }
+
+ boolean prefetchFailed(String url) {
+ return url != null && prefetchFailed.contains(url.trim());
+ }
+
/** Task 18:暴露临时目录,供生命周期校验与日志。 */
public Path directory() {
return directory;
diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml
index ef9a2737d..3de0b26d5 100644
--- a/backend-java/src/main/resources/application.yml
+++ b/backend-java/src/main/resources/application.yml
@@ -238,6 +238,13 @@ aiimage:
scan-retention-days: ${AIIMAGE_SHOP_DUPLICATE_SCAN_RETENTION_DAYS:7}
scan-retention-batch-size: ${AIIMAGE_SHOP_DUPLICATE_SCAN_RETENTION_BATCH_SIZE:200}
scan-retention-cron: ${AIIMAGE_SHOP_DUPLICATE_SCAN_RETENTION_CRON:0 50 3 * * *}
+ # 客户端升级包(MinIO client 桶 nanri-image/versions/):此前只增不删,2026-09-21 已堆到
+ # 61 个对象 / 6.2GiB。按「保留最近 N 个」而不是按天过期——2026-09-08 那次给 client 桶根
+ # 加全桶 30 天 ILM,误删了 3.0.24~3.0.37 共 9 个仍在下载的安装包。默认 dry-run 只记日志。
+ software-version:
+ retention-keep-count: ${AIIMAGE_SOFTWARE_VERSION_RETENTION_KEEP_COUNT:20}
+ retention-dry-run: ${AIIMAGE_SOFTWARE_VERSION_RETENTION_DRY_RUN:true}
+ retention-cron: ${AIIMAGE_SOFTWARE_VERSION_RETENTION_CRON:0 50 4 * * *}
permission-schema-init:
enabled: ${AIIMAGE_PERMISSION_SCHEMA_INIT_ENABLED:false}
task-pressure:
@@ -290,8 +297,8 @@ aiimage:
max-attempt: ${AIIMAGE_TASK_RESUME_MAX_ATTEMPT:3}
window-minutes: ${AIIMAGE_TASK_RESUME_WINDOW_MINUTES:30}
limit: ${AIIMAGE_TASK_RESUME_LIMIT:20}
- coze-task:
- max-concurrent: ${AIIMAGE_COZE_TASK_MAX_CONCURRENT:12}
+ task-queue:
+ max-concurrent: ${AIIMAGE_TASK_QUEUE_MAX_CONCURRENT:12}
brand-check:
base-url: ${AIIMAGE_BRAND_CHECK_BASE_URL:http://47.110.241.161:16890}
path: ${AIIMAGE_BRAND_CHECK_PATH:/brand_check}
@@ -318,8 +325,11 @@ aiimage:
# 多任务并行时会成倍放大、打满用户自己的网关密钥配额(2026-09-14 随品牌一起下调)。
llm-row-concurrency: ${AIIMAGE_APPEARANCE_PATENT_LLM_ROW_CONCURRENCY:5}
max-parse-rows: ${AIIMAGE_APPEARANCE_PATENT_MAX_PARSE_ROWS:50000}
+ # LLM 覆盖率下限:组装结果时拿到结论的行占比低于该值即判任务失败(<=0 关闭)。
+ # 正常任务实测约 0.91,默认 0.5 只拦"904 行只检 1 行"这类塌陷。
+ llm-coverage-min-ratio: ${AIIMAGE_APPEARANCE_PATENT_LLM_COVERAGE_MIN_RATIO:0.5}
llm-retry-times: ${AIIMAGE_APPEARANCE_PATENT_LLM_RETRY_TIMES:3}
- flush-pending-minutes: ${AIIMAGE_APPEARANCE_PATENT_FLUSH_PENDING_MINUTES:${AIIMAGE_APPEARANCE_PATENT_COZE_FLUSH_PENDING_MINUTES:1}}
+ flush-pending-minutes: ${AIIMAGE_APPEARANCE_PATENT_FLUSH_PENDING_MINUTES:1}
stale-timeout-minutes: ${AIIMAGE_APPEARANCE_PATENT_STALE_TIMEOUT_MINUTES:30}
stale-finalize-cron: ${AIIMAGE_APPEARANCE_PATENT_STALE_FINALIZE_CRON:0 */2 * * * *}
similar-asin:
@@ -329,9 +339,10 @@ aiimage:
db-job-touch-interval-millis: ${AIIMAGE_SIMILAR_ASIN_DB_JOB_TOUCH_INTERVAL_MILLIS:60000}
llm-flush-pending-minutes: ${AIIMAGE_SIMILAR_ASIN_LLM_FLUSH_PENDING_MINUTES:1}
no-result-upload-timeout-minutes: ${AIIMAGE_SIMILAR_ASIN_NO_RESULT_UPLOAD_TIMEOUT_MINUTES:180}
- image-download-pool-size: ${AIIMAGE_SIMILAR_ASIN_IMAGE_DOWNLOAD_POOL_SIZE:2}
+ image-download-pool-size: ${AIIMAGE_SIMILAR_ASIN_IMAGE_DOWNLOAD_POOL_SIZE:8}
image-download-timeout-seconds: ${AIIMAGE_SIMILAR_ASIN_IMAGE_DOWNLOAD_TIMEOUT_SECONDS:5}
image-prefetch-timeout-seconds: ${AIIMAGE_SIMILAR_ASIN_IMAGE_PREFETCH_TIMEOUT_SECONDS:1800}
+ image-embed-fallback-budget-seconds: ${AIIMAGE_SIMILAR_ASIN_IMAGE_EMBED_FALLBACK_BUDGET_SECONDS:300}
result-file-timeout-minutes: ${AIIMAGE_SIMILAR_ASIN_RESULT_FILE_TIMEOUT_MINUTES:90}
image-cache-max-bytes: ${AIIMAGE_SIMILAR_ASIN_IMAGE_CACHE_MAX_BYTES:268435456}
image-local-cache-dir: ${AIIMAGE_SIMILAR_ASIN_IMAGE_LOCAL_CACHE_DIR:${AIIMAGE_STORAGE_LOCAL_TEMP_DIR:./data/tmp}/similar-asin-image-cache}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedderTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedderTest.java
index 2fe02a07e..31cf706c3 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedderTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedderTest.java
@@ -67,18 +67,20 @@ class SimilarAsinImageEmbedderTest {
}
@Test
- void defaultsImageDownloadPoolToTwoAndCapsItByVisibleCpu() {
- assertEquals(2, new SimilarAsinProperties().getImageDownloadPoolSize());
- assertEquals(Math.min(2, SimilarAsinImageEmbedder.cpuBoundPoolLimit()), embedder.downloadPoolSize());
+ void defaultsImageDownloadPoolToEightAndLeavesItUncappedByCpu() {
+ assertEquals(8, new SimilarAsinProperties().getImageDownloadPoolSize());
+ assertEquals(8, embedder.downloadPoolSize());
}
@Test
- void clampsOversizedImagePoolConfigurationByVisibleCpu() {
+ void oversizedImagePoolConfigurationIsCappedByIoCeilingNotCpu() {
SimilarAsinProperties configured = new SimilarAsinProperties();
configured.setImageDownloadPoolSize(Integer.MAX_VALUE);
SimilarAsinImageEmbedder limited = new SimilarAsinImageEmbedder(configured, createOssStorageService());
try {
- assertEquals(SimilarAsinImageEmbedder.cpuBoundPoolLimit(), limited.downloadPoolSize());
+ // 下载是 IO 等待,只受绝对上限保护配置写错,不再被 CPU 核数夹住;CPU 收口只作用于 resize。
+ assertEquals(SimilarAsinImageEmbedder.MAX_DOWNLOAD_POOL_SIZE, limited.downloadPoolSize());
+ assertTrue(limited.downloadPoolSize() > 2, "下载并发不应再退化成 CPU 收口后的个位数");
} finally {
limited.shutdown();
}
@@ -240,6 +242,64 @@ class SimilarAsinImageEmbedderTest {
}
}
+ @Test
+ void armedFallbackWindowRecoversUrlPrefetchNeverReached() throws Exception {
+ SimilarAsinImageEmbedder recovering = new SimilarAsinImageEmbedder(
+ properties(1, 5, null), createOssStorageService());
+ AtomicInteger networkCalls = new AtomicInteger();
+ replaceHttpClient(recovering, failingClient(networkCalls));
+ String url = "https://images.example.com/skipped-by-prefetch.jpg";
+ recovering.registerPrefetchHandler(url, () -> { });
+ recovering.registerPrefetchResult(url, new SimilarAsinImageEmbedder.ResizedImage(
+ createJpegBytes(), 64, 48));
+ Path spoolDir = Files.createTempDirectory("similar-asin-image-fallback-test-");
+ try (SimilarAsinImageEmbedder.ImageSpool spool = new SimilarAsinImageEmbedder.ImageSpool(spoolDir);
+ XSSFWorkbook workbook = new XSSFWorkbook()) {
+ spool.allowFallbackDownload(30);
+ var row = workbook.createSheet().createRow(1);
+
+ SimilarAsinImageEmbedder.ImageDim dim = recovering.embedAsExcelCellImage(
+ 1, 9, url, row, new HashMap<>(), WpsCellImageWriter.createSession(), spool);
+
+ assertNotNull(dim, "预取没跑到的 URL,补图窗口内应就地补上而不是留空");
+ assertEquals(64, dim.width());
+ assertEquals(1, spool.size(), "补到的图应落到任务级 spool,不留在堆上");
+ assertEquals(1, spool.fallbackDownloaded());
+ assertEquals(0, spool.blankCells());
+ assertEquals(0, networkCalls.get(), "补图走测试钩子,不应打真网络");
+ } finally {
+ recovering.shutdown();
+ }
+ }
+
+ @Test
+ void armedFallbackWindowSkipsUrlsPrefetchAlreadyFailed() throws Exception {
+ SimilarAsinImageEmbedder deadEmbedder = new SimilarAsinImageEmbedder(
+ properties(1, 5, null), createOssStorageService());
+ AtomicInteger networkCalls = new AtomicInteger();
+ replaceHttpClient(deadEmbedder, failingClient(networkCalls));
+ String url = "https://images.example.com/dead.jpg";
+ Path spoolDir = Files.createTempDirectory("similar-asin-image-fallback-skip-test-");
+ try (SimilarAsinImageEmbedder.ImageSpool spool = new SimilarAsinImageEmbedder.ImageSpool(spoolDir);
+ XSSFWorkbook workbook = new XSSFWorkbook()) {
+ deadEmbedder.prefetchToDisk(List.of(url), spool);
+ int callsAfterPrefetch = networkCalls.get();
+ assertTrue(callsAfterPrefetch > 0, "预取阶段应已试过这张图并失败");
+ spool.allowFallbackDownload(30);
+ var row = workbook.createSheet().createRow(1);
+
+ assertNull(deadEmbedder.embedAsExcelCellImage(
+ 1, 9, url, row, new HashMap<>(), WpsCellImageWriter.createSession(), spool));
+
+ assertEquals(callsAfterPrefetch, networkCalls.get(),
+ "补图窗口只救\"预取没跑到\"的 URL,重撞死站会把有限窗口吃光");
+ assertEquals(1, spool.blankCells());
+ assertEquals(0, spool.fallbackDownloaded());
+ } finally {
+ deadEmbedder.shutdown();
+ }
+ }
+
@Test
void imageSpoolWritesThumbnailAndDeletesTaskDirectoryOnClose() throws Exception {
Path directory = Files.createTempDirectory("similar-asin-image-spool-test-");
@@ -421,7 +481,7 @@ class SimilarAsinImageEmbedderTest {
assertEquals("GET", req.method());
assertTrue(req.header("User-Agent").contains("Chrome"), "User-Agent should look browser-like");
assertTrue(req.header("Accept").contains("image/"), "Accept should prefer images");
- assertEquals("https://www.amazon.com/", req.header("Referer"));
+ assertNull(req.header("Referer"), "图片下载不发 Referer:外来 Referer 会被阿里图床判防盗链 403");
assertEquals("no-cache", req.header("Cache-Control"));
assertNotNull(req.header("Accept-Language"));
}
@@ -439,23 +499,22 @@ class SimilarAsinImageEmbedderTest {
@Test
void downloadCandidatesLeaveNonAmazonAndUnsignedUrlsUntouched() {
- String coze = "https://lf9-bot-platform-tos-sign.coze.cn/bot-studio-bot-platform/bot_files/1/image/jpeg/2/merged_image.jpg?x-expires=1&x-signature=a";
- assertEquals(List.of(coze), SimilarAsinImageEmbedder.downloadCandidates(coze));
+ String oss = "https://oss.aishufu.top/nanri-ai-images/supply_images/1f2e.jpg?x-signature=a";
+ assertEquals(List.of(oss), SimilarAsinImageEmbedder.downloadCandidates(oss));
assertEquals(List.of("https://cbu01.alicdn.com/O1CN01x.jpg"),
SimilarAsinImageEmbedder.downloadCandidates("https://cbu01.alicdn.com/O1CN01x.jpg"));
}
@Test
- void buildImageRequestUsesDownloadHeadersForCozeSignedImages() {
+ void buildImageRequestSendsSameHeadersForEveryHost() {
var req = SimilarAsinImageEmbedder.buildImageRequest(
- "https://lf9-bot-platform-tos-sign.coze.cn/bot-studio-bot-platform/bot_files/1/image/jpeg/2/merged_image.jpg?x-expires=1&x-signature=a");
+ "https://cbu01.alicdn.com/img/ibank/O1CN01abc_1953737542.jpg");
assertEquals("GET", req.method());
assertTrue(req.header("User-Agent").contains("Chrome"), "User-Agent should look browser-like");
- assertEquals("*/*", req.header("Accept"));
- assertNull(req.header("Referer"), "Coze signed download links should not carry an Amazon referer");
+ assertTrue(req.header("Accept").contains("image/"), "Accept should prefer images");
+ assertNull(req.header("Referer"), "阿里图床按 Referer 白名单放行,带任何外来 Referer 都会 403");
assertEquals("no-cache", req.header("Cache-Control"));
- assertTrue(SimilarAsinImageEmbedder.isCozeSignedImageUrl(req.url().toString()));
}
@Test