上传文件接口支持自定义meta字段 (#103)

* 去除comment_on_pr action

* 增加uploadFile接口，支持自定义meta

Author: lianup

.github/workflows/comment_on_pr.yml

@@ -31,49 +31,59 @@ public static class Builder {
 
         private final URI uri;
         private String fileName;
-        private String fileSha256;
         private InputStream fileInputStream;
         private ContentType fileContentType;
+        private String meta;
 
         public Builder(URI uri) {
+            if (uri == null) {
+                throw new IllegalArgumentException("上传文件接口URL为空");
+            }
             this.uri = uri;
         }
 
         public Builder withImage(String fileName, String fileSha256, InputStream inputStream) {
+            if (fileSha256 == null || fileSha256.isEmpty()) {
+                throw new IllegalArgumentException("文件摘要为空");
+            }
+            meta = String.format("{\"filename\":\"%s\",\"sha256\":\"%s\"}", fileName, fileSha256);
+            return withFile(fileName, meta, inputStream);
+        }
+
+        public Builder withFile(String fileName, String meta, InputStream inputStream) {
             this.fileName = fileName;
-            this.fileSha256 = fileSha256;
             this.fileInputStream = inputStream;
-
             String mimeType = URLConnection.guessContentTypeFromName(fileName);
             if (mimeType == null) {
                 // guess this is a video uploading
                 this.fileContentType = ContentType.APPLICATION_OCTET_STREAM;
             } else {
                 this.fileContentType = ContentType.create(mimeType);
             }
+            this.meta = meta;
             return this;
         }
 
         public WechatPayUploadHttpPost build() {
-            if (fileName == null || fileSha256 == null || fileInputStream == null) {
-                throw new IllegalArgumentException("缺少待上传图片文件信息");
+            if (fileName == null || fileName.isEmpty()) {
+                throw new IllegalArgumentException("文件名称为空");
             }
-
-            if (uri == null) {
-                throw new IllegalArgumentException("缺少上传图片接口URL");
+            if (fileInputStream == null) {
+                throw new IllegalArgumentException("文件为空");
+            }
+            if (fileContentType == null) {
+                throw new IllegalArgumentException("文件类型为空");
+            }
+            if (meta == null || meta.isEmpty()) {
+                throw new IllegalArgumentException("媒体文件元信息为空");
             }
-
-            String meta = String.format("{\"filename\":\"%s\",\"sha256\":\"%s\"}", fileName, fileSha256);
             WechatPayUploadHttpPost request = new WechatPayUploadHttpPost(uri, meta);
-
             MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
             entityBuilder.setMode(HttpMultipartMode.RFC6532)
                     .addBinaryBody("file", fileInputStream, fileContentType, fileName)
                     .addTextBody("meta", meta, APPLICATION_JSON);
-
             request.setEntity(entityBuilder.build());
             request.addHeader(ACCEPT, APPLICATION_JSON.toString());
-
             return request;
         }
     }

src/main/java/com/wechat/pay/contrib/apache/httpclient/WechatPayUploadHttpPost.java

@@ -108,4 +108,30 @@ public void uploadImageTest() throws Exception {
             }
         }
     }
+
+    @Test
+    public void uploadFileTest() throws Exception {
+        String filePath = "/your/home/test.png";
+
+        URI uri = new URI("https://api.mch.weixin.qq.com/v3/merchant/media/upload");
+
+        File file = new File(filePath);
+        try (FileInputStream fileIs = new FileInputStream(file)) {
+            String sha256 = DigestUtils.sha256Hex(fileIs);
+            String meta = String.format("{\"filename\":\"%s\",\"sha256\":\"%s\"}", file.getName(), sha256);
+            try (InputStream is = new FileInputStream(file)) {
+                WechatPayUploadHttpPost request = new WechatPayUploadHttpPost.Builder(uri)
+                        .withFile(file.getName(), meta, is)
+                        .build();
+                try (CloseableHttpResponse response = httpClient.execute(request)) {
+                    assertEquals(SC_OK, response.getStatusLine().getStatusCode());
+                    HttpEntity entity = response.getEntity();
+                    // do something useful with the response body
+                    // and ensure it is fully consumed
+                    String s = EntityUtils.toString(entity);
+                    System.out.println(s);
+                }
+            }
+        }
+    }
 }