From 9b67fbb1bbab7718c1387cfaef46d45efe58d6c0 Mon Sep 17 00:00:00 2001 From: jinyu Date: Mon, 14 Dec 2015 19:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20media=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9C=A8netty=20httpclient=20=E4=B8=8B=E6=8A=A5=2041005?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foxinmy/weixin4j/mp/api/MediaApi.java | 7 +++---- .../java/com/foxinmy/weixin4j/qy/api/MediaApi.java | 12 +++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java index 029c86e4..2618637c 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java @@ -24,6 +24,7 @@ import com.foxinmy.weixin4j.http.HttpMethod; import com.foxinmy.weixin4j.http.HttpParams; import com.foxinmy.weixin4j.http.HttpRequest; import com.foxinmy.weixin4j.http.HttpResponse; +import com.foxinmy.weixin4j.http.apache.ByteArrayBody; import com.foxinmy.weixin4j.http.apache.FormBodyPart; import com.foxinmy.weixin4j.http.apache.InputStreamBody; import com.foxinmy.weixin4j.http.apache.StringBody; @@ -195,8 +196,7 @@ public class MediaApi extends MpApi { response = weixinExecutor .post(String.format(material_media_upload_uri, token.getAccessToken()), new FormBodyPart( - "media", new InputStreamBody( - new ByteArrayInputStream(content), + "media", new ByteArrayBody(content, mediaType.getContentType() .getMimeType(), fileName)), new FormBodyPart("type", new StringBody( @@ -207,8 +207,7 @@ public class MediaApi extends MpApi { String media_upload_uri = getRequestUri("media_upload_uri"); response = weixinExecutor.post(String.format(media_upload_uri, token.getAccessToken(), mediaType.name()), - new FormBodyPart("media", new InputStreamBody( - new ByteArrayInputStream(content), mediaType + new FormBodyPart("media", new ByteArrayBody(content, mediaType .getContentType().getMimeType(), fileName))); JSONObject obj = response.getAsJson(); diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java index 8e7cffc7..9d63efa5 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java @@ -27,8 +27,8 @@ import com.foxinmy.weixin4j.http.HttpMethod; import com.foxinmy.weixin4j.http.HttpParams; import com.foxinmy.weixin4j.http.HttpRequest; import com.foxinmy.weixin4j.http.HttpResponse; +import com.foxinmy.weixin4j.http.apache.ByteArrayBody; import com.foxinmy.weixin4j.http.apache.FormBodyPart; -import com.foxinmy.weixin4j.http.apache.InputStreamBody; import com.foxinmy.weixin4j.http.weixin.JsonResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Consts; @@ -130,18 +130,16 @@ public class MediaApi extends QyApi { response = weixinExecutor.post(String.format( material_media_upload_uri, token.getAccessToken(), mediaType.name(), agentid), new FormBodyPart("media", - new InputStreamBody(new ByteArrayInputStream(content), - mediaType.getContentType().getMimeType(), - fileName))); + new ByteArrayBody(content, mediaType.getContentType() + .getMimeType(), fileName))); return new MediaUploadResult(response.getAsJson().getString( "media_id"), mediaType, new Date()); } else { String media_upload_uri = getRequestUri("media_upload_uri"); response = weixinExecutor.post(String.format(media_upload_uri, token.getAccessToken(), mediaType.name()), - new FormBodyPart("media", new InputStreamBody( - new ByteArrayInputStream(content), mediaType - .getContentType().getMimeType(), + new FormBodyPart("media", new ByteArrayBody(content, + mediaType.getContentType().getMimeType(), fileName))); JSONObject obj = response.getAsJson(); return new MediaUploadResult(obj.getString("media_id"),