From a891c715008faa043d6044aa5686295e04be88dc Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 14:58:00 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E7=A7=BB=E9=99=A4common-io?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml  |  2 +-
 easyexcel-core/pom.xml    |  4 ----
 easyexcel-support/pom.xml | 12 +++++++++---
 pom.xml                   |  9 ++-------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4270c20..95a3cd0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@main
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/easyexcel-core/pom.xml b/easyexcel-core/pom.xml
index f8179003..93d013cc 100644
--- a/easyexcel-core/pom.xml
+++ b/easyexcel-core/pom.xml
@@ -36,9 +36,5 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/easyexcel-support/pom.xml b/easyexcel-support/pom.xml
index 85e5a533..f07d0446 100644
--- a/easyexcel-support/pom.xml
+++ b/easyexcel-support/pom.xml
@@ -24,8 +24,8 @@
             <version>5.3.37</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jcl</artifactId>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -49,7 +49,7 @@
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                             <!-- Make sure the transitive dependencies are written to the generated pom under <dependencies> -->
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <artifactSet combine.self="override">
+                            <artifactSet>
                                 <includes>
                                     <include>org.springframework:spring-core</include>
                                 </includes>
@@ -63,6 +63,12 @@
                                     </includes>
                                 </filter>
                             </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.springframework</pattern>
+                                    <shadedPattern>com.alibaba.excel.support</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 0a3da974..6ff3d13d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
 
     <properties>
-        <revision>4.0.0</revision>
+        <revision>4.0.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>1.8</jdk.version>
         <gpg.skip>true</gpg.skip>
@@ -113,11 +113,6 @@
                 <artifactId>ehcache</artifactId>
                 <version>3.9.11</version>
             </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.11.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -195,7 +190,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.4</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From 1e144e16fe28a6ed5f1cc6a32e2e4a6de057bd51 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 15:19:56 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml   | 2 +-
 update.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6ff3d13d..bf0dd4b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/update.md b/update.md
index b0fc5642..d1bbb240 100644
--- a/update.md
+++ b/update.md
@@ -1,3 +1,7 @@
+# 4.0.1
+
+* `commons-io` 修改为依赖 `poi`的版本
+
 # 4.0.0
 
 * `poi`由`4.1.2`升级到`5.2.5`

