From 88322c443b5ea72db66141bff1c11151241ef3d5 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Mon, 21 Mar 2016 17:16:09 +0800
Subject: [PATCH] fixed #39

---
 .../com/foxinmy/weixin4j/model/MediaItem.java |  1 +
 .../foxinmy/weixin4j/model/MediaRecord.java   |  3 +-
 .../weixin4j/payment/WeixinPayProxy.java      |  9 +++++
 .../com/foxinmy/weixin4j/mp/WeixinProxy.java  | 33 +++++++++++++++++++
 .../com/foxinmy/weixin4j/qy/WeixinProxy.java  | 30 +++++++++++++++++
 .../foxinmy/weixin4j/qy/WeixinSuiteProxy.java |  6 ++++
 .../com/foxinmy/weixin4j/qy/api/MediaApi.java |  4 ---
 7 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaItem.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaItem.java
index b6f0f296..a64ecc69 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaItem.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaItem.java
@@ -29,6 +29,7 @@ public class MediaItem implements Serializable {
 	/**
 	 * 媒体素材名称
 	 */
+	@JSONField(name = "filename")
 	private String name;
 	/**
 	 * 媒体素材最后更新时间
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaRecord.java
index dfa51c57..e3a79370 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaRecord.java
@@ -37,9 +37,8 @@ public class MediaRecord implements Serializable {
 	/**
 	 * 媒体信息
 	 */
-	@JSONField(name = "item")
+	@JSONField(name = "itemlist")
 	private List<MediaItem> items;
-
 	/**
 	 * 分页信息
 	 */
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
index d2573801..d406d428 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
@@ -47,8 +47,17 @@ import com.foxinmy.weixin4j.util.Weixin4jSettings;
  */
 public class WeixinPayProxy {
 
+	/**
+	 * 微信支付API:js支付、扫码支付等接口
+	 */
 	private final Pay3Api pay3Api;
+	/**
+	 * 代金券API
+	 */
 	private final CouponApi couponApi;
+	/**
+	 * 现金API
+	 */
 	private final CashApi cashApi;
 
 	private final Weixin4jSettings settings;
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
index e2dd51a0..1ba7d53f 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
@@ -67,16 +67,49 @@ import com.foxinmy.weixin4j.util.Weixin4jSettings;
  */
 public class WeixinProxy {
 
+	/**
+	 * 媒体素材API
+	 */
 	private final MediaApi mediaApi;
+	/**
+	 * 客服消息API
+	 */
 	private final NotifyApi notifyApi;
+	/**
+	 * 多客服API
+	 */
 	private final CustomApi customApi;
+	/**
+	 * 群发消息API
+	 */
 	private final MassApi massApi;
+	/**
+	 * 用户API
+	 */
 	private final UserApi userApi;
+	/**
+	 * 分组API
+	 */
 	private final GroupApi groupApi;
+	/**
+	 * 底部菜单API
+	 */
 	private final MenuApi menuApi;
+	/**
+	 * 二维码API
+	 */
 	private final QrApi qrApi;
+	/**
+	 * 模板消息API
+	 */
 	private final TmplApi tmplApi;
+	/**
+	 * 辅助API
+	 */
 	private final HelperApi helperApi;
+	/**
+	 * 数据统计API
+	 */
 	private final DataApi dataApi;
 
 	private final TokenHolder tokenHolder;
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
index 868eeea1..2a40bd5c 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
@@ -63,15 +63,45 @@ import com.foxinmy.weixin4j.util.Weixin4jSettings;
  */
 public class WeixinProxy {
 
+	/**
+	 * 媒体素材API
+	 */
 	private final MediaApi mediaApi;
+	/**
+	 * 底部菜单API
+	 */
 	private final MenuApi menuApi;
+	/**
+	 * 消息服务API
+	 */
 	private final NotifyApi notifyApi;
+	/**
+	 * 部门API
+	 */
 	private final PartyApi partyApi;
+	/**
+	 * 成员API
+	 */
 	private final UserApi userApi;
+	/**
+	 * 标签API
+	 */
 	private final TagApi tagApi;
+	/**
+	 * 辅助API
+	 */
 	private final HelperApi helperApi;
+	/**
+	 * 应用API
+	 */
 	private final AgentApi agentApi;
+	/**
+	 * 批量操作API
+	 */
 	private final BatchApi batchApi;
+	/**
+	 * 聊天服务API
+	 */
 	private final ChatApi chatApi;
 
 	private final TokenHolder tokenHolder;
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
index 37746212..f171522b 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
@@ -29,7 +29,13 @@ import com.foxinmy.weixin4j.util.StringUtil;
  */
 public class WeixinSuiteProxy {
 
+	/**
+	 * 每个套件授权不一样 suiteId - suiteApi
+	 */
 	private Map<String, SuiteApi> suiteMap;
+	/**
+	 * 供应商API:如登陆URL
+	 */
 	private ProviderApi providerApi;
 
 	private final Weixin4jSuiteSettings suiteSettings;
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 e935580d..b11a367e 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
@@ -419,10 +419,6 @@ public class MediaApi extends QyApi {
 		obj = response.getAsJson();
 
 		MediaRecord mediaRecord = JSON.toJavaObject(obj, MediaRecord.class);
-		if (mediaType == MediaType.news) {
-			mediaRecord.setItems(JSON.parseArray(obj.getString("itemlist"),
-					MediaItem.class));
-		}
 		mediaRecord.setMediaType(mediaType);
 		mediaRecord.setPageable(pageable);
 		return mediaRecord;