From 8d6a17ecf85faed505a5f8a95210a6b78bba2a64 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 14:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
index de3c552..4850f08 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java
@@ -33,7 +33,7 @@
public static Map<String, XSSFPictureData> getExcelPictures(InputStream is) {
try {
- byte[] fileData = getFileStream(is);
+ byte[] fileData = toByteArray(is);
Map<String, XSSFPictureData> pictures = getPictures(fileData);
pictures.forEach((id, xssfPictureData) -> {
System.out.println("id锛�" + id);
@@ -46,6 +46,15 @@
}
}
+ public static byte[] toByteArray(InputStream input) throws IOException {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ int bytesRead;
+ byte[] buffer = new byte[1024]; // 鍙互鏍规嵁闇�瑕佽皟鏁寸紦鍐插尯澶у皬
+ while ((bytesRead = input.read(buffer)) != -1) {
+ byteArrayOutputStream.write(buffer, 0, bytesRead);
+ }
+ return byteArrayOutputStream.toByteArray();
+ }
/**
* 鑾峰彇娴姩鍥剧墖锛屼互 map 褰㈠紡杩斿洖锛岄敭涓鸿鍒楁牸寮� x-y銆�
--
Gitblit v1.9.3