|
@@ -13,6 +13,7 @@ import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
import java.util.zip.GZIPInputStream;
|
|
import java.util.zip.GZIPInputStream;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -138,17 +139,15 @@ public class CompressUtil {
|
|
|
}
|
|
}
|
|
|
File[] extractedFiles = new File[extractedFileList.size()];
|
|
File[] extractedFiles = new File[extractedFileList.size()];
|
|
|
extractedFileList.toArray(extractedFiles);
|
|
extractedFileList.toArray(extractedFiles);
|
|
|
-
|
|
|
|
|
- for (File f : extractedFileList) {
|
|
|
|
|
|
|
+ extractedFileList = extractedFileList.stream().filter(x->{
|
|
|
if(isBz) {
|
|
if(isBz) {
|
|
|
- if (f.getName().contains("_bz")) {
|
|
|
|
|
- f.renameTo(new File(dest + fileName));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- f.renameTo(new File(dest + fileName));
|
|
|
|
|
|
|
+ return x.getName().contains("_bz");
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return !x.getName().contains("_bz");
|
|
|
}
|
|
}
|
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
|
+ for (File f : extractedFileList) {
|
|
|
|
|
+ f.renameTo(new File(dest + fileName));
|
|
|
System.out.println(f.getAbsolutePath() + "文件解压成功!");
|
|
System.out.println(f.getAbsolutePath() + "文件解压成功!");
|
|
|
}
|
|
}
|
|
|
zipFile.delete();
|
|
zipFile.delete();
|