|
|
@@ -1,15 +1,9 @@
|
|
|
package com.uas.report.util;
|
|
|
|
|
|
-import java.io.ByteArrayInputStream;
|
|
|
-import java.io.ByteArrayOutputStream;
|
|
|
-import java.io.File;
|
|
|
-import java.io.FileFilter;
|
|
|
-import java.io.FileInputStream;
|
|
|
-import java.io.FileNotFoundException;
|
|
|
-import java.io.FileOutputStream;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.InputStream;
|
|
|
-import java.io.OutputStream;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
+
|
|
|
+import java.io.*;
|
|
|
import java.nio.charset.Charset;
|
|
|
import java.util.Enumeration;
|
|
|
import java.util.zip.ZipEntry;
|
|
|
@@ -17,9 +11,6 @@ import java.util.zip.ZipFile;
|
|
|
import java.util.zip.ZipInputStream;
|
|
|
import java.util.zip.ZipOutputStream;
|
|
|
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-
|
|
|
/**
|
|
|
* 压缩工具类
|
|
|
*
|
|
|
@@ -156,7 +147,7 @@ public class ZipUtils {
|
|
|
}
|
|
|
continue;
|
|
|
}
|
|
|
- if (!outFile.getParentFile().exists()) {
|
|
|
+ if (outFile.getParentFile() != null && !outFile.getParentFile().exists()) {
|
|
|
outFile.getParentFile().mkdirs();
|
|
|
}
|
|
|
|
|
|
@@ -206,7 +197,7 @@ public class ZipUtils {
|
|
|
}
|
|
|
InputStream inputStream = zipFile.getInputStream(zipEntry);
|
|
|
File outFile = new File(folder.getPath() + File.separator + zipEntry.getName());
|
|
|
- if (!outFile.getParentFile().exists()) {
|
|
|
+ if (outFile.getParentFile() != null && !outFile.getParentFile().exists()) {
|
|
|
outFile.getParentFile().mkdirs();
|
|
|
}
|
|
|
|