From 9cfff7bd886a1542fd915a56016d2969c86ed50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Tue, 10 Dec 2024 19:28:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=80=82=E9=85=8D=20fastexce?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +-- pom.xml | 26 +++++++++++-------- .../excel/ExcelHandlerConfiguration.java | 2 +- .../excel/annotation/ResponseExcel.java | 6 ++--- .../aop/RequestExcelArgumentResolver.java | 2 +- .../excel/converters/DictTypeConvert.java | 12 ++++----- .../converters/LocalDateStringConverter.java | 12 ++++----- .../LocalDateTimeStringConverter.java | 14 +++++----- .../converters/LocalTimeStringConverter.java | 12 ++++----- .../excel/converters/LongStringConverter.java | 12 ++++----- .../converters/StringArrayConverter.java | 12 ++++----- .../enhance/DefaultWriterBuilderEnhancer.java | 4 +-- .../excel/enhance/WriterBuilderEnhancer.java | 4 +-- .../handler/AbstractSheetWriteHandler.java | 14 +++++----- .../handler/DefaultAnalysisEventListener.java | 2 +- .../DictCacheClearAnalysisEventListener.java | 4 +-- .../DictCacheClearSheetWriteHandler.java | 4 +-- .../handler/ListAnalysisEventListener.java | 2 +- .../excel/handler/ManySheetWriteHandler.java | 8 +++--- .../handler/SingleSheetWriteHandler.java | 8 +++--- .../head/I18nHeaderCellWriteHandler.java | 8 +++--- .../pig4cloud/plugin/excel/ConverterTest.java | 2 +- .../pig4cloud/plugin/excel/ListConverter.java | 12 ++++----- .../pig4cloud/plugin/excel/SetConverter.java | 12 ++++----- .../plugin/excel/enums/IndexOrNameData2.java | 2 +- .../plugin/excel/enums/IndexOrNameData3.java | 2 +- .../plugin/excel/read/IndexOrNameData.java | 2 +- .../plugin/excel/read/IndexOrNameData1.java | 2 +- .../excel/read/IndexOrNameDataListener.java | 4 +-- .../excel/read/IndexOrNameDataListener1.java | 4 +-- .../plugin/excel/read/ReaderExcelTests.java | 2 +- 31 files changed, 110 insertions(+), 106 deletions(-) diff --git a/README.md b/README.md index b17ab95..f8df3b5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Excel Spring Boot Starter -`excel-spring-boot-starter` 是一个基于 `EasyExcel` 实现的 Spring Boot Starter，用于简化 Excel 的读写操作。`EasyExcel` 是一个 Java 开源项目，旨在以尽可能低的内存消耗实现对 Excel 文件的读写。通过 `EasyExcel`，你可以在仅使用 64M 内存的情况下，在 1 分钟内读取 75M（46 万行，25 列）的 Excel 文件。 +`excel-spring-boot-starter` 是一个基于 `FastExcel` 实现的 Spring Boot Starter，用于简化 Excel 的读写操作。`FastExcel` 是一个 Java 开源项目，旨在以尽可能低的内存消耗实现对 Excel 文件的读写。通过 `EasyExcel`，你可以在仅使用 64M 内存的情况下，在 1 分钟内读取 75M（46 万行，25 列）的 Excel 文件。 - 更多详细的使用说明，请参考文档：[https://www.yuque.com/pig4cloud/ogf9nv](https://www.yuque.com/pig4cloud/ogf9nv) @@ -20,7 +20,7 @@ | 版本 | 支持版本 | |-------|-------------------| -| 3.3.1 | 适配 Spring Boot 3.x | +| 3.4.0 | 适配 Spring Boot 3.x | | 1.2.7 | 适配 Spring Boot 2.x | 在 `pom.xml` 中添加以下依赖： diff --git a/pom.xml b/pom.xml index bae91ac..0dffe59 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.pig4cloud.excel excel-spring-boot-starter - 3.3.1 + 3.4.0 excel-spring-boot-starter easy and high performance excel https://pig4cloud.com @@ -36,7 +36,7 @@ 17 - 4.0.3 + 1.0.0 3.1.4 0.0.43 4.9.10 @@ -59,15 +59,19 @@ spring-boot-starter-aop - com.alibaba - easyexcel - ${easyexcel.version} - - - org.apache.commons - commons-compress - - + cn.idev.excel + fastexcel + ${fastexcel.version} + + + commons-io + commons-io + + + commons-compress + org.apache.commons + + org.apache.commons diff --git a/src/main/java/com/pig4cloud/plugin/excel/ExcelHandlerConfiguration.java b/src/main/java/com/pig4cloud/plugin/excel/ExcelHandlerConfiguration.java index bafa804..ae559f1 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/ExcelHandlerConfiguration.java +++ b/src/main/java/com/pig4cloud/plugin/excel/ExcelHandlerConfiguration.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel; -import com.alibaba.excel.converters.Converter; +import cn.idev.excel.converters.Converter; import com.pig4cloud.plugin.excel.aop.ResponseExcelReturnValueHandler; import com.pig4cloud.plugin.excel.config.ExcelConfigProperties; import com.pig4cloud.plugin.excel.enhance.DefaultWriterBuilderEnhancer; diff --git a/src/main/java/com/pig4cloud/plugin/excel/annotation/ResponseExcel.java b/src/main/java/com/pig4cloud/plugin/excel/annotation/ResponseExcel.java index 2e13ee1..42c7705 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/annotation/ResponseExcel.java +++ b/src/main/java/com/pig4cloud/plugin/excel/annotation/ResponseExcel.java @@ -1,8 +1,8 @@ package com.pig4cloud.plugin.excel.annotation; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.support.ExcelTypeEnum; -import com.alibaba.excel.write.handler.WriteHandler; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.support.ExcelTypeEnum; +import cn.idev.excel.write.handler.WriteHandler; import com.pig4cloud.plugin.excel.head.HeadGenerator; import java.lang.annotation.*; diff --git a/src/main/java/com/pig4cloud/plugin/excel/aop/RequestExcelArgumentResolver.java b/src/main/java/com/pig4cloud/plugin/excel/aop/RequestExcelArgumentResolver.java index 517e9f9..06d785e 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/aop/RequestExcelArgumentResolver.java +++ b/src/main/java/com/pig4cloud/plugin/excel/aop/RequestExcelArgumentResolver.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.aop; -import com.alibaba.excel.EasyExcel; +import cn.idev.excel.EasyExcel; import com.pig4cloud.plugin.excel.annotation.RequestExcel; import com.pig4cloud.plugin.excel.converters.*; import com.pig4cloud.plugin.excel.handler.DictCacheClearAnalysisEventListener; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/DictTypeConvert.java b/src/main/java/com/pig4cloud/plugin/excel/converters/DictTypeConvert.java index c5bd67d..d093fe8 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/DictTypeConvert.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/DictTypeConvert.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import com.pig4cloud.plugin.excel.annotation.DictTypeProperty; import com.pig4cloud.plugin.excel.handler.DictDataProvider; import com.pig4cloud.plugin.excel.kit.SpringContextKit; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateStringConverter.java b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateStringConverter.java index a473003..071f651 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateStringConverter.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateStringConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import java.text.ParseException; import java.time.LocalDate; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateTimeStringConverter.java b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateTimeStringConverter.java index def0911..9d0cfdd 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateTimeStringConverter.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalDateTimeStringConverter.java @@ -1,12 +1,12 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; -import com.alibaba.excel.util.DateUtils; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.util.DateUtils; import java.text.ParseException; import java.time.LocalDateTime; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalTimeStringConverter.java b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalTimeStringConverter.java index 5f1f8b2..d890dde 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/LocalTimeStringConverter.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/LocalTimeStringConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import java.text.ParseException; import java.time.LocalTime; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/LongStringConverter.java b/src/main/java/com/pig4cloud/plugin/excel/converters/LongStringConverter.java index 82e625c..4575196 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/LongStringConverter.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/LongStringConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import java.text.ParseException; diff --git a/src/main/java/com/pig4cloud/plugin/excel/converters/StringArrayConverter.java b/src/main/java/com/pig4cloud/plugin/excel/converters/StringArrayConverter.java index df6589e..b96f9ef 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/converters/StringArrayConverter.java +++ b/src/main/java/com/pig4cloud/plugin/excel/converters/StringArrayConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel.converters; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import java.text.ParseException; import java.util.Arrays; diff --git a/src/main/java/com/pig4cloud/plugin/excel/enhance/DefaultWriterBuilderEnhancer.java b/src/main/java/com/pig4cloud/plugin/excel/enhance/DefaultWriterBuilderEnhancer.java index cc4e31c..9674da2 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/enhance/DefaultWriterBuilderEnhancer.java +++ b/src/main/java/com/pig4cloud/plugin/excel/enhance/DefaultWriterBuilderEnhancer.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.enhance; -import com.alibaba.excel.write.builder.ExcelWriterBuilder; -import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import cn.idev.excel.write.builder.ExcelWriterBuilder; +import cn.idev.excel.write.builder.ExcelWriterSheetBuilder; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.head.HeadGenerator; diff --git a/src/main/java/com/pig4cloud/plugin/excel/enhance/WriterBuilderEnhancer.java b/src/main/java/com/pig4cloud/plugin/excel/enhance/WriterBuilderEnhancer.java index d48896a..0844532 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/enhance/WriterBuilderEnhancer.java +++ b/src/main/java/com/pig4cloud/plugin/excel/enhance/WriterBuilderEnhancer.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.enhance; -import com.alibaba.excel.write.builder.ExcelWriterBuilder; -import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import cn.idev.excel.write.builder.ExcelWriterBuilder; +import cn.idev.excel.write.builder.ExcelWriterSheetBuilder; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.head.HeadGenerator; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/AbstractSheetWriteHandler.java b/src/main/java/com/pig4cloud/plugin/excel/handler/AbstractSheetWriteHandler.java index a4f2e05..8e5391d 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/AbstractSheetWriteHandler.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/AbstractSheetWriteHandler.java @@ -1,12 +1,12 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.write.builder.ExcelWriterBuilder; -import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; -import com.alibaba.excel.write.handler.WriteHandler; -import com.alibaba.excel.write.metadata.WriteSheet; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.ExcelWriter; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.write.builder.ExcelWriterBuilder; +import cn.idev.excel.write.builder.ExcelWriterSheetBuilder; +import cn.idev.excel.write.handler.WriteHandler; +import cn.idev.excel.write.metadata.WriteSheet; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.annotation.Sheet; import com.pig4cloud.plugin.excel.aop.DynamicNameAspect; diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/DefaultAnalysisEventListener.java b/src/main/java/com/pig4cloud/plugin/excel/handler/DefaultAnalysisEventListener.java index 67b0147..f54ec7f 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/DefaultAnalysisEventListener.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/DefaultAnalysisEventListener.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.context.AnalysisContext; +import cn.idev.excel.context.AnalysisContext; import com.pig4cloud.plugin.excel.annotation.ExcelLine; import com.pig4cloud.plugin.excel.kit.Validators; import com.pig4cloud.plugin.excel.vo.ErrorMessage; diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearAnalysisEventListener.java b/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearAnalysisEventListener.java index b3e5b18..1d17955 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearAnalysisEventListener.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearAnalysisEventListener.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.read.listener.ReadListener; +import cn.idev.excel.context.AnalysisContext; +import cn.idev.excel.read.listener.ReadListener; import com.pig4cloud.plugin.excel.converters.DictTypeConvert; /** diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearSheetWriteHandler.java b/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearSheetWriteHandler.java index b5b30b5..a7eb120 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearSheetWriteHandler.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/DictCacheClearSheetWriteHandler.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.write.handler.WorkbookWriteHandler; -import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; +import cn.idev.excel.write.handler.WorkbookWriteHandler; +import cn.idev.excel.write.handler.context.WorkbookWriteHandlerContext; import com.pig4cloud.plugin.excel.converters.DictTypeConvert; /** diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/ListAnalysisEventListener.java b/src/main/java/com/pig4cloud/plugin/excel/handler/ListAnalysisEventListener.java index 83f8319..6f31617 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/ListAnalysisEventListener.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/ListAnalysisEventListener.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.event.AnalysisEventListener; +import cn.idev.excel.event.AnalysisEventListener; import com.pig4cloud.plugin.excel.vo.ErrorMessage; import java.util.List; diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/ManySheetWriteHandler.java b/src/main/java/com/pig4cloud/plugin/excel/handler/ManySheetWriteHandler.java index 447f401..ef16f96 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/ManySheetWriteHandler.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/ManySheetWriteHandler.java @@ -1,9 +1,9 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.write.metadata.WriteSheet; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.ExcelWriter; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.write.metadata.WriteSheet; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.annotation.Sheet; import com.pig4cloud.plugin.excel.config.ExcelConfigProperties; diff --git a/src/main/java/com/pig4cloud/plugin/excel/handler/SingleSheetWriteHandler.java b/src/main/java/com/pig4cloud/plugin/excel/handler/SingleSheetWriteHandler.java index 9514641..f17af18 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/handler/SingleSheetWriteHandler.java +++ b/src/main/java/com/pig4cloud/plugin/excel/handler/SingleSheetWriteHandler.java @@ -1,9 +1,9 @@ package com.pig4cloud.plugin.excel.handler; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.write.metadata.WriteSheet; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.ExcelWriter; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.write.metadata.WriteSheet; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.config.ExcelConfigProperties; import com.pig4cloud.plugin.excel.enhance.WriterBuilderEnhancer; diff --git a/src/main/java/com/pig4cloud/plugin/excel/head/I18nHeaderCellWriteHandler.java b/src/main/java/com/pig4cloud/plugin/excel/head/I18nHeaderCellWriteHandler.java index 894fde0..fa0e848 100644 --- a/src/main/java/com/pig4cloud/plugin/excel/head/I18nHeaderCellWriteHandler.java +++ b/src/main/java/com/pig4cloud/plugin/excel/head/I18nHeaderCellWriteHandler.java @@ -1,9 +1,9 @@ package com.pig4cloud.plugin.excel.head; -import com.alibaba.excel.metadata.Head; -import com.alibaba.excel.write.handler.CellWriteHandler; -import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; -import com.alibaba.excel.write.metadata.holder.WriteTableHolder; +import cn.idev.excel.metadata.Head; +import cn.idev.excel.write.handler.CellWriteHandler; +import cn.idev.excel.write.metadata.holder.WriteSheetHolder; +import cn.idev.excel.write.metadata.holder.WriteTableHolder; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.Row; diff --git a/src/test/java/com/pig4cloud/plugin/excel/ConverterTest.java b/src/test/java/com/pig4cloud/plugin/excel/ConverterTest.java index 662eee4..2ac2689 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/ConverterTest.java +++ b/src/test/java/com/pig4cloud/plugin/excel/ConverterTest.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel; -import com.alibaba.excel.converters.Converter; +import cn.idev.excel.converters.Converter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/pig4cloud/plugin/excel/ListConverter.java b/src/test/java/com/pig4cloud/plugin/excel/ListConverter.java index 08a0d47..0ae9d85 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/ListConverter.java +++ b/src/test/java/com/pig4cloud/plugin/excel/ListConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/src/test/java/com/pig4cloud/plugin/excel/SetConverter.java b/src/test/java/com/pig4cloud/plugin/excel/SetConverter.java index 92f0420..c30233b 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/SetConverter.java +++ b/src/test/java/com/pig4cloud/plugin/excel/SetConverter.java @@ -1,11 +1,11 @@ package com.pig4cloud.plugin.excel; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData2.java b/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData2.java index 6f29e7f..eb8a2e4 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData2.java +++ b/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData2.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.enums; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import com.pig4cloud.plugin.excel.annotation.DictTypeProperty; import lombok.Data; diff --git a/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData3.java b/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData3.java index 1da4e98..ef1fd2f 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData3.java +++ b/src/test/java/com/pig4cloud/plugin/excel/enums/IndexOrNameData3.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.enums; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import com.pig4cloud.plugin.excel.annotation.DictTypeProperty; import lombok.Data; diff --git a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData.java b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData.java index bce6d4a..a522c8c 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData.java +++ b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.read; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; /** diff --git a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData1.java b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData1.java index a21c0d0..82cfcbe 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData1.java +++ b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameData1.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.read; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; /** diff --git a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener.java b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener.java index 0d2b133..39e2d89 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener.java +++ b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.read; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; +import cn.idev.excel.context.AnalysisContext; +import cn.idev.excel.event.AnalysisEventListener; import lombok.extern.slf4j.Slf4j; /** diff --git a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener1.java b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener1.java index fdb7b67..e22ff0e 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener1.java +++ b/src/test/java/com/pig4cloud/plugin/excel/read/IndexOrNameDataListener1.java @@ -1,7 +1,7 @@ package com.pig4cloud.plugin.excel.read; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; +import cn.idev.excel.context.AnalysisContext; +import cn.idev.excel.event.AnalysisEventListener; import lombok.extern.slf4j.Slf4j; /** diff --git a/src/test/java/com/pig4cloud/plugin/excel/read/ReaderExcelTests.java b/src/test/java/com/pig4cloud/plugin/excel/read/ReaderExcelTests.java index 3dfc97f..0d5f42b 100644 --- a/src/test/java/com/pig4cloud/plugin/excel/read/ReaderExcelTests.java +++ b/src/test/java/com/pig4cloud/plugin/excel/read/ReaderExcelTests.java @@ -1,6 +1,6 @@ package com.pig4cloud.plugin.excel.read; -import com.alibaba.excel.EasyExcel; +import cn.idev.excel.EasyExcel; import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource;