修复重构素材上传处理代码

Author: binarywang

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

@@ -30,22 +30,26 @@ public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost
       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);
@@ -55,7 +59,7 @@ public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost
       } else {
         return WxMpMaterialUploadResult.fromJson(responseContent);
       }
-    }finally {
+    } finally {
       httpPost.releaseConnection();
     }
   }