From 5ac4e00133de005724c326e0a4f053a18bb3b85d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 29 Nov 2021 22:43:22 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open/executor/GenericUploadRequestExecutor.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
index 3ef3fd2e1..e2d43a96a 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.open.executor;
 
+import com.google.common.io.Files;
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
@@ -125,7 +126,8 @@ public class GenericUploadRequestExecutor implements RequestExecutor<String, Inp
 
       HttpEntity entity = MultipartEntityBuilder
         .create()
-        .addBinaryBody(getParamName(), data, ContentType.create("multipart/form-data", StandardCharsets.UTF_8), getFileName())
+        .addBinaryBody(getParamName(), data, ContentType.create("multipart/form-data", StandardCharsets.UTF_8),
+          getFileName())
         .setMode(HttpMultipartMode.RFC6532)
         .build();
       bodyRequest.setEntity(entity);
@@ -147,8 +149,7 @@ public class GenericUploadRequestExecutor implements RequestExecutor<String, Inp
     @Override
     public String execute(String uri, InputStream data, WxType wxType) throws WxErrorException, IOException {
       OkHttpClient client = getRequestHttp().getRequestHttpClient();
-
-      byte[] bytes = data instanceof ByteArrayInputStream ? ((ByteArrayInputStream) data).readAllBytes() : IOUtils.toByteArray(data);
+      byte[] bytes = IOUtils.toByteArray(data);
       RequestBody body = new MultipartBody.Builder()
         .setType(Objects.requireNonNull(MediaType.parse("multipart/form-data")))
         .addFormDataPart("media", getFileName(), RequestBody.create(bytes, MediaType.parse("application/octet-stream")))
@@ -173,7 +174,6 @@ public class GenericUploadRequestExecutor implements RequestExecutor<String, Inp
       }
       request.withConnectionProvider(getRequestHttp().getRequestHttpClient());
 
-      byte[] bytes = data instanceof ByteArrayInputStream ? ((ByteArrayInputStream) data).readAllBytes() : IOUtils.toByteArray(data);
       request.form(getParamName(), data);
 
       HttpResponse response = request.send();