diff --git a/pom.xml b/pom.xml index 2466e22f..85969631 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.slf4j slf4j-api - 1.7.26 + 1.7.32 org.ehcache @@ -103,31 +103,31 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.5 test com.alibaba fastjson - 1.2.71 + 1.2.78 test org.springframework.boot spring-boot - 1.5.21.RELEASE + 2.5.4 test org.springframework.boot spring-boot-starter-web - 1.5.21.RELEASE + 2.5.4 test junit junit - 4.13.1 + 4.13.2 test @@ -171,6 +171,7 @@ com/alibaba/excel/util/MapUtils.java com/alibaba/excel/metadata/format/DataFormatter.java com/alibaba/excel/metadata/format/ExcelGeneralNumberFormat.java + com/alibaba/excel/metadata/csv/CsvDataFormat.java @@ -193,14 +194,16 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 1.8 1.8 + org.apache.maven.plugins maven-source-plugin - 2.1 + 3.2.1 true @@ -252,6 +255,17 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + com/alibaba/easyexcel/test/core/**/*.java + + true + + diff --git a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java index c9be2233..2c66b535 100644 --- a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java @@ -139,7 +139,7 @@ public class WriteContextImpl implements WriteContext { return false; } if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Sheet:{} is already existed", writeSheet.getSheetNo()); + LOGGER.debug("Sheet:{},{} is already existed", writeSheet.getSheetNo(), writeSheet.getSheetName()); } writeSheetHolder.setNewInitialization(Boolean.FALSE); writeTableHolder = null; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java index 986bd05f..2b229d2d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java @@ -17,23 +17,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.util.CellReference; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.IndexedColors; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.alibaba.easyexcel.test.demo.write.DemoData; -import com.alibaba.easyexcel.test.util.TestFileUtil; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import com.alibaba.excel.write.metadata.style.WriteFont; -import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -import com.alibaba.fastjson.JSON; - -import org.apache.poi.hssf.util.CellReference; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,15 +26,15 @@ import org.slf4j.LoggerFactory; * * @author Jiaju Zhuang **/ -@Ignore public class Lock2Test { private static final Logger LOGGER = LoggerFactory.getLogger(Lock2Test.class); @Test public void test() throws Exception { - // File file = TestFileUtil.readUserHomeFile("test/test4.xlsx"); -// File file = TestFileUtil.readUserHomeFile("test/test6.xls"); + assert 1 != 1; + // File file = TestFileUtil.readUserHomeFile("test/test4.xlsx"); + // File file = TestFileUtil.readUserHomeFile("test/test6.xls"); File file = new File("/Users/zhuangjiaju/IdeaProjects/easyexcel/src/test/resources/converter/converter07.xlsx"); List list = EasyExcel.read("/Users/zhuangjiaju/Downloads/olay (1).xlsx").sheet(0).doReadSync();