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

pom.xml

@@ -208,7 +208,6 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
 							<includeSystemScope>true</includeSystemScope>
-							<!-- 以下为减少依赖 -->
 							<layout>ZIP</layout>
 							<includes>
 								<include>

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

@@ -12,7 +12,7 @@ import java.util.*;
 @Component
 public class HttpUtils {
 
-    public InputStream download(String url) {
+    public byte[] download(String url) {
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         HttpEntity<String> entity = new HttpEntity<String>(headers);
@@ -20,7 +20,7 @@ public class HttpUtils {
         String formatURL = (String) urlAndParams.get("url");
         Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
 
-        ResponseEntity<InputStream> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, InputStream.class, params);
+        ResponseEntity<byte[]> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, byte[].class, params);
         return resp.getBody();
     }
 

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

@@ -11,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -46,7 +43,8 @@ public class ZipUtil {
         for (RFile f : files) {
             ZipParameters zipParameters = new ZipParameters();
             zipParameters.setFileNameInZip(f.getName());
-            InputStream inputStream = httpUtils.download(f.getUrl());
+            byte[] data = httpUtils.download(f.getUrl());
+            InputStream inputStream = new ByteArrayInputStream(data);
             zipFile.addStream(inputStream, zipParameters);
             inputStream.close();
         }