Merge branch 'develop' of https://github.com/binarywang/weixin-java-tools into binarywang-develop

Conflicts:
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java

Author: chanjarster

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java

@@ -15,14 +15,14 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.InputStreamBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.*;
 import java.util.Map;
 
 public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMaterialUploadResult, WxMpMaterial> {
 
+  @Override
   public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpMaterial material) throws WxErrorException, ClientProtocolException, IOException {
     HttpPost httpPost = new HttpPost(uri);
     if (httpProxy != null) {
@@ -35,10 +35,9 @@ public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost
       if (file == null || !file.exists()) {
         throw new FileNotFoundException();
       }
-      BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file));
       MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
       multipartEntityBuilder
-          .addPart("media", new InputStreamBody(bufferedInputStream, material.getName()))
+          .addBinaryBody("media", file)
           .setMode(HttpMultipartMode.RFC6532);
       Map<String, String> form = material.getForm();
       if (material.getForm() != null) {
@@ -48,7 +47,7 @@ public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost
       httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
     }
 
-    try(CloseableHttpResponse response = httpclient.execute(httpPost)){
+    try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
       WxError error = WxError.fromJson(responseContent);
       if (error.getErrorCode() != 0) {