From 3e95d1d1637fa2fe4215503a2b52c7119570dd54 Mon Sep 17 00:00:00 2001
From: ZJR <615817413@qq.com>
Date: Sun, 28 Mar 2021 21:00:07 +0800
Subject: [PATCH] fix: issue 1804, inputStream auto close even autoClosedStream
 is false

---
 .../excel/analysis/v07/XlsxSaxAnalyser.java   |  6 +++--
 .../com/alibaba/excel/util/FileUtils.java     | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
index a0a9af0e..9f78de65 100644
--- a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
+++ b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
@@ -147,9 +147,11 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor {
         xlsxReadWorkbookHolder.setTempFile(readTempFile);
         File tempFile = new File(readTempFile.getPath(), UUID.randomUUID().toString() + ".xlsx");
         if (decryptedStream != null) {
-            FileUtils.writeToFile(tempFile, decryptedStream);
+            if(xlsxReadWorkbookHolder.getAutoCloseStream()) FileUtils.writeToFile(tempFile, decryptedStream);
+            else FileUtils.writeToFileNotCloseStream(tempFile, decryptedStream);
         } else {
-            FileUtils.writeToFile(tempFile, xlsxReadWorkbookHolder.getInputStream());
+            if(xlsxReadWorkbookHolder.getAutoCloseStream()) FileUtils.writeToFile(tempFile, xlsxReadWorkbookHolder.getInputStream());
+            else FileUtils.writeToFileNotCloseStream(tempFile, xlsxReadWorkbookHolder.getInputStream());
         }
         return OPCPackage.open(tempFile, PackageAccess.READ);
     }
diff --git a/src/main/java/com/alibaba/excel/util/FileUtils.java b/src/main/java/com/alibaba/excel/util/FileUtils.java
index 20b16bc6..09192473 100644
--- a/src/main/java/com/alibaba/excel/util/FileUtils.java
+++ b/src/main/java/com/alibaba/excel/util/FileUtils.java
@@ -132,6 +132,28 @@ public class FileUtils {
         }
     }
 
+    public static void writeToFileNotCloseStream(File file, InputStream inputStream) {
+        OutputStream outputStream = null;
+        try {
+            outputStream = new FileOutputStream(file);
+            int bytesRead;
+            byte[] buffer = new byte[WRITE_BUFF_SIZE];
+            while ((bytesRead = inputStream.read(buffer, 0, WRITE_BUFF_SIZE)) != -1) {
+                outputStream.write(buffer, 0, bytesRead);
+            }
+        } catch (Exception e) {
+            throw new ExcelAnalysisException("Can not create temporary file!", e);
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    throw new ExcelAnalysisException("Can not close 'outputStream'!", e);
+                }
+            }
+        }
+    }
+
     public static void createPoiFilesDirectory() {
         File poiFilesPathFile = new File(poiFilesPath);
         createDirectory(poiFilesPathFile);