pom

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>

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);
     }
 

pom.xml

@@ -23,7 +23,25 @@
         <version>2.5.2</version>
     </parent>
     <!-- Add typical dependencies for a web application -->
+    <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>
@@ -77,6 +95,7 @@
                 </exclusions>
             </dependency>
         </dependencies>
+    </dependencyManagement>
     <build>
 
         <plugins>

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>