From 58b84830cd78162cc5bcb9e0646852ff8d6e6e6d Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 16:37:40 +0800
Subject: [PATCH 03/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=A2=AB=E6=B8=85=E7=90=86=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA`NoSuchFileException`=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EasyExcelTempFileCreationStrategy.java    | 136 ++++++++++++++++++
 .../com/alibaba/excel/util/FileUtils.java     |  13 +-
 .../easyexcel/test/temp/WriteV33Test.java     |  10 ++
 .../test/temp/large/TempLargeDataTest.java    |   3 +-
 update.md                                     |   1 +
 5 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 easyexcel-core/src/main/java/com/alibaba/excel/util/EasyExcelTempFileCreationStrategy.java

diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/EasyExcelTempFileCreationStrategy.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/EasyExcelTempFileCreationStrategy.java
new file mode 100644
index 00000000..ce4db733
--- /dev/null
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/EasyExcelTempFileCreationStrategy.java
@@ -0,0 +1,136 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package com.alibaba.excel.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.FileAttribute;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.poi.util.DefaultTempFileCreationStrategy;
+import org.apache.poi.util.TempFileCreationStrategy;
+
+import static org.apache.poi.util.TempFile.JAVA_IO_TMPDIR;
+
+/**
+ * In the scenario where `poifiles` are cleaned up, the {@link DefaultTempFileCreationStrategy} will throw a
+ * java.nio.file.NoSuchFileException. Therefore, it is necessary to verify the existence of the temporary file every
+ * time it is created.
+ *
+ * @author Jiaju Zhuang
+ */
+public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrategy {
+    /**
+     * Name of POI files directory in temporary directory.
+     */
+    public static final String POIFILES = "poifiles";
+
+    /**
+     * To use files.deleteOnExit after clean JVM exit, set the <code>-Dpoi.delete.tmp.files.on.exit</code> JVM property
+     */
+    public static final String DELETE_FILES_ON_EXIT = "poi.delete.tmp.files.on.exit";
+
+    /**
+     * The directory where the temporary files will be created (<code>null</code> to use the default directory).
+     */
+    private volatile File dir;
+
+    /**
+     * The lock to make dir initialized only once.
+     */
+    private final Lock dirLock = new ReentrantLock();
+
+    /**
+     * Creates the strategy so that it creates the temporary files in the default directory.
+     *
+     * @see File#createTempFile(String, String)
+     */
+    public EasyExcelTempFileCreationStrategy() {
+        this(null);
+    }
+
+    /**
+     * Creates the strategy allowing to set the
+     *
+     * @param dir The directory where the temporary files will be created (<code>null</code> to use the default
+     *            directory).
+     * @see Files#createTempFile(Path, String, String, FileAttribute[])
+     */
+    public EasyExcelTempFileCreationStrategy(File dir) {
+        this.dir = dir;
+    }
+
+    private void createPOIFilesDirectory() throws IOException {
+        // Create our temp dir only once by double-checked locking
+        // The directory is not deleted, even if it was created by this TempFileCreationStrategy
+        if (dir == null || !dir.exists()) {
+            dirLock.lock();
+            try {
+                if (dir == null || !dir.exists()) {
+                    String tmpDir = System.getProperty(JAVA_IO_TMPDIR);
+                    if (tmpDir == null) {
+                        throw new IOException("System's temporary directory not defined - set the -D" + JAVA_IO_TMPDIR
+                            + " jvm property!");
+                    }
+                    Path dirPath = Paths.get(tmpDir, POIFILES);
+                    dir = Files.createDirectories(dirPath).toFile();
+                }
+            } finally {
+                dirLock.unlock();
+            }
+            return;
+        }
+    }
+
+    @Override
+    public File createTempFile(String prefix, String suffix) throws IOException {
+        // Identify and create our temp dir, if needed
+        createPOIFilesDirectory();
+
+        // Generate a unique new filename
+        File newFile = Files.createTempFile(dir.toPath(), prefix, suffix).toFile();
+
+        // Set the delete on exit flag, but only when explicitly disabled
+        if (System.getProperty(DELETE_FILES_ON_EXIT) != null) {
+            newFile.deleteOnExit();
+        }
+
+        // All done
+        return newFile;
+    }
+
+    /* (non-JavaDoc) Created directory path is <JAVA_IO_TMPDIR>/poifiles/prefix0123456789 */
+    @Override
+    public File createTempDirectory(String prefix) throws IOException {
+        // Identify and create our temp dir, if needed
+        createPOIFilesDirectory();
+
+        // Generate a unique new filename
+        File newDirectory = Files.createTempDirectory(dir.toPath(), prefix).toFile();
+
+        //this method appears to be only used in tests, so it is probably ok to use deleteOnExit
+        newDirectory.deleteOnExit();
+
+        // All done
+        return newDirectory;
+    }
+}
diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
index d800be51..f514f6f7 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
@@ -12,7 +12,6 @@ import java.util.UUID;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelCommonException;
 
-import org.apache.poi.util.DefaultTempFileCreationStrategy;
 import org.apache.poi.util.TempFile;
 
 /**
@@ -111,7 +110,7 @@ public class FileUtils {
     /**
      * Write inputStream to file
      *
-     * @param file file
+     * @param file        file
      * @param inputStream inputStream
      */
     public static void writeToFile(File file, InputStream inputStream) {
@@ -121,8 +120,8 @@ public class FileUtils {
     /**
      * Write inputStream to file
      *
-     * @param file file
-     * @param inputStream inputStream
+     * @param file             file
+     * @param inputStream      inputStream
      * @param closeInputStream closeInputStream
      */
     public static void writeToFile(File file, InputStream inputStream, boolean closeInputStream) {
@@ -154,11 +153,8 @@ public class FileUtils {
         }
     }
 
-
     public static void createPoiFilesDirectory() {
-        File poiFilesPathFile = new File(poiFilesPath);
-        createDirectory(poiFilesPathFile);
-        TempFile.setTempFileCreationStrategy(new DefaultTempFileCreationStrategy(poiFilesPathFile));
+        TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
     }
 
     public static File createCacheTmpFile() {
@@ -171,7 +167,6 @@ public class FileUtils {
     }
 
     /**
-     *
      * @param directory
      */
     public static File createDirectory(File directory) {
diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
index ed5b2385..5e83405d 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java
@@ -1,5 +1,8 @@
 package com.alibaba.easyexcel.test.temp;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -135,4 +138,11 @@ public class WriteV33Test {
         return list;
     }
 
+
+    @Test
+    public void test4() throws Exception{
+       Path path= Files.createTempFile(new File("/Users/zhuangjiaju/test/test0422/test/xx").toPath(),System.currentTimeMillis()+"",".jpg");
+        System.out.println(path);
+    }
+
 }
diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java
index b88bf06e..246656c1 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.IntStream;
 
-import com.alibaba.easyexcel.test.core.large.LargeDataTest;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory;
 
 public class TempLargeDataTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LargeDataTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TempLargeDataTest.class);
     private int i = 0;
 
     private static File fileFill07;
diff --git a/update.md b/update.md
index d1bbb240..6b141fff 100644
--- a/update.md
+++ b/update.md
@@ -1,6 +1,7 @@
 # 4.0.1
 
 * `commons-io` 修改为依赖 `poi`的版本
+* 修复临时目录被清理可能提示`NoSuchFileException`的异常
 
 # 4.0.0
 

From 1cfad855611dbcbcc1bf8a4ed5ed6c4e34159eef Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 16:42:52 +0800
Subject: [PATCH 04/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=A2=AB=E6=B8=85=E7=90=86=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA`NoSuchFileException`=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index bf0dd4b0..44dd0796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,11 +230,13 @@
                         <exclude>com/alibaba/excel/metadata/DataFormatter.java</exclude>
                         <exclude>com/alibaba/excel/util/DateUtils.java</exclude>
                         <exclude>com/alibaba/excel/util/MapUtils.java</exclude>
+                        <exclude>com/alibaba/excel/util/EasyExcelTempFileCreationStrategy.java</exclude>
                         <exclude>com/alibaba/excel/metadata/format/DataFormatter.java</exclude>
                         <exclude>com/alibaba/excel/metadata/format/ExcelGeneralNumberFormat.java</exclude>
                         <exclude>com/alibaba/excel/metadata/csv/CsvDataFormat.java</exclude>
                         <exclude>com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java</exclude>
                         <exclude>com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java</exclude>
+                        <exclude>com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java</exclude>
                     </excludes>
                 </configuration>
                 <executions>

From 99e527e9b4e3560fa06669a1e541233243bd5eef Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 17:05:00 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/alibaba/excel/util/FileUtils.java     |   2 +-
 easyexcel-test/pom.xml                        |   2 +-
 .../test/core/dataformat/DateFormatData.java  |   1 +
 .../test/core/dataformat/DateFormatTest.java  |   8 +++++++-
 .../test/resources/dataformat/dataformat.xls  | Bin 28672 -> 28672 bytes
 .../test/resources/dataformat/dataformat.xlsx | Bin 12460 -> 12615 bytes
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
index f514f6f7..7a09de9a 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
@@ -154,7 +154,7 @@ public class FileUtils {
     }
 
     public static void createPoiFilesDirectory() {
-        TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
+        //TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
     }
 
     public static File createCacheTmpFile() {
diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml
index cd1bdb91..8c540b22 100644
--- a/easyexcel-test/pom.xml
+++ b/easyexcel-test/pom.xml
@@ -74,7 +74,7 @@
                     <includes>
                         <include>/com/alibaba/easyexcel/test/core/**/*.java</include>
                     </includes>
-                    <testFailureIgnore>true</testFailureIgnore>
+                    <testFailureIgnore>false</testFailureIgnore>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java
index 5958161c..31cdd85d 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java
@@ -13,6 +13,7 @@ import lombok.Setter;
 public class DateFormatData {
     private String date;
     private String dateStringCn;
+    private String dateStringCn2;
     private String dateStringUs;
     private String number;
     private String numberStringCn;
diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
index 43a00fae..655239f8 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
@@ -3,6 +3,7 @@ package com.alibaba.easyexcel.test.core.dataformat;
 import java.io.File;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
@@ -54,7 +55,12 @@ public class DateFormatTest {
             }
         }
         for (DateFormatData data : list) {
-            Assertions.assertEquals(data.getDateStringCn(), data.getDate());
+            // The way dates are read in Chinese is different on Linux and Mac, so it is acceptable if it matches either one.
+            // For example, on Linux: 1-Jan -> 1-1月
+            // On Mac: 1-Jan -> 1-一月
+            Assertions.assertTrue(
+                Objects.equals(data.getDateStringCn(), data.getDate()) || Objects.equals(data.getDateStringCn2(),
+                    data.getDate()));
             Assertions.assertEquals(data.getNumberStringCn(), data.getNumber());
         }
     }
diff --git a/easyexcel-test/src/test/resources/dataformat/dataformat.xls b/easyexcel-test/src/test/resources/dataformat/dataformat.xls
index c8afd6461f3398c3405321a0358d024cf55f2719..ec0c39ba4bf089807e3ec96247e79d7c6aec10fb 100644
GIT binary patch
delta 1846
zcmZvdPiPZC6vp4oZZ`k_T5D~qAXuf<R1>X;f(EN-t!=5Xpsm$5CPqaBwTK9sD7F_*
zcEF>E2M^*w$W=r^5EQ&BJxE1738FpeLGXREo0@HR7bZL3yx+{5mv45f^P)O0o?kTm
z6GOwX@z-<esyQtl)&7|GEE)6FX2PRFJg<F;EbQ*MJ3xF{ls{K0O=YGjMv2h|B@5+~
z`hBQF2(`8^?Vm9)+*3Q+x5sFTl9}LMadN7ZpSp7XQn~k1R(<bpGcyz@*Q!UpMXVQt
zM1>Qz+vPT)W=7)`gR0Frl1$yC2$_73gyOuu-S?4?o;HkI7)kw)_Y(;U#yOfV8Ph*&
zbju?YkjRF}Pc1?}h`83!akL6gV2em$X`tbunI4+YL&Fx9&WEJjS|ve&WnzMY9$Lsl
z3wvl04=w7Up<4b59dnfirF3VQAQaJDQo^K%mh#Y6cxX)xTBTn8l?`HDYxdAqd1x&j
z+G-E2b-C6`ZOcV!ho-v5Gd<h*=`W%52HCc=dnUzMsgL=148E|(EOlo*y#?{`fWfvD
zJQ}Bmr#jy!-u~K)D8a_gaiwiWkflC54D0|#GSll~q-J0Z%pjTBb;@2x=f{k}%mEi;
zXr{|y3}zlU46K87aO4iU7*jKw9L8j3!C_!6Fg|AbTnr9sj$kw7=3{2?w4EDl2F7Bh
z-^Ey(f#bmN(N<3#rk<OhnE@B$*9;s9#?Op3VXsrqEx^o>iwS53js+87rr<F3+=9#u
z)A4uNH<wS|&mk(P893VRS?Z<3z`fW{h?%^L!M<|@BZJ``sn$t5Hy9aAn3)k56V?n&
z4JORYwaN4*cn7AwB}4k9h#LLWzKOW@65;p{PCN{cczy>{nf=wF_Yu|cX=nZ@$8RWP
zdbT@#I3`Cp79in;b4;c*iGMjq*~Lgp-72Jop`H~sCWW;4tsrSkXPqEJ%{gjvQBATM
zIAh1A7S$B1JI-L9qHbq(`%1SzblYCU=waPn*X@&HdJXdI<Xo^aPUl(rNPDQ8jlWeE
z)X!pD@GN!HPTZ=gv@aIr74dBlTn{PL=5k){ALFmiW1+^%>t$q|pQW6=us>LR^)<?$
TL|${<`E9BiHuV?r!VTX)9vJTD

delta 1649
zcmZvd&r4KM6vywq@7MhF&5ty*Ukeja8EkYJ*4Pv#{lZinf0o)y(~2Y^EUeks#zoj&
zM4QT%Eh2dTLNHL!Mxs^VETU~jK@mmgoOefk_GXwn=biigoOkZM-#1fS=f!pY`kHRB
zI{Wzhu8;DTzQpU@U;45sqMG|4I>h<BTaJA@($IO9!OLX5(~dKrU1C*C4sOe|VP;tV
zJk`K;d7wLE<+TD#x4Rd*k81APnGZ2@;T&V13+}7IW`19=Voi<-P%N?-)8O47v7x$m
ztuvjy+%|78gR#_>9(0_AZM;2WqKdxu(})#9BBA11P64+mhZiQJoE#XAcc>U@dGp%V
z{ANxM$U!g6l&iz(|0-Ak>QF!~Ocgc)DntX+v4C8hDs+xu4}HE>;;!sm8SaPXt$cH3
zNzBO=sIYS;9iZM7kgKK&<$wyi1Jtzvxjj@NJDP6V*~8ud^*&NxAI&zRZ~m|dX>3?o
z<w|Eca8BjQkZYrvRslJ5g$6$1ptaf4v8H#4(#A2Yz(Jp5cy8X6AzQ~h2G0!{0ZiV<
z2x9OIkrB+0%Zj0nfI&Z>^f4MS&5F^0`Jxy+alDTXOqY+rry$2#6r%%^zv%UbjzGo$
zrrXCD#GpH{H+XL3GsWOjf{Y2wX&++}gT6t=1m?G5D!p02ob@plG3YB~EMNvM`Fjfi
zbKb{<h(X^W69UFnOr^IlFg>jBw(ZT_$Vv`XVPaB>2?Jw~d-own!g?aW^!k_xG3ZXL
z0J|V(6;lH_+=D1E{XQm24Eh$CC@`h*ObdDkeS1$t=vNB&=qvdq=37e)^am$AJ$f4T
zak$46_^W}|5hr~{)sKVz_C&U^PHE9G)1Xa}7QK*TZAuHLEI&<TxRBAwMhm-3Fd_3Q
zPC|TF#VLs0NmQ0;v@c`aLE|iqPiQRB_=CoJ2Q@uTwe=kgeOUC#IVUZPPKX!e3PjHx
z9X{<<N&E$d4wLXU3|V%1MQO<WJN1Ig#Fazh;RwV+$eTA7AI+QyvxUc<@NdF3xq7u-
N7Na`-natcV{sB}5@CpC`

diff --git a/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx b/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx
index f77dd9fd35d736e487afb71af78b23c6877a9320..4143c6acae8b0e22ff1ba708af9f0b5ae8f9a42c 100644
GIT binary patch
delta 6096
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
W%??-OlSIY_!bA8N(KopN1pf{0!GQh%

delta 5968
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


From ab50571bb51d6b4f80d42d8171e248bec5fc4752 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 17:09:52 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/alibaba/excel/util/FileUtils.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
index 7a09de9a..f514f6f7 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/FileUtils.java
@@ -154,7 +154,7 @@ public class FileUtils {
     }
 
     public static void createPoiFilesDirectory() {
-        //TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
+        TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
     }
 
     public static File createCacheTmpFile() {

From e8a86c6dbe98a1ab5c46e72a640aee791ad9bce7 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 17:10:58 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index baa22739..789337c2 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ easyexcel重写了poi对07版Excel的解析，一个3M的excel用POI sax解析
 <dependency>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
 </dependency>
 ```
 

From 5844e5f84e156afaed72d123a1cb19b85ec36b11 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 17:37:34 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=88=E4=BE=8B=E6=97=B6`unnamed=20module`?=
 =?UTF-8?q?=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easyexcel-test/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml
index 8c540b22..0b8eb98e 100644
--- a/easyexcel-test/pom.xml
+++ b/easyexcel-test/pom.xml
@@ -71,6 +71,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
                     <includes>
                         <include>/com/alibaba/easyexcel/test/core/**/*.java</include>
                     </includes>

From c52385f05b2ffa7acaf6846fa550c9b4935e9f09 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 17:51:57 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/core/dataformat/DateFormatTest.java  |   8 +++++---
 .../test/resources/dataformat/dataformat.xls  | Bin 28672 -> 29184 bytes
 .../test/resources/dataformat/dataformat.xlsx | Bin 12615 -> 12655 bytes
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
index 655239f8..1229b238 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
@@ -47,15 +47,17 @@ public class DateFormatTest {
         List<DateFormatData> list =
             EasyExcel.read(file, DateFormatData.class, null).locale(Locale.CHINA).sheet().doReadSync();
         for (DateFormatData data : list) {
-            if (data.getDateStringCn() != null && !data.getDateStringCn().equals(data.getDate())) {
-                log.info("date:cn:{},{}", data.getDateStringCn(), data.getDate());
+            if (!Objects.equals(data.getDateStringCn(), data.getDate()) && !Objects.equals(data.getDateStringCn2(),
+                data.getDate())) {
+                log.info("date:cn:{},{},{}", data.getDateStringCn(), data.getDateStringCn2(), data.getDate());
             }
             if (data.getNumberStringCn() != null && !data.getNumberStringCn().equals(data.getNumber())) {
                 log.info("number:cn{},{}", data.getNumberStringCn(), data.getNumber());
             }
         }
         for (DateFormatData data : list) {
-            // The way dates are read in Chinese is different on Linux and Mac, so it is acceptable if it matches either one.
+            // The way dates are read in Chinese is different on Linux and Mac, so it is acceptable if it matches
+            // either one.
             // For example, on Linux: 1-Jan -> 1-1月
             // On Mac: 1-Jan -> 1-一月
             Assertions.assertTrue(
diff --git a/easyexcel-test/src/test/resources/dataformat/dataformat.xls b/easyexcel-test/src/test/resources/dataformat/dataformat.xls
index ec0c39ba4bf089807e3ec96247e79d7c6aec10fb..95c306ce007778b92874296492c635f3afded0b0 100644
GIT binary patch
delta 505
zcmY*VODsb{6g@M2?R%|OltvK2LTp5|eii=+LgFuxppno#)kb`RUB$By7B<YnPQq3q
zO~y_ntZZy-EG(o83p+cBZ{7DQK6f&6a?ibI=FTya%y?i4g?s7%e5O(<g|Jq5`I)ok
zn+eJrUe5NEIXn8NxGt8IE#5IHUzN9fe-b`85CB6K;3k0?{GueT`4HFAY5I&|Au{+R
zJ;jN<oHeZiYyYZIF;rY6&x5(%vdn%{;K0bNuCD|(k%`msKTMU$#6#kxdsw})O;V*^
z4)<)>L_u%HdH`Ca0#)$SKyKI(G=)~EU@U2td9u=KP=1LN8ld5zIsF5*1z07`Ea5HT
zHDLn-@>_u|!hJ$J2e#XQXTq?SOWS%x7WVD99bE%7{<u6D3puH;jof76fae1)^2p4|
zY0((2v>5LXv;56u6B9KDm&f5VrgpmkKc5y$dX6x3m)ZntiCw)t!@Lfb_1WTHALWk|
o@-uS8MAl3xOURFijmyRP5ZjA&YVU7Mzr15MaTu+ZM$E8(0hg0+q5uE@

delta 354
zcmZp8!r1VDaRUnzuPFlq!@vLk|FZyTlgWZiyLmx8GpOjlje+WnlUQ<C6Z`}DVkZ}}
zv@<P;-TaH?x1>Z3hX_Lr2T&axWHMZszv<g%Rrw7Po7pVH1l3x6L2_&i!5OKkC5EjG
zd<+6nNFqicksHyIojils+n7NzrkiJbHZq(4XRu=6U<kEkVBi4??gP@LKw938f#DjE
zZU)j;j0_AHfOI>M_OoYTU}a)pu-`nzcODPh9zO<#q{z*;(xe$T2S+<{OkR|%!O6(P
z#vs7J#1K9Cda^#4CkW;Vr$Bf@Al_#Gl--PsdXu@+l-czdEI@FwX_^xsFHn+!fe{FS
vET+l68NrM$n{TEaXJq8ryfA~AX;O|W$AQPZu?KH4GEa8QGTz*f)4&P<Clgx-

diff --git a/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx b/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx
index 4143c6acae8b0e22ff1ba708af9f0b5ae8f9a42c..34a05cc92fb48bb1045c66e6a2b32cbdfb294ef8 100644
GIT binary patch
delta 3166
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
E00%qtp8x;=

delta 3127
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
RJ^>4pMlmA><ShUI0029=@)Q67


From 535a1067ab779ff832c35130a070b34728432d20 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 18:33:53 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 4 ++++
 easyexcel-test/pom.xml   | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95a3cd0b..c95b8612 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,11 @@ jobs:
       - name: Chmod
         run:  chmod +x mvnw
       - name: Test with Maven
+        if: ${{ matrix.java == '8' }}
         run: ./mvnw test -B -Dmaven.test.skip=false
+      - name: Test with Maven
+        if: ${{ matrix.java != '8' }}
+        run: ./mvnw test -B -Dmaven.test.skip=false --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
       - name: Maven Build
         run: ./mvnw install -B -V
       - name: Java Doc
diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml
index 0b8eb98e..8c540b22 100644
--- a/easyexcel-test/pom.xml
+++ b/easyexcel-test/pom.xml
@@ -71,7 +71,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
                     <includes>
                         <include>/com/alibaba/easyexcel/test/core/**/*.java</include>
                     </includes>

From a6e968233ca5aa203b902ad67c06038887dccab1 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 18:51:19 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c95b8612..1f518b8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
         run: ./mvnw test -B -Dmaven.test.skip=false
       - name: Test with Maven
         if: ${{ matrix.java != '8' }}
-        run: ./mvnw test -B -Dmaven.test.skip=false --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
+        run: ./mvnw test -B -Dmaven.test.skip=false -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
       - name: Maven Build
         run: ./mvnw install -B -V
       - name: Java Doc

From 4e2496a12d11e38a47edfb6a0f7dbebe1ec401eb Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 18 Jun 2024 19:12:42 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f518b8b..f4e30b60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
         run: ./mvnw test -B -Dmaven.test.skip=false
       - name: Test with Maven
         if: ${{ matrix.java != '8' }}
-        run: ./mvnw test -B -Dmaven.test.skip=false -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
+        run: ./mvnw test -B -Dmaven.test.skip=false -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED"
       - name: Maven Build
         run: ./mvnw install -B -V
       - name: Java Doc