From ff3da2557bb08d9221fd79b694f0e47bb5ef4a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 28 Sep 2026 18:46:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B4=A7=E6=BA=90):=20=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=20xlsx=20=E7=9A=84=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=B5=81=E8=A1=A5=2064KB=20=E7=BC=93=E5=86=B2?= =?UTF-8?q?=EF=BC=8C=E4=B8=87=E7=BA=A7=E5=9B=BE=E7=89=87=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9C=81=E7=BA=A6=207=20=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WpsCellImageWriter / ExcelCellImageWriter 都直接把 ZipOutputStream 套在 Files.newOutputStream 上,没有缓冲:每个 entry 的 local header、数据、以及 close() 时 逐条写的中央目录记录都是独立 syscall。10k 图片实测 media loop 2.97s + close 4.07s, 而 patchSheet 只有 0.19s——时间花在写放大,不在压缩。 现网确实吃这段:主机A 近 24h 的 [wps-dispimg] 日志里 images= 最大到 8058。 zip 是纯顺序写,加缓冲不改变产物字节。同一用例从 10.4~12.4s(贴穿测试里那个 10s 墙钟预算) 降到 1.81s,测试阈值一个字没动。 JPEG entry 仍走 DEFLATE(改 STORED 会变产物字节,需要真图 + WPS/Excel 打开回归,另议)。 --- .../modules/similarasin/util/ExcelCellImageWriter.java | 6 +++++- .../modules/similarasin/util/WpsCellImageWriter.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java index e2d1acc2a..bb3044248 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java @@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.similarasin.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -82,7 +83,10 @@ public final class ExcelCellImageWriter { int patchedCells = -1; try { try (ZipFile zfIn = new ZipFile(xlsxPath.toFile()); - ZipOutputStream zout = new ZipOutputStream(Files.newOutputStream(tmp))) { + // 与 WpsCellImageWriter 同一处修法:每个 entry 的头/数据/中央目录项都是独立 syscall, + // 万级图片时写放大占大头(实测 media loop 3.0s + close 4.1s) + ZipOutputStream zout = new ZipOutputStream(new BufferedOutputStream( + Files.newOutputStream(tmp), 64 * 1024))) { Enumeration entries = zfIn.entries(); while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java index 9260603e5..25b43df7c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.similarasin.util; import lombok.extern.slf4j.Slf4j; +import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -134,7 +135,10 @@ public final class WpsCellImageWriter { // 校验,会抛 "ZipException: invalid entry size (expected 0 but got N bytes)"。ZipFile 直接读中央目录 // 拿到真实 size,绕开该问题。 try (ZipFile zfIn = new ZipFile(xlsxPath.toFile()); - ZipOutputStream zout = new ZipOutputStream(Files.newOutputStream(tmp))) { + // 64KB 缓冲:一次导出常有 8k 级图片,未缓冲时每个 entry 的头/数据/中央目录项都是独立 + // syscall(实测 10k entry 时 media loop 3.0s + close 4.1s,其中绝大部分是写放大不是压缩) + ZipOutputStream zout = new ZipOutputStream(new BufferedOutputStream( + Files.newOutputStream(tmp), 64 * 1024))) { Enumeration entries = zfIn.entries(); while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement();