This commit is contained in:
jinyu 2015-12-29 18:43:04 +08:00
parent bd745299e0
commit df9ccb0999
2 changed files with 8 additions and 8 deletions

View File

@ -196,18 +196,18 @@ public class MediaApi extends MpApi {
response = weixinExecutor response = weixinExecutor
.post(String.format(material_media_upload_uri, .post(String.format(material_media_upload_uri,
token.getAccessToken()), new FormBodyPart( token.getAccessToken()), new FormBodyPart(
"media", new ByteArrayBody(content, "media", new ByteArrayBody(content, mediaType
mediaType.getContentType() .getContentType().getMimeType(),
.getMimeType(), fileName)), fileName)), new FormBodyPart("type",
new FormBodyPart("type", new StringBody( new StringBody(mediaType.name(), Consts.UTF_8)));
mediaType.name(), Consts.UTF_8)));
return new MediaUploadResult(response.getAsJson().getString( return new MediaUploadResult(response.getAsJson().getString(
"media_id"), mediaType, new Date()); "media_id"), mediaType, new Date());
} else { } else {
String media_upload_uri = getRequestUri("media_upload_uri"); String media_upload_uri = getRequestUri("media_upload_uri");
response = weixinExecutor.post(String.format(media_upload_uri, response = weixinExecutor.post(String.format(media_upload_uri,
token.getAccessToken(), mediaType.name()), token.getAccessToken(), mediaType.name()),
new FormBodyPart("media", new InputStreamBody(new ByteArrayInputStream(content), mediaType new FormBodyPart("media", new InputStreamBody(
new ByteArrayInputStream(content), mediaType
.getContentType().getMimeType(), .getContentType().getMimeType(),
fileName))); fileName)));
JSONObject obj = response.getAsJson(); JSONObject obj = response.getAsJson();
@ -591,7 +591,7 @@ public class MediaApi extends MpApi {
for (;;) { for (;;) {
mediaRecord = listMaterialMedia(mediaType, pageable); mediaRecord = listMaterialMedia(mediaType, pageable);
if (mediaRecord.getItems() == null if (mediaRecord.getItems() == null
|| !mediaRecord.getItems().isEmpty()) { || mediaRecord.getItems().isEmpty()) {
break; break;
} }
mediaList.addAll(mediaRecord.getItems()); mediaList.addAll(mediaRecord.getItems());

View File

@ -475,7 +475,7 @@ public class MediaApi extends QyApi {
for (;;) { for (;;) {
mediaRecord = listMaterialMedia(agentid, mediaType, pageable); mediaRecord = listMaterialMedia(agentid, mediaType, pageable);
if (mediaRecord.getItems() == null if (mediaRecord.getItems() == null
|| !mediaRecord.getItems().isEmpty()) { || mediaRecord.getItems().isEmpty()) {
break; break;
} }
mediaList.addAll(mediaRecord.getItems()); mediaList.addAll(mediaRecord.getItems());