2.0

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/filter/PostResultFilter.java

@@ -4,12 +4,17 @@ import com.gitee.sop.gatewaycommon.bean.ApiConfig;
 import com.gitee.sop.gatewaycommon.bean.ApiContext;
 import com.gitee.sop.gatewaycommon.bean.SopConstants;
 import com.gitee.sop.gatewaycommon.result.ResultExecutor;
+import com.netflix.util.Pair;
 import com.netflix.zuul.context.RequestContext;
 import com.netflix.zuul.exception.ZuulException;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
+import org.springframework.http.MediaType;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.List;
 
 /**
  * 合并微服务结果，统一返回格式
@@ -30,7 +35,16 @@ public class PostResultFilter extends BaseZuulFilter {
 
     @Override
     protected Object doRun(RequestContext requestContext) throws ZuulException {
-        if (requestContext.getResponse().isCommitted()) {
+        HttpServletResponse response = requestContext.getResponse();
+        if (response.isCommitted()) {
+            return null;
+        }
+        List<Pair<String, String>> zuulResponseHeaders = requestContext.getZuulResponseHeaders();
+        boolean isDownloadRequest = zuulResponseHeaders
+                .stream()
+                .anyMatch(pair -> StringUtils.contains(pair.second(), MediaType.APPLICATION_OCTET_STREAM_VALUE));
+        // 如果是文件下载直接返回
+        if (isDownloadRequest) {
             return null;
         }
         InputStream responseDataStream = requestContext.getResponseDataStream();

sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/DownloadController.java

@@ -0,0 +1,37 @@
+package com.gitee.sop.storyweb.controller;
+
+import com.gitee.sop.servercommon.annotation.ApiMapping;
+import com.gitee.sop.storyweb.controller.param.StoryParam;
+import org.apache.commons.io.FileUtils;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * 演示文件下载
+ *
+ * @author tanghc
+ */
+@Controller
+public class DownloadController {
+
+    @ApiMapping(value = "story.download")
+    public ResponseEntity<byte[]> export(StoryParam param) throws IOException {
+
+        HttpHeaders headers = new HttpHeaders();
+        // 假设下载classpath下的application.properties文件
+        ClassPathResource resource = new ClassPathResource("/application.properties");
+        File file = resource.getFile();
+
+        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+        headers.setContentDispositionFormData("attachment", file.getName());
+
+        return new ResponseEntity<>(FileUtils.readFileToByteArray(file), headers, HttpStatus.OK);
+    }
+}

sop-test/src/main/java/com/gitee/sop/test/HttpTool.java

@@ -13,6 +13,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.io.ByteArrayOutputStream;
@@ -243,6 +244,31 @@ public class HttpTool {
         }
     }
 
+    /**
+     * 下载文件
+     *
+     * @param url    请求url
+     * @param form   请求数据
+     * @param header header
+     * @return 返回文件流
+     * @throws IOException
+     */
+    public InputStream downloadFile(String url, Map<String, ?> form, Map<String, String> header) throws IOException {
+        Request.Builder requestBuilder = buildRequestBuilder(url, form, HTTPMethod.GET);
+        // 添加header
+        addHeader(requestBuilder, header);
+
+        Request request = requestBuilder.build();
+        Response response = httpClient
+                .newCall(request)
+                .execute();
+        if (response.isSuccessful()) {
+            ResponseBody body = response.body();
+            return body == null ? null : body.byteStream();
+        }
+        return null;
+    }
+
     private void addHeader(Request.Builder builder, Map<String, String> header) {
         if (header != null) {
             Set<Map.Entry<String, String>> entrySet = header.entrySet();

sop-test/src/test/java/com/gitee/sop/test/DownloadTest.java

@@ -0,0 +1,67 @@
+package com.gitee.sop.test;
+
+import com.alibaba.fastjson.JSON;
+import com.gitee.sop.test.alipay.AlipayApiException;
+import com.gitee.sop.test.alipay.AlipaySignature;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 文件下载
+ * @author tanghc
+ */
+public class DownloadTest extends TestBase {
+
+    String url = "http://localhost:8081/api"; // zuul
+    String appId = "2019032617262200001";
+    // 支付宝私钥
+    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
+
+
+    public void testDownload() throws AlipayApiException, IOException {
+        // 公共请求参数
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("app_id", appId);
+        params.put("method", "story.download");
+        params.put("format", "json");
+        params.put("charset", "utf-8");
+        params.put("sign_type", "RSA2");
+        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        params.put("version", "1.0");
+
+        // 业务参数
+        Map<String, String> bizContent = new HashMap<>();
+        bizContent.put("id", "1");
+        bizContent.put("name", "葫芦娃");
+
+        params.put("biz_content", JSON.toJSONString(bizContent));
+
+        System.out.println("----------- 请求信息 -----------");
+        System.out.println("请求参数：" + buildParamQuery(params));
+        System.out.println("商户秘钥：" + privateKey);
+        String content = AlipaySignature.getSignContent(params);
+        System.out.println("待签名内容：" + content);
+        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
+        System.out.println("签名(sign)：" + sign);
+
+        params.put("sign", sign);
+
+        System.out.println("----------- 返回结果 -----------");
+        InputStream fileInputStream = download(url, params);
+        String fileContent = IOUtils.toString(fileInputStream, StandardCharsets.UTF_8);
+        // 输出文件内容
+        System.out.println("文件内容：");
+        System.out.println(fileContent);
+
+        // 写文件到本地
+        //FileUtils.copyInputStreamToFile(fileInputStream, new File("D:/a.txt"));
+    }
+
+}

sop-test/src/test/java/com/gitee/sop/test/TestBase.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import junit.framework.TestCase;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.Map;
 
@@ -50,6 +51,20 @@ public class TestBase extends TestCase {
         }
     }
 
+    /**
+     * 下载文件
+     * @param url
+     * @param params
+     * @return 返回文件流
+     */
+    public static InputStream download(String url, Map<String, String> params) {
+        try {
+            return httpTool.downloadFile(url, params, null);
+        } catch (IOException e) {
+            throw new RuntimeException("网络请求异常", e);
+        }
+    }
+
     protected static String buildParamQuery(Map<String, String> params) {
         StringBuilder sb = new StringBuilder();
         for (Map.Entry<String, String> entry : params.entrySet()) {