Merge pull request #2 from guoshiqiufeng/dev

Dev

kernel-all-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-sdk/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-redis-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-sdk-redis/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/db-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/db-sdk-mybatis-plus/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/db-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-dependencies/pom.xml

@@ -22,7 +22,7 @@
     <groupId>com.gitee.fubluesky.kernel</groupId>
     <artifactId>kernel-dependencies</artifactId>
     <name>kernel-dependencies</name>
-    <version>1.4.0</version>
+    <version>1.4.3</version>
     <description>依赖版本统一配置</description>
     <inceptionYear>2021-Now</inceptionYear>
     <packaging>pom</packaging>
@@ -43,6 +43,7 @@
         <aliyun.sdk.core.version>4.4.6</aliyun.sdk.core.version>
 
         <easyexcel.version>3.0.5</easyexcel.version>
+        <commons-compress.version>1.21</commons-compress.version>
 
         <!-- io.jsonwebtoken jwt -->
         <jjwt.version>0.9.1</jjwt.version>
@@ -180,6 +181,11 @@
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons-compress.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

kernel-email/email-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-email/email-sdk-java/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-email/email-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-email/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-excel/excel-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-excel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-excel/excel-api/src/main/java/com/gitee/fubluesky/kernel/excel/api/ExcelApi.java

@@ -18,6 +18,7 @@
 package com.gitee.fubluesky.kernel.excel.api;
 
 import com.gitee.fubluesky.kernel.excel.api.pojo.ExportParam;
+import com.gitee.fubluesky.kernel.excel.api.pojo.ExportSheetParam;
 
 import java.io.InputStream;
 import java.util.List;
@@ -30,11 +31,17 @@
 public interface ExcelApi {
 
 	/**
-	 * 下载
+	 * 单sheet下载
 	 * @param exportParam 下载参数
 	 */
 	void download(ExportParam exportParam);
 
+	/**
+	 * 多sheet下载
+	 * @param exportSheetParam 下载参数
+	 */
+	void download(ExportSheetParam exportSheetParam);
+
 	/**
 	 * 从文件流中 组装 对象列表
 	 * @param inputStream 文件流

kernel-excel/excel-api/src/main/java/com/gitee/fubluesky/kernel/excel/api/pojo/ExportSheetParam.java

@@ -0,0 +1,56 @@
+/*
+ *
+ *   Copyright 2021 fubluesky.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *        https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.gitee.fubluesky.kernel.excel.api.pojo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yanghq
+ * @version 1.0
+ * @since 2021-11-19 15:00
+ */
+@Data
+@Accessors(chain = true)
+public class ExportSheetParam implements Serializable {
+
+	/**
+	 * 输出流
+	 */
+	private HttpServletResponse response;
+
+	/**
+	 * 集合类
+	 */
+	private Class<?> clazz;
+
+	/**
+	 * 文件名
+	 */
+	private String fileName = "file";
+
+	/**
+	 * sheet集合
+	 */
+	private List<SheetParam> sheets;
+
+}

kernel-excel/excel-api/src/main/java/com/gitee/fubluesky/kernel/excel/api/pojo/SheetParam.java

@@ -0,0 +1,45 @@
+/*
+ *
+ *   Copyright 2021 fubluesky.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *        https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.gitee.fubluesky.kernel.excel.api.pojo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * @author yanghq
+ * @version 1.0
+ * @since 2021-11-20 13:55
+ */
+@Data
+public class SheetParam implements Serializable {
+
+	private static final long serialVersionUID = 2287696388527867721L;
+
+	/**
+	 * 数据集合
+	 */
+	private Collection<?> data;
+
+	/**
+	 * sheet名
+	 */
+	private String sheetName = "";
+
+}

kernel-excel/excel-sdk-easy/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-excel</artifactId>
-        <version>1.4.2</version>
+        <version>1.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -43,12 +43,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-compress</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>