修改格式化

alibaba · Jun 18, 2024 · 99e527e · 99e527e
1 parent 1cfad85
commit 99e527e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 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
@@ -154,7 +154,7 @@ public static void writeToFile(File file, InputStream inputStream, boolean close
  }
 
  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
@@ -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
@@ -13,6 +13,7 @@
 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
@@ -3,6 +3,7 @@
 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 @@ private void readCn(File file) {
  }
  }
  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
diff --git a/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx b/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx