From 84c7e539c9501167bd288a7f257e3451df6d2d15 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 26 Oct 2022 22:35:06 +0800
Subject: [PATCH] pom
---
admin-core/pom.xml | 5 +
.../com/ibeetl/admin/core/util/ExcelUtil.java | 15 ++-
pom.xml | 123 ++++++++++--------
web/pom.xml | 7 +-
4 files changed, 90 insertions(+), 60 deletions(-)
diff --git a/admin-core/pom.xml b/admin-core/pom.xml
index c32deeba..9827ddc4 100644
--- a/admin-core/pom.xml
+++ b/admin-core/pom.xml
@@ -197,5 +197,10 @@
<version>3.1.1</version>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/ExcelUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/ExcelUtil.java
index b608b774..e096aa78 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/util/ExcelUtil.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/ExcelUtil.java
@@ -8,7 +8,6 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
-import org.assertj.core.util.Lists;
import org.beetl.sql.annotation.entity.AssignID;
import org.springframework.web.multipart.MultipartFile;
@@ -187,7 +186,7 @@ public class ExcelUtil {
list.addAll(extendsData);
}
list.forEach(item -> {
- List<Object> itemList = Lists.newArrayList();
+ List<Object> itemList = new ArrayList<>();
for (String head : heads) {
itemList.add(ObjectUtils.defaultIfNull(item.get(head), ""));
}
@@ -232,9 +231,9 @@ public class ExcelUtil {
* @return
*/
public static List<List<String>> heads(Collection<String> heads) {
- List<List<String>> list = Lists.newArrayList();
+ List<List<String>> list = new ArrayList<>();
for (String head : heads) {
- list.add(Lists.newArrayList(head));
+ list.add(new ArrayList<>(Collections.singleton(head)));
}
return list;
}
@@ -299,7 +298,9 @@ public class ExcelUtil {
.sheet(sheetName);
// 注册转换器
Optional.ofNullable(converters).ifPresent(e -> e.forEach(sheet::registerConverter));
- if (isFreezeHead) sheet.registerWriteHandler(new FreezeAndFilter());
+ if (isFreezeHead) {
+ sheet.registerWriteHandler(new FreezeAndFilter());
+ }
sheet.doWrite(data);
}
@@ -330,7 +331,9 @@ public class ExcelUtil {
.sheet(sheetName);
// 注册转换器
Optional.ofNullable(converters).ifPresent(e -> e.forEach(sheet::registerConverter));
- if (isFreezeHead) sheet.registerWriteHandler(new FreezeAndFilter());
+ if (isFreezeHead) {
+ sheet.registerWriteHandler(new FreezeAndFilter());
+ }
sheet.doWrite(data);
}
diff --git a/pom.xml b/pom.xml
index b9b6f31e..cd0abcca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,60 +23,79 @@
<version>2.5.2</version>
</parent>
<!-- Add typical dependencies for a web application -->
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibeetl</groupId>
+ <artifactId>admin-core</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
+ <dependency>
+ <groupId>com.ibeetl</groupId>
+ <artifactId>admin-console</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibeetl</groupId>
+ <artifactId>admin-test</artifactId>
+ <version>1.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.56</version>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.56</version>
+ </dependency>
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>3.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.auth0</groupId>
+ <artifactId>java-jwt</artifactId>
+ <version>3.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
diff --git a/web/pom.xml b/web/pom.xml
index 93353f11..198871e3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -20,13 +20,16 @@
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-core</artifactId>
- <version>1.3.1</version>
</dependency>
<!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-console</artifactId>
- <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibeetl</groupId>
+ <artifactId>admin-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>