From fe35e570c29be2219a266e64275fbb118481bb1c Mon Sep 17 00:00:00 2001 From: zhuangjiaju Date: Mon, 5 Aug 2019 19:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 136 +++++------------- pom.xml | 13 ++ quickstart.md | 11 -- .../easyexcel/test/demo/read/DemoData.java | 17 +++ .../test/demo/read/DemoDataListener.java | 49 +++++++ .../test/demo/read/IndexOrNameData.java | 28 ++++ .../demo/read/IndexOrNameDataListener.java | 49 +++++++ .../easyexcel/test/demo/read/ReadTest.java | 51 +++++++ .../test/demo/web/EasyexcelApplication.java | 12 ++ .../easyexcel/test/demo/write/DemoData.java | 29 ++++ .../easyexcel/test/demo/write/WriteTest.java | 44 ++++++ src/test/resources/demo/demo.xlsx | Bin 0 -> 9139 bytes update.md | 60 +++----- 13 files changed, 349 insertions(+), 150 deletions(-) create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java create mode 100644 src/test/resources/demo/demo.xlsx diff --git a/README.md b/README.md index d57f83a..4c5ec78 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ---------------------------------- # JAVA解析Excel工具easyexcel -Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都存在一个严重的问题就是非常的耗内存，poi有一套SAX模式的API可以一定程度的解决一些内存溢出的问题，但POI还是有一些缺陷，比如07版Excel解压缩以及解压后存储都是在内存中完成的，内存消耗依然很大。easyexcel重写了poi对07版Excel的解析，能够原本一个3M的excel用POI sax依然需要100M左右内存降低到KB级别，并且再大的excel不会出现内存溢出，03版依赖POI的sax模式。在上层做了模型转换的封装，让使用者更加简单方便 +Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都存在一个严重的问题就是非常的耗内存，poi有一套SAX模式的API可以一定程度的解决一些内存溢出的问题，但POI还是有一些缺陷，比如07版Excel解压缩以及解压后存储都是在内存中完成的，内存消耗依然很大。easyexcel重写了poi对07版Excel的解析，能够原本一个3M的excel用POI sax依然需要100M左右内存降低到几M，并且再大的excel不会出现内存溢出，03版依赖POI的sax模式。在上层做了模型转换的封装，让使用者更加简单方便 ## 相关文档 * [关于软件](/abouteasyexcel.md) * [快速使用](/quickstart.md) @@ -21,118 +21,50 @@ Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都 * [更新记事](/update.md) * [English-README](/easyexcel_en.md) ## 二方包 - +```xml com.alibaba easyexcel - {latestVersion} + 2.0.0 - -## 最新版本：1.1.2-beta4 +``` +## 最新版本：2.0.0 ## 维护者 姬朋飞（玉霄） ## 快速开始 ### 读Excel -测试代码地址：[https://github.com/alibaba/easyexcel/blob/master/src/test/java/com/alibaba/easyexcel/test/ReadTest.java](/src/test/java/com/alibaba/easyexcel/test/ReadTest.java) - -读07版小于1000行数据返回List> -``` -List data = EasyExcelFactory.read(inputStream, new Sheet(1, 0)); -``` -读07版小于1000行数据返回List -``` -List data = EasyExcelFactory.read(inputStream, new Sheet(2, 1,JavaModel.class)); -``` -读07版大于1000行数据返回List> -``` -ExcelListener excelListener = new ExcelListener(); -EasyExcelFactory.readBySax(inputStream, new Sheet(1, 1), excelListener); +DEMO代码地址：[https://github.com/alibaba/easyexcel/blob/master/src/test/java/com/alibaba/easyexcel/demo/read/ReadTest.java](/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java) + +```java + /** + * 最简单的读 + *
  • 1. 创建excel对应的实体对象 参照{@link DemoData} + *
  • 2. 由于默认异步读取excel，所以需要创建excel一行一行的回调监听器，参照{@link DemoDataListener} + *
  • 3. 直接读即可 + */ + @Test + public void simpleRead() { + String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + // 这里 需要指定读用哪个class去读，然后读取第一个sheet 然后千万别忘记 finish + EasyExcelFactory.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead().finish(); + } ``` -读07版大于1000行数据返回List -``` -ExcelListener excelListener = new ExcelListener(); -EasyExcelFactory.readBySax(inputStream, new Sheet(2, 1,JavaModel.class), excelListener); -``` -读03版方法同上 ### 写Excel -测试代码地址：[https://github.com/alibaba/easyexcel/blob/master/src/test/java/com/alibaba/easyexcel/test/WriteTest.java](/src/test/java/com/alibaba/easyexcel/test/WriteTest.java) -没有模板 -```OutputStream out = new FileOutputStream("/Users/jipengfei/2007.xlsx"); -ExcelWriter writer = EasyExcelFactory.getWriter(out); - -//写第一个sheet, sheet1 数据全是List 无模型映射关系 -Sheet sheet1 = new Sheet(1, 3); -sheet1.setSheetName("第一个sheet"); -//设置列宽 设置每列的宽度 -Map columnWidth = new HashMap(); -columnWidth.put(0,10000);columnWidth.put(1,40000);columnWidth.put(2,10000);columnWidth.put(3,10000); -sheet1.setColumnWidthMap(columnWidth); -sheet1.setHead(createTestListStringHead()); -//or 设置自适应宽度 -//sheet1.setAutoWidth(Boolean.TRUE); -writer.write1(createTestListObject(), sheet1); - -//写第二个sheet sheet2 模型上打有表头的注解，合并单元格 -Sheet sheet2 = new Sheet(2, 3, JavaModel1.class, "第二个sheet", null); -sheet2.setTableStyle(createTableStyle()); -writer.write(createTestListJavaMode(), sheet2); - -//写第三个sheet包含多个table情况 -Sheet sheet3 = new Sheet(3, 0); -sheet3.setSheetName("第三个sheet"); -Table table1 = new Table(1); -table1.setHead(createTestListStringHead()); -writer.write1(createTestListObject(), sheet3, table1); - -//写sheet2 模型上打有表头的注解 -Table table2 = new Table(2); -table2.setTableStyle(createTableStyle()); -table2.setClazz(JavaModel1.class); -writer.write(createTestListJavaMode(), sheet3, table2); - -//关闭资源 -writer.finish(); -out.close(); -``` -有模板 -```InputStream inputStream = new BufferedInputStream(new FileInputStream("/Users/jipengfei/temp.xlsx")); -OutputStream out = new FileOutputStream("/Users/jipengfei/2007.xlsx"); -ExcelWriter writer = EasyExcelFactory.getWriterWithTemp(inputStream,out,ExcelTypeEnum.XLSX,true); - -//写第一个sheet, sheet1 数据全是List 无模型映射关系 -Sheet sheet1 = new Sheet(1, 3); -sheet1.setSheetName("第一个sheet"); -//设置列宽 设置每列的宽度 -Map columnWidth = new HashMap(); -columnWidth.put(0,10000);columnWidth.put(1,40000);columnWidth.put(2,10000);columnWidth.put(3,10000); -sheet1.setColumnWidthMap(columnWidth); -sheet1.setHead(createTestListStringHead()); -//or 设置自适应宽度 -//sheet1.setAutoWidth(Boolean.TRUE); -writer.write1(createTestListObject(), sheet1); - -//写第二个sheet sheet2 模型上打有表头的注解，合并单元格 -Sheet sheet2 = new Sheet(2, 3, JavaModel1.class, "第二个sheet", null); -sheet2.setTableStyle(createTableStyle()); -writer.write(createTestListJavaMode(), sheet2); - -//写第三个sheet包含多个table情况 -Sheet sheet3 = new Sheet(3, 0); -sheet3.setSheetName("第三个sheet"); -Table table1 = new Table(1); -table1.setHead(createTestListStringHead()); -writer.write1(createTestListObject(), sheet3, table1); - -//写sheet2 模型上打有表头的注解 -Table table2 = new Table(2); -table2.setTableStyle(createTableStyle()); -table2.setClazz(JavaModel1.class); -writer.write(createTestListJavaMode(), sheet3, table2); - -//关闭资源 -writer.finish(); -out.close(); +DEMO代码地址：[https://github.com/alibaba/easyexcel/blob/master/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java](/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java) +```java + /** + * 最简单的写 + *
  • 1. 创建excel对应的实体对象 参照{@link com.alibaba.easyexcel.test.demo.write.DemoData} + *
  • 2. 直接写即可 + */ + @Test + public void simpleWrite() { + String fileName = TestFileUtil.getPath() + "write.xlsx"; + // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后千万别忘记 finish + // 如果这里想使用03 则 传入excelType参数即可 + EasyExcelFactory.write(fileName, DemoData.class).sheet("模板").doWrite(data()).finish(); + } ``` ### web下载实例写法 diff --git a/pom.xml b/pom.xml index 559fe3b..2913553 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,7 @@ ehcache 3.7.1 + ch.qos.logback logback-classic @@ -99,6 +100,18 @@ 1.18.8 test + + org.springframework.boot + spring-boot + 1.5.21.RELEASE + test + + + org.springframework.boot + spring-boot-starter-web + 1.5.21.RELEASE + test + junit junit diff --git a/quickstart.md b/quickstart.md index afba795..296e276 100644 --- a/quickstart.md +++ b/quickstart.md @@ -12,17 +12,6 @@ ## *写Excel时一个sheet可以写多个Table
    ## *写Excel时候自定义是否需要写表头
    -## 二方包依赖 - -使用前最好咨询下最新版，或者到mvn仓库搜索先easyexcel的最新版 - -``` - - com.alibaba - easyexcel - 1.0.0-RELEASE - -``` ## 读Excel 使用easyexcel解析03、07版本的Excel只是ExcelTypeEnum不同，其他使用完全相同，使用者无需知道底层解析的差异。 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java new file mode 100644 index 0000000..db5afaa --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java @@ -0,0 +1,17 @@ +package com.alibaba.easyexcel.test.demo.read; + +import java.util.Date; + +import lombok.Data; + +/** + * 基础数据类.这里的排序和excel里面的排序一致 + * + * @author zhuangjiaju + **/ +@Data +public class DemoData { + private String string; + private Date date; + private Double doubleData; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java new file mode 100644 index 0000000..6887ebc --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java @@ -0,0 +1,49 @@ +package com.alibaba.easyexcel.test.demo.read; + +import java.util.ArrayList; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.fastjson.JSON; + +/** + * 模板的读取类 + * + * @author zhuangjiaju + */ +public class DemoDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(DemoDataListener.class); + /** + * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收 + */ + private static final int BATCH_COUNT = 5; + List list = new ArrayList(); + + @Override + public void invoke(DemoData data, AnalysisContext context) { + LOGGER.info("解析到一条数据:{}", JSON.toJSONString(data)); + list.add(data); + if (list.size() >= BATCH_COUNT) { + saveData(); + list.clear(); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + saveData(); + LOGGER.info("所有数据解析完成！"); + } + + /** + * 加上存储数据库 + */ + private void saveData() { + LOGGER.info("{}条数据，开始存储数据库！", list.size()); + LOGGER.info("存储数据库成功！"); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java new file mode 100644 index 0000000..304be59 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java @@ -0,0 +1,28 @@ +package com.alibaba.easyexcel.test.demo.read; + +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelProperty; + +import lombok.Data; + +/** + * 基础数据类 + * + * @author zhuangjiaju + **/ +@Data +public class IndexOrNameData { + /** + * 强制读取第三个 这里不建议 index 和 name 同时用，要么一个对象只用index，要么一个对象只用name去匹配 + */ + @ExcelProperty(index = 2) + private Double doubleData; + /** + * 用名字去匹配，这里需要注意，如果名字重复，会导致只有一个字段读取到数据 + */ + @ExcelProperty("字符串标题") + private String string; + @ExcelProperty("日期标题") + private Date date; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java new file mode 100644 index 0000000..ad6a58f --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java @@ -0,0 +1,49 @@ +package com.alibaba.easyexcel.test.demo.read; + +import java.util.ArrayList; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.fastjson.JSON; + +/** + * 模板的读取类 + * + * @author zhuangjiaju + */ +public class IndexOrNameDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(IndexOrNameDataListener.class); + /** + * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收 + */ + private static final int BATCH_COUNT = 5; + List list = new ArrayList(); + + @Override + public void invoke(IndexOrNameData data, AnalysisContext context) { + LOGGER.info("解析到一条数据:{}", JSON.toJSONString(data)); + list.add(data); + if (list.size() >= BATCH_COUNT) { + saveData(); + list.clear(); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + saveData(); + LOGGER.info("所有数据解析完成！"); + } + + /** + * 加上存储数据库 + */ + private void saveData() { + LOGGER.info("{}条数据，开始存储数据库！", list.size()); + LOGGER.info("存储数据库成功！"); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java new file mode 100644 index 0000000..bbd8731 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java @@ -0,0 +1,51 @@ +package com.alibaba.easyexcel.test.demo.read; + +import java.io.File; + +import org.junit.Ignore; +import org.junit.Test; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.read.metadata.ReadSheet; + +/** + * 读的常见写法 + * + * @author zhuangjiaju + */ +@Ignore +public class ReadTest { + /** + * 最简单的读 + *
  • 1. 创建excel对应的实体对象 参照{@link DemoData} + *
  • 2. 由于默认异步读取excel，所以需要创建excel一行一行的回调监听器，参照{@link DemoDataListener} + *
  • 3. 直接读即可 + */ + @Test + public void simpleRead() { + // 写法1： + String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + // 这里 需要指定读用哪个class去读，然后读取第一个sheet 然后千万别忘记 finish + EasyExcelFactory.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead().finish(); + + // 写法2： + fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + ExcelReader excelReader = EasyExcelFactory.read(fileName, DemoData.class, new DemoDataListener()).build(); + ReadSheet readSheet = EasyExcelFactory.readSheet(0).build(); + excelReader.read(readSheet); + excelReader.finish(); + } + + /** + * 指定列的下标或者列名 + *
  • 使用{@link com.alibaba.excel.annotation.ExcelProperty}注解即可 + */ + @Test + public void indexOrNameRead() { + String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + // 这里默认读取第一个sheet 然后千万别忘记 finish + EasyExcelFactory.read(fileName, IndexOrNameData.class, new IndexOrNameDataListener()).sheet().doRead().finish(); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java new file mode 100644 index 0000000..d12cf85 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java @@ -0,0 +1,12 @@ +package com.alibaba.easyexcel.test.demo.web; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EasyexcelApplication { + + public static void main(String[] args) { + SpringApplication.run(EasyexcelApplication.class, args); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java new file mode 100644 index 0000000..143a4e4 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java @@ -0,0 +1,29 @@ +package com.alibaba.easyexcel.test.demo.write; + +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelProperty; + +import lombok.Data; + +/** + * 基础数据类.行高 列宽可以忽略 + * + * @author zhuangjiaju + **/ +@Data +public class DemoData { + + @ExcelProperty("字符串标题") + private String string; + /** + * 指定写到excel的格式 + */ + @ExcelProperty("日期标题") + private Date date; + /** + * 数字转成百分比，默认数字存到excel是数字，不存在格式，现在要变成百分比就变成文本了，所以要指定转换器 + */ + @ExcelProperty("数字标题") + private Double doubleData; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java new file mode 100644 index 0000000..af34472 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java @@ -0,0 +1,44 @@ +package com.alibaba.easyexcel.test.demo.write; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.junit.Ignore; +import org.junit.Test; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; + +/** + * 写的常见写法 + * + * @author zhuangjiaju + */ +@Ignore +public class WriteTest { + /** + * 最简单的写 + *
  • 1. 创建excel对应的实体对象 参照{@link com.alibaba.easyexcel.test.demo.write.DemoData} + *
  • 2. 直接写即可 + */ + @Test + public void simpleWrite() { + String fileName = TestFileUtil.getPath() + "write" + System.currentTimeMillis() + ".xlsx"; + // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后千万别忘记 finish + // 如果这里想使用03 则 传入excelType参数即可 + EasyExcelFactory.write(fileName, DemoData.class).sheet("模板").doWrite(data()).finish(); + } + + private List data() { + List list = new ArrayList(); + for (int i = 0; i < 10; i++) { + DemoData data = new DemoData(); + data.setString("字符串" + 0); + data.setDate(new Date()); + data.setDoubleData(0.56); + list.add(data); + } + return list; + } +} diff --git a/src/test/resources/demo/demo.xlsx b/src/test/resources/demo/demo.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1fa2eda47af528c1f5c2e61c478d31160efe1dee GIT binary patch literal 9139 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 T^}*vM5OgruN4X^8r~m#Rhv47O literal 0 HcmV?d00001 diff --git a/update.md b/update.md index 1414957..6058627 100644 --- a/update.md +++ b/update.md @@ -1,39 +1,25 @@ -# 1.0.1 - -完善测试用例，防止歧义，模型字段映射不上时候有抛异常，改为提醒。 - -# 1.0.2 - -修复拿到一行数据后，存到list中，但最后处理时候变为空的bug。 - -# 1.0.3 - -修复无@ExcelProperty标注的多余字段时候报错。 - -# 1.0.4 - -修复日期类型转换时候数字问题。基础模型支持字段类型int,long,double,boolean,date,string - -# 1.0.5 - -优化类型转换的性能。 - -# 1.0.6 - -增加@ExcelColumnNum,修复字符串前后空白，增加过滤功能。 -# 1.0.8 - -如果整行excel数据全部为空，则不解析返回。完善多sheet的解析。 - -# 1.0.9 - -修复excel超过16列被覆盖的问题，修复数据只有一行时候无法透传的bug。 - - -# 1.2.1 - -修复POI在大并发情况下创建临时目录失败的bug - +# 2.0.0 +* 优化读写逻辑 +* 优化读写对外接口 +* 加入转换器，方便格式转换 +* 极大优化读大文件的内存和效率 # 1.2.4 - 修复read()方法存在的bug +# 1.2.1 +修复POI在大并发情况下创建临时目录失败的bug +# 1.0.9 +修复excel超过16列被覆盖的问题，修复数据只有一行时候无法透传的bug。 +# 1.0.8 +如果整行excel数据全部为空，则不解析返回。完善多sheet的解析。 +# 1.0.6 +增加@ExcelColumnNum,修复字符串前后空白，增加过滤功能。 +# 1.0.5 +优化类型转换的性能。 +# 1.0.4 +修复日期类型转换时候数字问题。基础模型支持字段类型int,long,double,boolean,date,string +# 1.0.3 +修复无@ExcelProperty标注的多余字段时候报错。 +# 1.0.2 +修复拿到一行数据后，存到list中，但最后处理时候变为空的bug。 +# 1.0.1 +完善测试用例，防止歧义，模型字段映射不上时候有抛异常，改为提醒。 \ No newline at end of file