diff --git a/build.gradle b/build.gradle index 15a62a7..522007e 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '2.2.18' + version '2.2.20' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/easyexcel/analysis/v07/XlsxSaxAnalyser.java b/src/main/java/com/taover/easyexcel/analysis/v07/XlsxSaxAnalyser.java index d2dfff6..5c9f57e 100644 --- a/src/main/java/com/taover/easyexcel/analysis/v07/XlsxSaxAnalyser.java +++ b/src/main/java/com/taover/easyexcel/analysis/v07/XlsxSaxAnalyser.java @@ -1,6 +1,8 @@ package com.taover.easyexcel.analysis.v07; import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -172,8 +174,8 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor { } private void parseXmlSource(InputStream inputStream, ContentHandler handler) { - InputSource inputSource = new InputSource(inputStream); - //this.printInputSource(inputSource); + //InputSource inputSource = new InputSource(this.printInputSource(inputStream)); + InputSource inputSource = new InputSource(inputStream); try { SAXParserFactory saxFactory; String xlsxSAXParserFactoryName = xlsxReadContext.xlsxReadWorkbookHolder().getSaxParserFactoryName(); @@ -209,22 +211,29 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor { } } - private void printInputSource(InputSource inputSource) { - BufferedInputStream bis = new BufferedInputStream(inputSource.getByteStream()); - byte[] buffer = new byte[1000*1024]; + private InputStream printInputSource(InputStream inputStream) { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + byte[] buffer = new byte[1000*1024]; + BufferedInputStream bis = new BufferedInputStream(inputStream); try { - int len = bis.read(buffer); - String data = new String(buffer, 0, len); - System.out.println(data); + int len = -1; + while( (len = bis.read(buffer)) != -1) { + bos.write(buffer, 0, len); + } bis.close(); + bos.close(); + System.out.println(">>>parseXmlSource(inputStream)"); + System.out.println(new String(bos.toByteArray())); } catch (IOException e1) { try { bis.close(); + bos.close(); } catch (IOException e) { e.printStackTrace(); } e1.printStackTrace(); } + return new ByteArrayInputStream(bos.toByteArray()); } @Override diff --git a/src/main/java/com/taover/easyexcel/analysis/v07/handlers/RowTagHandler.java b/src/main/java/com/taover/easyexcel/analysis/v07/handlers/RowTagHandler.java index 50b5df1..b8c919f 100644 --- a/src/main/java/com/taover/easyexcel/analysis/v07/handlers/RowTagHandler.java +++ b/src/main/java/com/taover/easyexcel/analysis/v07/handlers/RowTagHandler.java @@ -35,8 +35,9 @@ public class RowTagHandler extends AbstractXlsxTagHandler { public boolean isHiddenRow(Attributes attributes) { int attLen = attributes.getLength(); for(int i=0; i> data = transListMapTo2List(EasyExcel.read(dataFile).readHiddenRow(false).headRowNumber(0).doReadSelectedSync()); // for(List row: data) { // for(Object item: row) { -- libgit2 0.21.2