瀏覽代碼

Merge branch 'master' of http://git.ycjcjy.com/pet_identity/service

张延森 3 年之前
父節點
當前提交
dcae9fd10d
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6
    3
      src/main/java/com/njyunzhi/pet_identity/common/ZipUtil.java

+ 6
- 3
src/main/java/com/njyunzhi/pet_identity/common/ZipUtil.java 查看文件

6
 import lombok.Data;
6
 import lombok.Data;
7
 import net.lingala.zip4j.ZipFile;
7
 import net.lingala.zip4j.ZipFile;
8
 import net.lingala.zip4j.exception.ZipException;
8
 import net.lingala.zip4j.exception.ZipException;
9
+import net.lingala.zip4j.io.outputstream.ZipOutputStream;
9
 import net.lingala.zip4j.model.ZipParameters;
10
 import net.lingala.zip4j.model.ZipParameters;
10
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.stereotype.Component;
12
 import org.springframework.stereotype.Component;
40
             return zipFile;
41
             return zipFile;
41
         }
42
         }
42
 
43
 
44
+        FileOutputStream fos = new FileOutputStream(zipFile.getFile());
45
+        ZipOutputStream zos = new ZipOutputStream(fos);
43
         ZipParameters zipParameters = new ZipParameters();
46
         ZipParameters zipParameters = new ZipParameters();
44
 
47
 
45
         for (RFile f : files) {
48
         for (RFile f : files) {
46
             zipParameters.setFileNameInZip(f.getName());
49
             zipParameters.setFileNameInZip(f.getName());
50
+            zos.putNextEntry(zipParameters);
47
             byte[] data = httpUtils.download(f.getUrl());
51
             byte[] data = httpUtils.download(f.getUrl());
48
-            InputStream inputStream = new ByteArrayInputStream(data);
49
-            zipFile.addStream(inputStream, zipParameters);
50
-            inputStream.close();
52
+            zos.write(data);
53
+            zos.closeEntry();
51
         }
54
         }
52
 
55
 
53
         return zipFile;
56
         return zipFile;