diff --git a/pom.xml b/pom.xml
index 12c112c..4b023d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,11 @@
org.apache.poi
poi-ooxml
+
+ com.alibaba
+ easyexcel
+ 2.2.10
+
diff --git a/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/src/main/java/com/muyu/common/core/utils/ServletUtils.java
index 9a50531..31c5837 100644
--- a/src/main/java/com/muyu/common/core/utils/ServletUtils.java
+++ b/src/main/java/com/muyu/common/core/utils/ServletUtils.java
@@ -226,7 +226,11 @@ public class ServletUtils {
* @return 解码后的内容
*/
public static String urlDecode (String str) {
- return URLDecoder.decode(str, StandardCharsets.UTF_8);
+ try {
+ return URLDecoder.decode(str, String.valueOf(StandardCharsets.UTF_8));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
}
/**
diff --git a/src/main/java/com/muyu/common/core/utils/poi/ExcelUtils.java b/src/main/java/com/muyu/common/core/utils/poi/ExcelUtils.java
deleted file mode 100644
index 41ce85a..0000000
--- a/src/main/java/com/muyu/common/core/utils/poi/ExcelUtils.java
+++ /dev/null
@@ -1,810 +0,0 @@
-package com.muyu.common.core.utils.poi;
-
-
-
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.annotation.Excel.Type;
-import com.muyu.common.core.annotation.Excels;
-import com.muyu.common.core.exception.UtilException;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.file.FileTypeUtils;
-import com.muyu.common.core.utils.file.ImageUtils;
-import com.muyu.common.core.utils.reflect.ReflectUtils;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * Excel相关处理
- */
-@Log4j2
-public class ExcelUtils
-{
-
- /**
- * Excel sheet最大行数,默认65536
- */
- public static final int SHEET_SIZE = 65536;
-
- /**
- * 工作表名称
- */
- private String sheetName;
-
- /**
- * 导出类型(EXPORT:导出数据;IMPORT:导入模板)
- */
- private Type type;
-
- /**
- * 工作薄对象
- */
- private Workbook wb;
-
- /**
- * 工作表对象
- */
- private Sheet sheet;
-
- /**
- * 样式列表
- */
- private Map styles;
-
- /**
- * 导入导出数据列表
- */
- private List list;
-
- /**
- * 注解列表
- */
- private List