CompressUtil增加压缩和解压tgz（.tar.gz）文件

CHANGELOG.md

@@ -31,6 +31,7 @@
 * 【extra  】     完善QrCodeUtil对于DATA_MATRIX生成的形状随机不可指定的功能（pr#722@Gitee）
 * 【core   】     修改NetUtil.ipv6ToBigInteger，原方法标记为过期（pr#2485@Github）
 * 【core   】     ZipUtil新增zip文件解压大小限制，防止zip炸弹（pr#726@Gitee）
+* 【core   】     CompressUtil增加压缩和解压tgz（.tar.gz）文件（issue#I5J33E@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复CollUtil里面关于可变参数传null造成的crash问题（pr#2428@Github）

hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java

@@ -12,6 +12,7 @@ import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.ar.ArArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 
 import java.io.File;
 import java.io.IOException;
@@ -78,6 +79,16 @@ public class StreamArchiver implements Archiver {
 	 * @param targetStream 归档输出的流
 	 */
 	public StreamArchiver(Charset charset, String archiverName, OutputStream targetStream) {
+		if("tgz".equalsIgnoreCase(archiverName) || "tar.gz".equalsIgnoreCase(archiverName)){
+			//issue#I5J33E，支持tgz格式解压
+			try {
+				this.out = new TarArchiveOutputStream(new GzipCompressorOutputStream(targetStream));
+			} catch (IOException e) {
+				throw new IORuntimeException(e);
+			}
+			return;
+		}
+
 		final ArchiveStreamFactory factory = new ArchiveStreamFactory(charset.name());
 		try {
 			this.out = factory.createArchiveOutputStream(archiverName, targetStream);
@@ -129,7 +140,7 @@ public class StreamArchiver implements Archiver {
 
 	@Override
 	public void close() {
-		try {
+		try{
 			finish();
 		} catch (Exception ignore) {
 			//ignore

hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java

@@ -11,6 +11,8 @@ import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 
 import java.io.File;
 import java.io.IOException;
@@ -72,6 +74,13 @@ public class StreamExtractor implements Extractor{
 			in = IoUtil.toBuffered(in);
 			if (StrUtil.isBlank(archiverName)) {
 				this.in = factory.createArchiveInputStream(in);
+			} else if("tgz".equalsIgnoreCase(archiverName) || "tar.gz".equalsIgnoreCase(archiverName)){
+				//issue#I5J33E，支持tgz格式解压
+				try {
+					this.in = new TarArchiveInputStream(new GzipCompressorInputStream(in));
+				} catch (IOException e) {
+					throw new IORuntimeException(e);
+				}
 			} else {
 				this.in = factory.createArchiveInputStream(archiverName, in);
 			}

hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java

@@ -10,6 +10,7 @@ import org.junit.Test;
 
 import java.io.File;
 
+@SuppressWarnings("resource")
 public class ArchiverTest {
 
 	@Test
@@ -53,7 +54,19 @@ public class ArchiverTest {
 	public void sevenZTest(){
 		final File file = FileUtil.file("d:/test/compress/test.7z");
 		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.SEVEN_Z, file)
-				.add(FileUtil.file("d:/Java/apache-maven-3.6.3"), (f)->{
+				.add(FileUtil.file("d:/Java/apache-maven-3.8.1"), (f)->{
+					Console.log("Add: {}", f.getPath());
+					return true;
+				})
+				.finish().close();
+	}
+
+	@Test
+	@Ignore
+	public void tgzTest(){
+		final File file = FileUtil.file("d:/test/compress/test.tgz");
+		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "tgz", file)
+				.add(FileUtil.file("d:/Java/apache-maven-3.8.1"), (f)->{
 					Console.log("Add: {}", f.getPath());
 					return true;
 				})

hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java

@@ -27,4 +27,15 @@ public class ExtractorTest {
 
 		extractor.extract(FileUtil.file("d:/test/compress/test2/"));
 	}
+
+	@Test
+	@Ignore
+	public void tgzTest(){
+		Extractor extractor = 	CompressUtil.createExtractor(
+				CharsetUtil.defaultCharset(),
+				"tgz",
+				FileUtil.file("d:/test/test.tgz"));
+
+		extractor.extract(FileUtil.file("d:/test/tgz/"));
+	}
 }