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

src/main/java/com/njyunzhi/pet_identity/common/ZipUtil.java

@@ -34,15 +34,8 @@ public class ZipUtil {
         return LocalDateTime.now(ZoneId.of("Asia/Shanghai")).format(formatter);
     }
 
-    public ZipFile zipLink(List<RFile> files) throws IOException {
-        ZipFile zipFile = new ZipFile(today() + ".zip");
-
-        if (files == null || files.size() < 1) {
-            return zipFile;
-        }
-
-        FileOutputStream fos = new FileOutputStream(zipFile.getFile());
-        ZipOutputStream zos = new ZipOutputStream(fos);
+    private void zipStream(List<RFile> files, OutputStream outputStream) throws IOException {
+        ZipOutputStream zos = new ZipOutputStream(outputStream);
         ZipParameters zipParameters = new ZipParameters();
 
         for (RFile f : files) {
@@ -52,36 +45,21 @@ public class ZipUtil {
             zos.write(data);
             zos.closeEntry();
         }
-
-        return zipFile;
-    }
-
-    private long copyStream(InputStream input, OutputStream output) throws IOException {
-        ReadableByteChannel inputChannel = Channels.newChannel(input);
-        WritableByteChannel outputChannel = Channels.newChannel(output);
-        ByteBuffer buffer = ByteBuffer.allocateDirect(10240);
-        long size = 0;
-
-        while (inputChannel.read(buffer) != -1) {
-            buffer.flip();
-            size += outputChannel.write(buffer);
-            buffer.clear();
-        }
-
-        return size;
+        zos.close();
     }
 
-    public void flush(HttpServletResponse response, ZipFile zipFile) throws IOException {
+    public void flush(HttpServletResponse response, List<RFile> files) throws IOException {
         try {
-            String fileName = zipFile.getFile().getName();
-            InputStream inputStream = new FileInputStream(zipFile.getFile());
+            if (files == null || files.size() < 1) {
+                throw new Exception("导出内容为空");
+            }
 
+            String fileName = today() + ".zip";
             response.setContentType("application/zip");
             response.setCharacterEncoding("utf-8");
             response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName));
-
-            response.setContentLength(zipFile.getBufferSize());
-            copyStream(inputStream, response.getOutputStream());
+            zipStream(files, response.getOutputStream());
+            response.flushBuffer();
         } catch (Exception e) {
             e.printStackTrace();
 

src/main/java/com/njyunzhi/pet_identity/controller/TaCardNoController.java

@@ -116,8 +116,7 @@ public class TaCardNoController extends BaseController {
             }
         }
 
-        ZipFile data = zipUtil.zipLink(files);
-        zipUtil.flush(response, data);
+        zipUtil.flush(response, files);
         return null;
     }