listAllMaterialMedia(int agentid, MediaType mediaType)
@@ -458,7 +480,7 @@ public class WeixinProxy {
* 部门列表
* @see com.foxinmy.weixin4j.qy.api.MediaApi
* @see com.foxinmy.weixin4j.qy.api.BatchApi
- * @see {@link com.foxinmy.weixin4j.qy.WeixinProxy#replaceparty(String,Callback)}
+ * @see {@link #replaceparty(String,Callback)}
* @see 批量任务
* @return 上传后的mediaId
@@ -563,8 +585,8 @@ public class WeixinProxy {
* @see com.foxinmy.weixin4j.qy.model.User
* @see com.foxinmy.weixin4j.qy.api.UserApi
* @return 成员对象
- * @see {@link com.foxinmy.weixin4j.qy.WeixinProxy#getUser(String)}
- * @see {@link com.foxinmy.weixin4j.qy.WeixinProxy#getUserIdByCode(String,int)}
+ * @see {@link #getUser(String)}
+ * @see {@link #getUserIdByCode(String,int)}
* @see 企业获取code
* @see 批量任务
* @return 上传后的mediaId
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/BatchApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/BatchApi.java
index 41dd4089..32a52375 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/BatchApi.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/BatchApi.java
@@ -75,7 +75,7 @@ public class BatchApi extends QyApi {
* @param callback
* 接收任务执行结果的回调地址等信息
* @return 异步任务id，最大长度为64字符
- * @see {@link com.foxinmy.weixin4j.qy.api.MediaApi#batchUploadUsers(java.util.List)}
+ * @see {@link MediaApi#batchUploadUsers(java.util.List)}
* @see com.foxinmy.weixin4j.qy.model.Callback
* @see 批量更新成员
@@ -113,7 +113,7 @@ public class BatchApi extends QyApi {
* @param callback
* 接收任务执行结果的回调地址等信息
* @return 异步任务id，最大长度为64字符
- * @see {@link com.foxinmy.weixin4j.qy.api.MediaApi#batchUploadUsers(java.util.List)}
+ * @see {@link MediaApi#batchUploadUsers(java.util.List)}
* @see com.foxinmy.weixin4j.qy.model.Callback
* @see 批量覆盖成员
@@ -138,7 +138,7 @@ public class BatchApi extends QyApi {
* @param callback
* 接收任务执行结果的回调地址等信息
* @return 异步任务id，最大长度为64字符
- * @see {@link com.foxinmy.weixin4j.qy.api.MediaApi#batchUploadParties(java.util.List)}
+ * @see {@link MediaApi#batchUploadParties(java.util.List)}
* @see com.foxinmy.weixin4j.qy.model.Callback
* @see 批量覆盖部门
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 d846bd26..333027d4 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
@@ -3,11 +3,13 @@ package com.foxinmy.weixin4j.qy.api;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -17,15 +19,21 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.foxinmy.weixin4j.exception.WeixinException;
+import com.foxinmy.weixin4j.http.ContentType;
+import com.foxinmy.weixin4j.http.Header;
import com.foxinmy.weixin4j.http.HttpGet;
+import com.foxinmy.weixin4j.http.HttpResponse;
import com.foxinmy.weixin4j.http.apache.FormBodyPart;
+import com.foxinmy.weixin4j.http.apache.HttpHeaders;
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;
import com.foxinmy.weixin4j.model.MediaCounter;
+import com.foxinmy.weixin4j.model.MediaDownloadResult;
import com.foxinmy.weixin4j.model.MediaItem;
import com.foxinmy.weixin4j.model.MediaRecord;
+import com.foxinmy.weixin4j.model.MediaUploadResult;
import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.qy.model.Callback;
import com.foxinmy.weixin4j.qy.model.Party;
@@ -34,6 +42,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
import com.foxinmy.weixin4j.tuple.MpArticle;
import com.foxinmy.weixin4j.type.MediaType;
import com.foxinmy.weixin4j.util.ConfigUtil;
+import com.foxinmy.weixin4j.util.ErrorUtil;
import com.foxinmy.weixin4j.util.FileUtil;
import com.foxinmy.weixin4j.util.IOUtil;
import com.foxinmy.weixin4j.util.ObjectId;
@@ -60,7 +69,7 @@ public class MediaApi extends QyApi {
}
/**
- * 上传媒体文件
+ * 上传媒体文件:分别有图片（image）、语音（voice）、视频（video），普通文件(file)
*
* 正常情况下返回{"type":"TYPE","media_id":"MEDIA_ID","created_at":123456789},
* 否则抛出异常.
@@ -73,14 +82,15 @@ public class MediaApi extends QyApi {
* @param fileName
* 文件名
* @return 上传到微信服务器返回的媒体标识
+ * @see com.foxinmy.weixin4j.model.MediaUploadResult
* @see 上传临时素材文件说明
* @see 上传永久素材文件说明
* @throws WeixinException
*/
- public String uploadMedia(int agentid, InputStream is, String fileName)
- throws WeixinException {
+ public MediaUploadResult uploadMedia(int agentid, InputStream is,
+ String fileName) throws WeixinException {
byte[] content;
try {
content = IOUtil.toByteArray(is);
@@ -90,21 +100,22 @@ public class MediaApi extends QyApi {
if (StringUtil.isBlank(fileName)) {
fileName = ObjectId.get().toHexString();
}
- String suffixName = IOUtil.getExtension(fileName);
+ String suffixName = FileUtil.getFileExtension(fileName);
if (StringUtil.isBlank(suffixName)) {
suffixName = FileUtil
.getFileType(new ByteArrayInputStream(content));
fileName = String.format("%s.%s", fileName, suffixName);
}
- MediaType mediaType = null;
- if ("bmp/png/jpeg/jpg/gif".contains(suffixName)) {
+ MediaType mediaType = MediaType.file;
+ if (",bmp,png,jpeg,jpg,gif,"
+ .contains(String.format(",%s,", suffixName))) {
mediaType = MediaType.image;
- } else if ("mp3/wma/wav/amr".contains(suffixName)) {
+ } else if (",mp3,wma,wav,amr,".contains(String.format(",%s,",
+ suffixName))) {
mediaType = MediaType.voice;
- } else if ("rm/rmvb/wmv/avi/mpg/mpeg/mp4".contains(suffixName)) {
+ } else if (",rm,rmvb,wmv,avi,mpg,mpeg,mp4,".contains(String.format(
+ ",%s,", suffixName))) {
mediaType = MediaType.video;
- } else {
- mediaType = MediaType.file;
}
Token token = tokenHolder.getToken();
try {
@@ -117,6 +128,8 @@ public class MediaApi extends QyApi {
new InputStreamBody(new ByteArrayInputStream(content),
mediaType.getContentType().getMimeType(),
fileName)));
+ return new MediaUploadResult(response.getAsJson().getString(
+ "media_id"), mediaType, new Date());
} else {
String file_upload_uri = getRequestUri("file_upload_uri");
response = weixinClient.post(String.format(file_upload_uri,
@@ -125,8 +138,15 @@ public class MediaApi extends QyApi {
new ByteArrayInputStream(content), mediaType
.getContentType().getMimeType(),
fileName)));
+ JSONObject obj = response.getAsJson();
+ return new MediaUploadResult(obj.getString("media_id"),
+ obj.getObject("type", MediaType.class), new Date(
+ obj.getLong("created_at") * 1000l));
+ /*
+ * return response.getAsObject(new TypeReference()
+ * { });
+ */
}
- return response.getAsJson().getString("media_id");
} finally {
if (is != null) {
try {
@@ -148,22 +168,29 @@ public class MediaApi extends QyApi {
* @return 写入硬盘后的文件对象,存储路径见weixin4j.properties配置
* @throws WeixinException
* @see com.foxinmy.weixin4j.type.MediaType
- * @see {@link com.foxinmy.weixin4j.qy.api.MediaApi#downloadMedia(int,String)}
+ * @see {@link #downloadMedia(int,String)}
*/
public File downloadMediaFile(int agentid, String mediaId)
throws WeixinException {
String media_path = ConfigUtil.getValue("media_path",
Weixin4jConst.DEFAULT_MEDIA_PATH);
- File file = new File(media_path + File.separator + mediaId);
- if (file.exists()) {
- return file;
+ final String prefixName = String.format("%d_%s.", agentid, mediaId);
+ File[] files = new File(media_path).listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith(prefixName);
+ }
+ });
+ if (files.length > 0) {
+ return files[0];
}
- byte[] datas = downloadMedia(agentid, mediaId);
+ MediaDownloadResult result = downloadMedia(agentid, mediaId);
+ File file = new File(media_path + File.separator + result.getFileName());
OutputStream os = null;
try {
if (file.createNewFile()) {
os = new FileOutputStream(file);
- os.write(datas);
+ os.write(result.getContent());
} else {
throw new WeixinException(String.format("create file fail:%s",
file.getAbsolutePath()));
@@ -189,14 +216,15 @@ public class MediaApi extends QyApi {
* 企业应用Id(大于0时视为获取永久媒体文件)
* @param mediaId
* 媒体ID
- * @return 二进制数据包(需自行判断类型)
+ * @return 媒体下载结果
+ * @see com.foxinmy.weixin4j.model.MediaDownloadResult
* @see 获取临时媒体说明
* @see 获取永久媒体说明
* @throws WeixinException
*/
- public byte[] downloadMedia(int agentid, String mediaId)
+ public MediaDownloadResult downloadMedia(int agentid, String mediaId)
throws WeixinException {
Token token = tokenHolder.getToken();
try {
@@ -210,7 +238,34 @@ public class MediaApi extends QyApi {
method = new HttpGet(String.format(meida_download_uri,
token.getAccessToken(), mediaId));
}
- return weixinClient.execute(method).getContent();
+ HttpResponse response = weixinClient.execute(method);
+ byte[] content = response.getContent();
+ String fileName = "";
+ Header contentType = response
+ .getFirstHeader(HttpHeaders.CONTENT_TYPE);
+ Header disposition = response.getFirstHeader("Content-disposition");
+ if (contentType.getValue().contains(
+ ContentType.APPLICATION_JSON.getMimeType())
+ || (disposition != null && disposition.getValue().indexOf(
+ ".json") > 0)) {
+ JsonResult jsonResult = JSON.parseObject(content, 0,
+ content.length, Consts.UTF_8.newDecoder(),
+ JsonResult.class);
+ if (jsonResult.getCode() != 0) {
+ if (StringUtil.isBlank(jsonResult.getDesc())) {
+ jsonResult.setDesc(ErrorUtil.getText(Integer
+ .toString(jsonResult.getCode())));
+ }
+ throw new WeixinException(Integer.toString(jsonResult
+ .getCode()), jsonResult.getDesc());
+ }
+ }
+ if (StringUtil.isBlank(fileName)) {
+ fileName = String.format("%s.%s", mediaId, contentType
+ .getValue().split("/")[1]);
+ }
+ return new MediaDownloadResult(content,
+ ContentType.create(contentType.getValue()), fileName);
} catch (IOException e) {
throw new WeixinException(e);
}
@@ -271,6 +326,28 @@ public class MediaApi extends QyApi {
return response.getAsJsonResult();
}
+ /**
+ * 下载永久图文素材
+ *
+ * @param agentid
+ * 企业应用ID
+ * @param mediaId
+ * 媒体素材的media_id
+ * @return 图文列表
+ * @throws WeixinException
+ * @see {@link #downloadMedia(int, String)}
+ * @see com.foxinmy.weixin4j.tuple.MpArticle
+ */
+ public List downloadArticle(int agentid, String mediaId)
+ throws WeixinException {
+ MediaDownloadResult result = downloadMedia(agentid, mediaId);
+ byte[] content = result.getContent();
+ JSONObject obj = JSON.parseObject(content, 0, content.length,
+ Consts.UTF_8.newDecoder(), JSONObject.class);
+ return JSON.parseArray(obj.getJSONObject("mpnews")
+ .getString("articles"), MpArticle.class);
+ }
+
/**
* 修改永久图文素材
*
@@ -375,7 +452,7 @@ public class MediaApi extends QyApi {
* @param mediaType
* 媒体类型
* @return 素材列表
- * @see {@link com.foxinmy.weixin4j.qy.api.MediaApi#listMaterialMedia(int,MediaType, int, int)}
+ * @see {@link #listMaterialMedia(int,MediaType, int, int)}
* @throws WeixinException
*/
public List listAllMaterialMedia(int agentid, MediaType mediaType)
@@ -400,8 +477,8 @@ public class MediaApi extends QyApi {
*
* @param users
* 成员列表
- * @see {@link com.foxinmy.weixin4j.qy.api.BatchApi#syncuser(String,Callback)}
- * @see {@link com.foxinmy.weixin4j.qy.api.BatchApi#replaceuser(String,Callback)}
+ * @see {@link BatchApi#syncuser(String,Callback)}
+ * @see {@link BatchApi#replaceuser(String,Callback)}
* @see 批量任务
* @return 上传后的mediaId
@@ -416,7 +493,7 @@ public class MediaApi extends QyApi {
*
* @param parties
* 部门列表
- * @see {@link com.foxinmy.weixin4j.qy.api.BatchApi#replaceparty(String,Callback)}
+ * @see {@link BatchApi#replaceparty(String,Callback)}
* @see 批量任务
* @return 上传后的mediaId
@@ -454,8 +531,10 @@ public class MediaApi extends QyApi {
writer.write(StringUtil.join(column.values(), ','));
writer.write("\r\n");
}
- return uploadMedia(0, new ByteArrayInputStream(writer.getBuffer()
- .toString().getBytes(Consts.UTF_8)), batchName);
+ return uploadMedia(
+ 0,
+ new ByteArrayInputStream(writer.getBuffer().toString()
+ .getBytes(Consts.UTF_8)), batchName).getMediaId();
} finally {
try {
writer.close();
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/OauthApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/OauthApi.java
index 863e63c2..dfd5a971 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/OauthApi.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/OauthApi.java
@@ -29,7 +29,7 @@ public class OauthApi extends QyApi {
/**
* 企业号用户身份授权
*
- * @see {@link com.foxinmy.weixin4j.qy.api.OauthApi#getUserAuthorizeURL(String, String,String)}
+ * @see {@link OauthApi#getUserAuthorizeURL(String, String,String)}
*
* @return 请求授权的URL
*/
@@ -67,7 +67,7 @@ public class OauthApi extends QyApi {
/**
* 企业号第三方提供商授权
*
- * @see {@link com.foxinmy.weixin4j.qy.api.OauthApi#getThirdAuthorizeURL(String, String,String)}
+ * @see {@link #getThirdAuthorizeURL(String, String,String)}
*
* @return 请求授权的URL
*/
@@ -125,7 +125,7 @@ public class OauthApi extends QyApi {
}
/**
- * @see {@link com.foxinmy.weixin4j.qy.api.OauthApi#getSuiteAuthorizeURL(String,String, String,String)}
+ * @see {@link #getSuiteAuthorizeURL(String,String, String,String)}
* @param preAuthCode
* 预授权码
* @return
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
index 3100a924..c5700a99 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java
@@ -155,10 +155,9 @@ public class UserApi extends QyApi {
* @param code
* 通过员工授权获取到的code，每次员工授权带上的code将不一样，code只能使用一次，5分钟未被使用自动过期
* @see com.foxinmy.weixin4j.qy.model.User
- * @see com.foxinmy.weixin4j.qy.api.UserApi
* @return 成员对象
- * @see {@link com.foxinmy.weixin4j.qy.api.UserApi#getUser(String)}
- * @see {@link com.foxinmy.weixin4j.qy.api.UserApi#getUserIdByCode(String,int)}
+ * @see {@link #getUser(String)}
+ * @see {@link #getUserIdByCode(String,int)}
* @see 企业获取code
* @see