From 13d76c1c50a9abda891c0965f08c38a208034364 Mon Sep 17 00:00:00 2001
From: BinaryWang <wbchn@qq.com>
Date: Fri, 24 Jun 2016 09:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=9E=84=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E4=B8=8A=E4=BC=A0=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../http/MaterialUploadRequestExecutor.java   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
index 5e90c07a3..2491e0ab1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
@@ -30,23 +30,27 @@ public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMateri
       httpPost.setConfig(response);
     }
 
-    if (material != null) {
-      File file = material.getFile();
-      if (file == null || !file.exists()) {
-        throw new FileNotFoundException();
-      }
-      MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
-      multipartEntityBuilder
-          .addBinaryBody("media", file)
-          .setMode(HttpMultipartMode.RFC6532);
-      Map<String, String> form = material.getForm();
-      if (material.getForm() != null) {
-        multipartEntityBuilder.addTextBody("description", WxGsonBuilder.create().toJson(form));
-      }
-      httpPost.setEntity(multipartEntityBuilder.build());
-      httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
+    if (material == null) {
+      throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法请求，material参数为空").build());
     }
 
+    File file = material.getFile();
+    if (file == null || !file.exists()) {
+      throw new FileNotFoundException();
+    }
+    
+    MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+    multipartEntityBuilder
+        .addBinaryBody("media", file)
+        .setMode(HttpMultipartMode.RFC6532);
+    Map<String, String> form = material.getForm();
+    if (material.getForm() != null) {
+      multipartEntityBuilder.addTextBody("description", WxGsonBuilder.create().toJson(form));
+    }
+    
+    httpPost.setEntity(multipartEntityBuilder.build());
+    httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
+
     try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
       WxError error = WxError.fromJson(responseContent);
@@ -55,7 +59,7 @@ public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMateri
       } else {
         return WxMpMaterialUploadResult.fromJson(responseContent);
       }
-    }finally {
+    } finally {
       httpPost.releaseConnection();
     }
   }