diff --git a/pom.xml b/pom.xml index 02e8a7bc..bf2d86f3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 2.4.2 - 3.2.1 + 1.1.0 8.5.10 @@ -157,11 +157,13 @@ - com.alibaba - easyexcel - ${easyexcel.version} + cn.idev.excel + fastexcel + ${fastexcel.version} + + org.springframework.boot spring-boot-starter-validation diff --git a/src/main/java/com/youlai/boot/common/util/ExcelUtils.java b/src/main/java/com/youlai/boot/common/util/ExcelUtils.java index 6be58cfc..e2d419bc 100644 --- a/src/main/java/com/youlai/boot/common/util/ExcelUtils.java +++ b/src/main/java/com/youlai/boot/common/util/ExcelUtils.java @@ -1,7 +1,7 @@ package com.youlai.boot.common.util; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.event.AnalysisEventListener; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.event.AnalysisEventListener; import java.io.InputStream; diff --git a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java index d8f4bffe..f39a7562 100644 --- a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -7,7 +7,6 @@ import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.excel.util.StringUtils; import com.aliyun.oss.HttpMethod; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.util.IPUtils; @@ -209,7 +208,7 @@ public class LogAspect { * @return UserAgent */ public UserAgent resolveUserAgent(String userAgentString) { - if (StringUtils.isBlank(userAgentString)) { + if (StrUtil.isBlank(userAgentString)) { return null; } // 给userAgentStringMD5加密一次防止过长 diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index f94082af..6705f202 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.controller; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.boot.common.annotation.Log; diff --git a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java index 522ecfb0..806d7e60 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -6,8 +6,8 @@ import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.json.JSONUtil; -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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.enums.StatusEnum; diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java index fd3c3e87..7c472c61 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.model.dto; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.alibaba.excel.annotation.write.style.ColumnWidth; +import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; +import cn.idev.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.time.LocalDateTime; diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java index 3a9bedbf..f32aba04 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java @@ -1,6 +1,6 @@ package com.youlai.boot.system.model.dto; -import com.alibaba.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; /**