From aa8e1c759d6b733a0f9e9943b31c6468dcae4685 Mon Sep 17 00:00:00 2001
From: jinyu <hujinyu@91160.com>
Date: Wed, 30 Mar 2016 12:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84link?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foxinmy/weixin4j/mp/WeixinProxy.java  | 255 +++++++----------
 .../foxinmy/weixin4j/mp/api/CustomApi.java    |  34 +--
 .../com/foxinmy/weixin4j/mp/api/DataApi.java  | 266 +++++++++---------
 .../com/foxinmy/weixin4j/mp/api/GroupApi.java |  16 +-
 .../foxinmy/weixin4j/mp/api/HelperApi.java    |  10 +-
 .../com/foxinmy/weixin4j/mp/api/MassApi.java  |  16 +-
 .../foxinmy/weixin4j/mp/test/CustomTest.java  |   2 +-
 7 files changed, 270 insertions(+), 329 deletions(-)

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 24bbac24..4866b112 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
@@ -1,6 +1,5 @@
 package com.foxinmy.weixin4j.mp;
 
-import java.io.File;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
@@ -135,8 +134,8 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.util.Weixin4jSettings
 	 */
 	public WeixinProxy(Weixin4jSettings settings) {
-		this(new TokenHolder(new WeixinTokenCreator(settings.getWeixinAccount()
-				.getId(), settings.getWeixinAccount().getSecret()),
+		this(new TokenHolder(
+				new WeixinTokenCreator(settings.getWeixinAccount().getId(), settings.getWeixinAccount().getSecret()),
 				settings.getTokenStorager0()));
 		this.settings = settings;
 	}
@@ -188,8 +187,7 @@ public class WeixinProxy {
 	 * @return
 	 */
 	public TokenHolder getTicketHolder(TicketType ticketType) {
-		return new TokenHolder(new WeixinTicketCreator(getWeixinAccount()
-				.getId(), ticketType, this.tokenHolder),
+		return new TokenHolder(new WeixinTicketCreator(getWeixinAccount().getId(), ticketType, this.tokenHolder),
 				this.settings.getTokenStorager0());
 	}
 
@@ -205,8 +203,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MediaApi
 	 * @throws WeixinException
 	 */
-	public String uploadImage(InputStream is, String fileName)
-			throws WeixinException {
+	public String uploadImage(InputStream is, String fileName) throws WeixinException {
 		return mediaApi.uploadImage(is, fileName);
 	}
 
@@ -229,13 +226,14 @@ public class WeixinProxy {
 	 *      高级群发</a>
 	 * @see com.foxinmy.weixin4j.tuple.MpVideo
 	 */
-	public MpVideo uploadVideo(InputStream is, String fileName, String title,
-			String description) throws WeixinException {
+	public MpVideo uploadVideo(InputStream is, String fileName, String title, String description)
+			throws WeixinException {
 		return mediaApi.uploadVideo(is, fileName, title, description);
 	}
 
 	/**
-	 * 上传媒体文件 </br> <font color="red">此接口只包含图片、语音、缩略图、视频(临时)四种媒体类型的上传</font>
+	 * 上传媒体文件 </br>
+	 * <font color="red">此接口只包含图片、语音、缩略图、视频(临时)四种媒体类型的上传</font>
 	 * <p>
 	 * 正常情况下返回{"type":"TYPE","media_id":"MEDIA_ID","created_at":123456789},
 	 * 否则抛出异常.
@@ -259,8 +257,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MediaApi
 	 * @throws WeixinException
 	 */
-	public MediaUploadResult uploadMedia(boolean isMaterial, InputStream is,
-			String fileName) throws WeixinException {
+	public MediaUploadResult uploadMedia(boolean isMaterial, InputStream is, String fileName) throws WeixinException {
 		return mediaApi.uploadMedia(isMaterial, is, fileName);
 	}
 
@@ -275,13 +272,14 @@ public class WeixinProxy {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.MediaApi
 	 * @see com.foxinmy.weixin4j.model.MediaDownloadResult
-	 * @see <a
-	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738727&token=&lang=zh_CN">下载临时媒体素材</a>
-	 * @see <a
-	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738730&token=&lang=zh_CN">下载永久媒体素材</a>
+	 * @see <a href=
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738727&token=&lang=zh_CN">
+	 *      下载临时媒体素材</a>
+	 * @see <a href=
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738730&token=&lang=zh_CN">
+	 *      下载永久媒体素材</a>
 	 */
-	public MediaDownloadResult downloadMedia(String mediaId, boolean isMaterial)
-			throws WeixinException {
+	public MediaDownloadResult downloadMedia(String mediaId, boolean isMaterial) throws WeixinException {
 		return mediaApi.downloadMedia(mediaId, isMaterial);
 	}
 
@@ -302,8 +300,7 @@ public class WeixinProxy {
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738729&token=&lang=zh_CN">
 	 *      上传永久媒体素材</a>
 	 */
-	public String uploadMaterialArticle(List<MpArticle> articles)
-			throws WeixinException {
+	public String uploadMaterialArticle(List<MpArticle> articles) throws WeixinException {
 		return mediaApi.uploadMaterialArticle(articles);
 	}
 
@@ -318,8 +315,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @see com.foxinmy.weixin4j.mp.api.MediaApi
 	 */
-	public List<MpArticle> downloadArticle(String mediaId)
-			throws WeixinException {
+	public List<MpArticle> downloadArticle(String mediaId) throws WeixinException {
 		return mediaApi.downloadArticle(mediaId);
 	}
 
@@ -340,8 +336,8 @@ public class WeixinProxy {
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738732&token=&lang=zh_CN">
 	 *      更新永久图文素材</a>
 	 */
-	public JsonResult updateMaterialArticle(String mediaId, int index,
-			List<MpArticle> articles) throws WeixinException {
+	public JsonResult updateMaterialArticle(String mediaId, int index, List<MpArticle> articles)
+			throws WeixinException {
 		return mediaApi.updateMaterialArticle(mediaId, index, articles);
 	}
 
@@ -357,8 +353,7 @@ public class WeixinProxy {
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738731&token=&lang=zh_CN">
 	 *      删除永久媒体素材</a>
 	 */
-	public JsonResult deleteMaterialMedia(String mediaId)
-			throws WeixinException {
+	public JsonResult deleteMaterialMedia(String mediaId) throws WeixinException {
 		return mediaApi.deleteMaterialMedia(mediaId);
 	}
 
@@ -380,13 +375,14 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MediaApi
 	 * @throws WeixinException
 	 */
-	public String uploadMaterialVideo(InputStream is, String fileName,
-			String title, String introduction) throws WeixinException {
+	public String uploadMaterialVideo(InputStream is, String fileName, String title, String introduction)
+			throws WeixinException {
 		return mediaApi.uploadMaterialVideo(is, fileName, title, introduction);
 	}
 
 	/**
-	 * 获取永久媒体素材的总数</br> .图片和图文消息素材（包括单图文和多图文）的总数上限为5000，其他素材的总数上限为1000
+	 * 获取永久媒体素材的总数</br>
+	 * .图片和图文消息素材（包括单图文和多图文）的总数上限为5000，其他素材的总数上限为1000
 	 * 
 	 * @return 总数对象
 	 * @throws WeixinException
@@ -419,8 +415,7 @@ public class WeixinProxy {
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738734&token=&lang=zh_CN">
 	 *      获取素材列表</a>
 	 */
-	public MediaRecord listMaterialMedia(MediaType mediaType, Pageable pageable)
-			throws WeixinException {
+	public MediaRecord listMaterialMedia(MediaType mediaType, Pageable pageable) throws WeixinException {
 		return mediaApi.listMaterialMedia(mediaType, pageable);
 	}
 
@@ -434,8 +429,7 @@ public class WeixinProxy {
 	 * @see {@link #listMaterialMedia(MediaType, Pageable)}
 	 * @throws WeixinException
 	 */
-	public List<MediaItem> listAllMaterialMedia(MediaType mediaType)
-			throws WeixinException {
+	public List<MediaItem> listAllMaterialMedia(MediaType mediaType) throws WeixinException {
 		return mediaApi.listAllMaterialMedia(mediaType);
 	}
 
@@ -472,8 +466,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.tuple.News
 	 * @see com.foxinmy.weixin4j.mp.api.NotifyApi
 	 */
-	public JsonResult sendNotify(NotifyMessage notify, String kfAccount)
-			throws WeixinException {
+	public JsonResult sendNotify(NotifyMessage notify, String kfAccount) throws WeixinException {
 		return notifyApi.sendNotify(notify, kfAccount);
 	}
 
@@ -490,12 +483,11 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see <a href="http://dkf.qq.com/document-1_1.html">查询客服聊天记录</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/19/7c129ec71ddfa60923ea9334557e8b23.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044854&token=&lang=zh_CN">
 	 *      查询客服聊天记录</a>
 	 * @throws WeixinException
 	 */
-	public List<KfChatRecord> getCustomRecord(Date startTime, Date endTime,
-			Pageable pageable) throws WeixinException {
+	public List<KfChatRecord> getKfChatRecord(Date startTime, Date endTime, Pageable pageable) throws WeixinException {
 		return customApi.getKfChatRecord(startTime, endTime, pageable);
 	}
 
@@ -510,16 +502,13 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see <a href="http://dkf.qq.com/document-3_1.html">获取客服基本信息</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.9C.8D.E5.9F.BA.E6.9C.AC.E4.BF.A1.E6.81.AF">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
 	 *      获取客服基本信息</a>
 	 * @see <a href="http://dkf.qq.com/document-3_2.html">获取在线客服接待信息</a>
-	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.8E.B7.E5.8F.96.E5.9C.A8.E7.BA.BF.E5.AE.A2.E6.9C.8D.E6.8E.A5.E5.BE.85.E4.BF.A1.E6.81.AF">
 	 *      获取在线客服接待信息</a>
 	 * @throws WeixinException
 	 */
-	public List<KfAccount> listKfAccount(boolean isOnline)
-			throws WeixinException {
+	public List<KfAccount> listKfAccount(boolean isOnline) throws WeixinException {
 		return customApi.listKfAccount(isOnline);
 	}
 
@@ -536,15 +525,12 @@ public class WeixinProxy {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
-	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">
 	 *      客服管理接口返回码</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E6.B7.BB.E5.8A.A0.E5.AE.A2.E6.9C.8D.E8.B4.A6.E5.8F.B7">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
 	 *      新增客服账号</a>
 	 */
-	public JsonResult createKfAccount(String id, String name, String pwd)
-			throws WeixinException {
+	public JsonResult createKfAccount(String id, String name, String pwd) throws WeixinException {
 		return customApi.createKfAccount(id, name, pwd);
 	}
 
@@ -562,14 +548,10 @@ public class WeixinProxy {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">
-	 *      客服管理接口返回码</a>
-	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.AE.BE.E7.BD.AE.E5.AE.A2.E6.9C.8D.E4.BF.A1.E6.81.AF">
-	 *      新增客服账号</a>
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
+	 *      更新客服账号</a>
 	 */
-	public JsonResult updateKfAccount(String id, String name, String pwd)
-			throws WeixinException {
+	public JsonResult updateKfAccount(String id, String name, String pwd) throws WeixinException {
 		return customApi.updateKfAccount(id, name, pwd);
 	}
 
@@ -589,8 +571,7 @@ public class WeixinProxy {
 	 *      >邀请绑定客服帐号<a/>
 	 * @throws WeixinException
 	 */
-	public JsonResult inviteKfAccount(String kfAccount, String inviteAccount)
-			throws WeixinException {
+	public JsonResult inviteKfAccount(String kfAccount, String inviteAccount) throws WeixinException {
 		return customApi.inviteKfAccount(kfAccount, inviteAccount);
 	}
 
@@ -607,14 +588,10 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">
-	 *      客服管理接口返回码</a>
-	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E4.B8.8A.E4.BC.A0.E5.AE.A2.E6.9C.8D.E5.A4.B4.E5.83.8F">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
 	 *      上传客服头像</a>
 	 */
-	public JsonResult uploadKfAvatar(String accountId, InputStream is,
-			String fileName) throws WeixinException {
+	public JsonResult uploadKfAvatar(String accountId, InputStream is, String fileName) throws WeixinException {
 		return customApi.uploadKfAvatar(accountId, is, fileName);
 	}
 
@@ -627,10 +604,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">
-	 *      客服管理接口返回码</a>
-	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.88.A0.E9.99.A4.E5.AE.A2.E6.9C.8D.E8.B4.A6.E5.8F.B7">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
 	 *      删除客服账号</a>
 	 */
 	public JsonResult deleteKfAccount(String id) throws WeixinException {
@@ -654,11 +628,10 @@ public class WeixinProxy {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E5.88.9B.E5.BB.BA.E4.BC.9A.E8.AF.9D">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">
 	 *      创建会话</a>
 	 */
-	public JsonResult createKfSession(String userOpenId, String kfAccount,
-			String text) throws WeixinException {
+	public JsonResult createKfSession(String userOpenId, String kfAccount, String text) throws WeixinException {
 		return customApi.createKfSession(userOpenId, kfAccount, text);
 	}
 
@@ -675,11 +648,10 @@ public class WeixinProxy {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E5.85.B3.E9.97.AD.E4.BC.9A.E8.AF.9D">
-	 *      创建会话</a>
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">
+	 *      关闭会话</a>
 	 */
-	public JsonResult closeKfSession(String userOpenId, String kfAccount,
-			String text) throws WeixinException {
+	public JsonResult closeKfSession(String userOpenId, String kfAccount, String text) throws WeixinException {
 		return customApi.closeKfSession(userOpenId, kfAccount, text);
 	}
 
@@ -693,7 +665,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.88.B7.E7.9A.84.E4.BC.9A.E8.AF.9D.E7.8A.B6.E6.80.81">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">
 	 *      获取会话状态</a>
 	 */
 	public KfSession getKfSession(String userOpenId) throws WeixinException {
@@ -710,28 +682,27 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.9C.8D.E7.9A.84.E4.BC.9A.E8.AF.9D.E5.88.97.E8.A1.A8">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">
 	 *      获取客服的会话列表</a>
 	 */
-	public List<KfSession> listKfSession(String kfAccount)
-			throws WeixinException {
+	public List<KfSession> listKfSession(String kfAccount) throws WeixinException {
 		return customApi.listKfSession(kfAccount);
 	}
 
 	/**
-	 * 获取未接入会话列表:获取当前正在等待队列中的会话列表，此接口最多返回最早进入队列的100个未接入会话。</br> <font
-	 * color="red">缺陷：没有count字段</font>
+	 * 获取未接入会话列表:获取当前正在等待队列中的会话列表，此接口最多返回最早进入队列的100个未接入会话。</br>
+	 * <font color="red">缺陷：没有count字段</font>
 	 * 
 	 * @return 会话列表
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.CustomApi
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E6.9C.AA.E6.8E.A5.E5.85.A5.E4.BC.9A.E8.AF.9D.E5.88.97.E8.A1.A8">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">
 	 *      获取客服的会话列表</a>
 	 */
-	public List<KfSession> listKfSessionWait() throws WeixinException {
-		return customApi.listKfSessionWait();
+	public List<KfSession> listKfWaitSession() throws WeixinException {
+		return customApi.listKfWaitSession();
 	}
 
 	/**
@@ -742,13 +713,12 @@ public class WeixinProxy {
 	 * @return 媒体ID
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E4.B8.8A.E4.BC.A0.E5.9B.BE.E6.96.87.E6.B6.88.E6.81.AF.E7.B4.A0.E6.9D.90.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      上传图文素材</a>
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 */
-	public String uploadMassArticle(List<MpArticle> articles)
-			throws WeixinException {
+	public String uploadMassArticle(List<MpArticle> articles) throws WeixinException {
 		return massApi.uploadArticle(articles);
 	}
 
@@ -776,13 +746,12 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.tuple.MpNews
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
-	 * @see {@link com.foxinmy.weixin4j.mp.api.GroupApi#getGroups()}
+	 * @see {@link #getGroups()}
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AE.E5.88.86.E7.BB.84.E8.BF.9B.E8.A1.8C.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      根据分组群发</a>
 	 */
-	public String[] massByGroupId(MassTuple tuple, boolean isToAll, int groupId)
-			throws WeixinException {
+	public String[] massByGroupId(MassTuple tuple, boolean isToAll, int groupId) throws WeixinException {
 		return massApi.massByGroupId(tuple, isToAll, groupId);
 	}
 
@@ -796,13 +765,12 @@ public class WeixinProxy {
 	 * @return 第一个元素为消息发送任务的ID,第二个元素为消息的数据ID，该字段只有在群发图文消息时，才会出现,可以用于在图文分析数据接口中
 	 * @see {@link #massByGroupId(Tuple,int)}
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AE.E5.88.86.E7.BB.84.E8.BF.9B.E8.A1.8C.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      根据分组群发</a>
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @throws WeixinException
 	 */
-	public String[] massArticleByGroupId(List<MpArticle> articles, int groupId)
-			throws WeixinException {
+	public String[] massArticleByGroupId(List<MpArticle> articles, int groupId) throws WeixinException {
 		return massApi.massArticleByGroupId(articles, groupId);
 	}
 
@@ -829,13 +797,11 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AEOpenID.E5.88.97.E8.A1.A8.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8D.E5.8F.AF.E7.94.A8.EF.BC.8C.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      根据openid群发</a>
-	 * @see {@link com.foxinmy.weixin4j.mp.api.MediaApi#uploadMedia(File)}
-	 * @see {@link com.foxinmy.weixin4j.mp.api.UserApi#getUser(String)}
+	 * @see {@link #getUser(String)}
 	 */
-	public String[] massByOpenIds(MassTuple tuple, String... openIds)
-			throws WeixinException {
+	public String[] massByOpenIds(MassTuple tuple, String... openIds) throws WeixinException {
 		return massApi.massByOpenIds(tuple, openIds);
 	}
 
@@ -848,14 +814,13 @@ public class WeixinProxy {
 	 *            openId列表
 	 * @return 第一个元素为消息发送任务的ID,第二个元素为消息的数据ID，该字段只有在群发图文消息时，才会出现,可以用于在图文分析数据接口中
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AEOpenID.E5.88.97.E8.A1.A8.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8D.E5.8F.AF.E7.94.A8.EF.BC.8C.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      根据openid群发</a>
 	 * @see {@link #massByOpenIds(Tuple,String...)}
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @throws WeixinException
 	 */
-	public String[] massArticleByOpenIds(List<MpArticle> articles,
-			String... openIds) throws WeixinException {
+	public String[] massArticleByOpenIds(List<MpArticle> articles, String... openIds) throws WeixinException {
 		return massApi.massArticleByOpenIds(articles, openIds);
 	}
 
@@ -869,7 +834,7 @@ public class WeixinProxy {
 	 *            发送出去的消息ID
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E5.88.A0.E9.99.A4.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      删除群发</a>
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 * @see {@link #massByGroupId(Tuple, int)}
@@ -881,7 +846,8 @@ public class WeixinProxy {
 	}
 
 	/**
-	 * 预览群发消息</br> 开发者可通过该接口发送消息给指定用户，在手机端查看消息的样式和排版
+	 * 预览群发消息</br>
+	 * 开发者可通过该接口发送消息给指定用户，在手机端查看消息的样式和排版
 	 * 
 	 * @param toUser
 	 *            接收用户的openID
@@ -894,11 +860,10 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E9.A2.84.E8.A7.88.E6.8E.A5.E5.8F.A3.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      预览群发消息</a>
 	 */
-	public JsonResult previewMassNews(String toUser, String toWxName,
-			MassTuple tuple) throws WeixinException {
+	public JsonResult previewMassNews(String toUser, String toWxName, MassTuple tuple) throws WeixinException {
 		return massApi.previewMassNews(toUser, toWxName, tuple);
 	}
 
@@ -911,7 +876,7 @@ public class WeixinProxy {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.api.MassApi
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.9F.A5.E8.AF.A2.E7.BE.A4.E5.8F.91.E6.B6.88.E6.81.AF.E5.8F.91.E9.80.81.E7.8A.B6.E6.80.81.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">
 	 *      查询群发状态</a>
 	 */
 	public String getMassNewStatus(String msgId) throws WeixinException {
@@ -994,8 +959,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.UserApi
 	 * @throws WeixinException
 	 */
-	public List<User> getUsers(Lang lang, String... openIds)
-			throws WeixinException {
+	public List<User> getUsers(Lang lang, String... openIds) throws WeixinException {
 		return userApi.getUsers(lang, openIds);
 	}
 
@@ -1033,8 +997,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.UserApi
 	 * @see com.foxinmy.weixin4j.mp.model.Following
 	 */
-	public Following getFollowingOpenIds(String nextOpenId)
-			throws WeixinException {
+	public Following getFollowingOpenIds(String nextOpenId) throws WeixinException {
 		return userApi.getFollowingOpenIds(nextOpenId);
 	}
 
@@ -1094,8 +1057,7 @@ public class WeixinProxy {
 	 *      设置用户备注名</a>
 	 * @see com.foxinmy.weixin4j.mp.api.UserApi
 	 */
-	public JsonResult remarkUserName(String openId, String remark)
-			throws WeixinException {
+	public JsonResult remarkUserName(String openId, String remark) throws WeixinException {
 		return userApi.remarkUserName(openId, remark);
 	}
 
@@ -1107,7 +1069,7 @@ public class WeixinProxy {
 	 * @return group对象
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E5.88.9B.E5.BB.BA.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      创建分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.model.Group#toCreateJson()
@@ -1123,7 +1085,7 @@ public class WeixinProxy {
 	 * @return 组集合
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E6.9F.A5.E8.AF.A2.E6.89.80.E6.9C.89.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      查询所有分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
@@ -1140,7 +1102,7 @@ public class WeixinProxy {
 	 * @return 组ID
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E6.9F.A5.E8.AF.A2.E7.94.A8.E6.88.B7.E6.89.80.E5.9C.A8.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      查询用户所在分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
@@ -1158,13 +1120,12 @@ public class WeixinProxy {
 	 *            组名称
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E4.BF.AE.E6.94.B9.E5.88.86.E7.BB.84.E5.90.8D">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      修改分组名</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
 	 */
-	public JsonResult modifyGroup(int groupId, String name)
-			throws WeixinException {
+	public JsonResult modifyGroup(int groupId, String name) throws WeixinException {
 		return groupApi.modifyGroup(groupId, name);
 	}
 
@@ -1177,13 +1138,12 @@ public class WeixinProxy {
 	 *            用户对应的ID
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E7.A7.BB.E5.8A.A8.E7.94.A8.E6.88.B7.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN4">
 	 *      移动分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
 	 */
-	public JsonResult moveGroup(int groupId, String openId)
-			throws WeixinException {
+	public JsonResult moveGroup(int groupId, String openId) throws WeixinException {
 		return groupApi.moveGroup(groupId, openId);
 	}
 
@@ -1196,13 +1156,12 @@ public class WeixinProxy {
 	 *            用户ID列表(不能超过50个)
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/0/56d992c605a97245eb7e617854b169fc.html#.E6.89.B9.E9.87.8F.E7.A7.BB.E5.8A.A8.E7.94.A8.E6.88.B7.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      批量移动分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
 	 */
-	public JsonResult moveGroup(int groupId, String... openIds)
-			throws WeixinException {
+	public JsonResult moveGroup(int groupId, String... openIds) throws WeixinException {
 		return groupApi.moveGroup(groupId, openIds);
 	}
 
@@ -1213,7 +1172,7 @@ public class WeixinProxy {
 	 *            组ID
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/0/56d992c605a97245eb7e617854b169fc.html#.E5.88.A0.E9.99.A4.E5.88.86.E7.BB.84">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">
 	 *      删除用户分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.api.GroupApi
@@ -1302,8 +1261,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.MenuApi
 	 * @see com.foxinmy.weixin4j.model.Button
 	 */
-	public String createCustomMenu(List<Button> buttons, MenuMatchRule matchRule)
-			throws WeixinException {
+	public String createCustomMenu(List<Button> buttons, MenuMatchRule matchRule) throws WeixinException {
 		return menuApi.createCustomMenu(buttons, matchRule);
 	}
 
@@ -1369,8 +1327,7 @@ public class WeixinProxy {
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN">
 	 *      设置所处行业</a>
 	 */
-	public JsonResult setTmplIndustry(IndustryType... industryTypes)
-			throws WeixinException {
+	public JsonResult setTmplIndustry(IndustryType... industryTypes) throws WeixinException {
 		return tmplApi.setTmplIndustry(industryTypes);
 	}
 
@@ -1428,8 +1385,9 @@ public class WeixinProxy {
 	 *            模板消息主体
 	 * @return 发送结果
 	 * @throws WeixinException
-	 * @see <a
-	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN">模板消息</a>
+	 * @see <a href=
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN">
+	 *      模板消息</a>
 	 * @see <a href=
 	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751288&token=&lang=zh_CN"
 	 *      >运营规范</a>
@@ -1437,8 +1395,7 @@ public class WeixinProxy {
 	 * @seee com.foxinmy.weixin4j.msg.event.TemplatesendjobfinishMessage
 	 * @see com.foxinmy.weixin4j.mp.api.TmplApi
 	 */
-	public JsonResult sendTmplMessage(TemplateMessage tplMessage)
-			throws WeixinException {
+	public JsonResult sendTmplMessage(TemplateMessage tplMessage) throws WeixinException {
 		return tmplApi.sendTmplMessage(tplMessage);
 	}
 
@@ -1450,7 +1407,7 @@ public class WeixinProxy {
 	 * @return 短链接
 	 * @throws WeixinException
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/10/165c9b15eddcfbd8699ac12b0bd89ae6.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1443433600&token=&lang=zh_CN">
 	 *      长链接转短链接</a>
 	 * @see com.foxinmy.weixin4j.mp.api.HelperApi
 	 */
@@ -1467,7 +1424,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.model.SemQuery
 	 * @see com.foxinmy.weixin4j.mp.model.SemResult
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/0/0ce78b3c9524811fee34aba3e33f3448.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141241&token=&lang=zh_CN">
 	 *      语义理解</a>
 	 * @see com.foxinmy.weixin4j.mp.api.HelperApi
 	 * @throws WeixinException
@@ -1481,7 +1438,7 @@ public class WeixinProxy {
 	 * 
 	 * @return IP地址
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140187&token=&lang=zh_CN">
 	 *      获取IP地址</a>
 	 * @see com.foxinmy.weixin4j.mp.api.HelperApi
 	 * @throws WeixinException
@@ -1497,7 +1454,7 @@ public class WeixinProxy {
 	 * @return 菜单集合
 	 * @see {@link #getMenu()}
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/17/4dc4b0514fdad7a5fbbd477aa9aab5ed.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1434698695&token=&lang=zh_CN">
 	 *      获取自定义菜单配置</a>
 	 * @see com.foxinmy.weixin4j.model.Button
 	 * @se com.foxinmy.weixin4j.mp.model.MenuSetting
@@ -1515,7 +1472,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.model.AutoReplySetting
 	 * @see com.foxinmy.weixin4j.mp.api.HelperApi
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/7/7b5789bb1262fb866d01b4b40b0efecb.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751299&token=&lang=zh_CN">
 	 *      获取自动回复规则</a>
 	 * @throws WeixinException
 	 */
@@ -1543,21 +1500,20 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.datacube.InterfaceSummary
 	 * @return 统计结果
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/3/ecfed6e1a0a03b5f35e5efac98e864b7.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141082&token=&lang=zh_CN">
 	 *      用户分析</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/8/c0453610fb5131d1fcb17b4e87c82050.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141084&token=&lang=zh_CN">
 	 *      图文分析</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/12/32d42ad542f2e4fc8a8aa60e1bce9838.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141085&token=&lang=zh_CN">
 	 *      消息分析</a>
 	 * @see <a href=
-	 *      "http://mp.weixin.qq.com/wiki/8/30ed81ae38cf4f977194bf1a5db73668.html">
+	 *      "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141086&token=&lang=zh_CN">
 	 *      接口分析</a>
 	 * @throws WeixinException
 	 */
-	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
-			Date endDate) throws WeixinException {
+	public List<?> datacube(DatacubeType datacubeType, Date beginDate, Date endDate) throws WeixinException {
 		return dataApi.datacube(datacubeType, beginDate, endDate);
 	}
 
@@ -1574,8 +1530,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.DataApi
 	 * @throws WeixinException
 	 */
-	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
-			int offset) throws WeixinException {
+	public List<?> datacube(DatacubeType datacubeType, Date beginDate, int offset) throws WeixinException {
 		return dataApi.datacube(datacubeType, beginDate, offset);
 	}
 
@@ -1592,8 +1547,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.DataApi
 	 * @throws WeixinException
 	 */
-	public List<?> datacube(DatacubeType datacubeType, int offset, Date endDate)
-			throws WeixinException {
+	public List<?> datacube(DatacubeType datacubeType, int offset, Date endDate) throws WeixinException {
 		return dataApi.datacube(datacubeType, offset, endDate);
 	}
 
@@ -1608,8 +1562,7 @@ public class WeixinProxy {
 	 * @see com.foxinmy.weixin4j.mp.api.DataApi
 	 * @throws WeixinException
 	 */
-	public List<?> datacube(DatacubeType datacubeType, Date date)
-			throws WeixinException {
+	public List<?> datacube(DatacubeType datacubeType, Date date) throws WeixinException {
 		return dataApi.datacube(datacubeType, date);
 	}
 
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java
index c97db46e..de20a99c 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java
@@ -55,7 +55,7 @@ public class CustomApi extends MpApi {
 	 * @see com.foxinmy.weixin4j.mp.model.KfChatRecord
 	 * @see <a href="http://dkf.qq.com/document-1_1.html">查询客服聊天记录</a>
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/19/7c129ec71ddfa60923ea9334557e8b23.html">查询客服聊天记录</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044854&token=&lang=zh_CN">查询客服聊天记录</a>
 	 */
 	public List<KfChatRecord> getKfChatRecord(Date startTime, Date endTime,
 			Pageable pageable) throws WeixinException {
@@ -94,10 +94,8 @@ public class CustomApi extends MpApi {
 	 * @see com.foxinmy.weixin4j.mp.model.KfAccount
 	 * @see <a href="http://dkf.qq.com/document-3_1.html">获取客服基本信息</a>
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.9C.8D.E5.9F.BA.E6.9C.AC.E4.BF.A1.E6.81.AF">获取客服基本信息</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">获取客服基本信息</a>
 	 * @see <a href="http://dkf.qq.com/document-3_2.html">获取在线客服接待信息</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.8E.B7.E5.8F.96.E5.9C.A8.E7.BA.BF.E5.AE.A2.E6.9C.8D.E6.8E.A5.E5.BE.85.E4.BF.A1.E6.81.AF">获取在线客服接待信息</a>
 	 * @throws WeixinException
 	 */
 	public List<KfAccount> listKfAccount(boolean isOnline)
@@ -131,9 +129,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">客服管理接口返回码</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E6.B7.BB.E5.8A.A0.E5.AE.A2.E6.9C.8D.E8.B4.A6.E5.8F.B7">新增客服账号</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">新增客服账号</a>
 	 */
 	public JsonResult createKfAccount(String id, String name, String pwd)
 			throws WeixinException {
@@ -162,9 +158,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">客服管理接口返回码</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E8.AE.BE.E7.BD.AE.E5.AE.A2.E6.9C.8D.E4.BF.A1.E6.81.AF">新增客服账号</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">新增客服账号</a>
 	 */
 	public JsonResult updateKfAccount(String id, String name, String pwd)
 			throws WeixinException {
@@ -220,9 +214,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">客服管理接口返回码</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E4.B8.8A.E4.BC.A0.E5.AE.A2.E6.9C.8D.E5.A4.B4.E5.83.8F">上传客服头像</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">上传客服头像</a>
 	 */
 	public JsonResult uploadKfAvatar(String accountId, InputStream is,
 			String fileName) throws WeixinException {
@@ -251,9 +243,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.AE.A2.E6.9C.8D.E7.AE.A1.E7.90.86.E6.8E.A5.E5.8F.A3.E8.BF.94.E5.9B.9E.E7.A0.81.E8.AF.B4.E6.98.8E">客服管理接口返回码</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/9/6fff6f191ef92c126b043ada035cc935.html#.E5.88.A0.E9.99.A4.E5.AE.A2.E6.9C.8D.E8.B4.A6.E5.8F.B7">删除客服账号</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044813&token=&lang=zh_CN">删除客服账号</a>
 	 */
 	public JsonResult deleteKfAccount(String id) throws WeixinException {
 		Token token = tokenHolder.getToken();
@@ -280,7 +270,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E5.88.9B.E5.BB.BA.E4.BC.9A.E8.AF.9D">创建会话</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">创建会话</a>
 	 */
 	public JsonResult createKfSession(String userOpenId, String kfAccount,
 			String text) throws WeixinException {
@@ -309,7 +299,7 @@ public class CustomApi extends MpApi {
 	 * @return 处理结果
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E5.85.B3.E9.97.AD.E4.BC.9A.E8.AF.9D">创建会话</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">关闭会话</a>
 	 */
 	public JsonResult closeKfSession(String userOpenId, String kfAccount,
 			String text) throws WeixinException {
@@ -335,7 +325,7 @@ public class CustomApi extends MpApi {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.88.B7.E7.9A.84.E4.BC.9A.E8.AF.9D.E7.8A.B6.E6.80.81">获取会话状态</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">获取会话状态</a>
 	 */
 	public KfSession getKfSession(String userOpenId) throws WeixinException {
 		Token token = tokenHolder.getToken();
@@ -359,7 +349,7 @@ public class CustomApi extends MpApi {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E5.AE.A2.E6.9C.8D.E7.9A.84.E4.BC.9A.E8.AF.9D.E5.88.97.E8.A1.A8">获取客服的会话列表</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">获取客服的会话列表</a>
 	 */
 	public List<KfSession> listKfSession(String kfAccount)
 			throws WeixinException {
@@ -381,9 +371,9 @@ public class CustomApi extends MpApi {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.mp.model.KfSession
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/2/6c20f3e323bdf5986cfcb33cbd3b829a.html#.E8.8E.B7.E5.8F.96.E6.9C.AA.E6.8E.A5.E5.85.A5.E4.BC.9A.E8.AF.9D.E5.88.97.E8.A1.A8">获取客服的会话列表</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1458044820&token=&lang=zh_CN">获取客服的会话列表</a>
 	 */
-	public List<KfSession> listKfSessionWait() throws WeixinException {
+	public List<KfSession> listKfWaitSession() throws WeixinException {
 		Token token = tokenHolder.getToken();
 		String kfsession_wait_uri = getRequestUri("kfsession_wait_uri");
 		WeixinResponse response = weixinExecutor.get(String.format(
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/DataApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/DataApi.java
index eb9285cc..c5b124f6 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/DataApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/DataApi.java
@@ -1,133 +1,133 @@
-package com.foxinmy.weixin4j.mp.api;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.foxinmy.weixin4j.exception.WeixinException;
-import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
-import com.foxinmy.weixin4j.model.Token;
-import com.foxinmy.weixin4j.mp.type.DatacubeType;
-import com.foxinmy.weixin4j.token.TokenHolder;
-import com.foxinmy.weixin4j.util.DateUtil;
-
-/**
- * 数据分析API
- * <p>
- * 1、接口侧的公众号数据的数据库中仅存储了2014年12月1日之后的数据，将查询不到在此之前的日期，即使有查到，也是不可信的脏数据；</br>
- * 2、请开发者在调用接口获取数据后，将数据保存在自身数据库中，即加快下次用户的访问速度，也降低了微信侧接口调用的不必要损耗。</br>
- * </p>
- * 
- * @className DataApi
- * @author jy
- * @date 2015年1月7日
- * @since JDK 1.6
- * @see
- */
-public class DataApi extends MpApi {
-	private final TokenHolder tokenHolder;
-
-	public DataApi(TokenHolder tokenHolder) {
-		this.tokenHolder = tokenHolder;
-	}
-
-	/**
-	 * 数据统计
-	 * 
-	 * @param datacubeType
-	 *            统计类型
-	 * @param beginDate
-	 *            开始日期
-	 * @param offset
-	 *            增量 表示向前几天 比如 offset=1 则查询 beginDate的后一天之间的数据
-	 * @see {@link #datacube(DatacubeType, Date,Date)}
-	 * @throws WeixinException
-	 */
-	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
-			int offset) throws WeixinException {
-		Calendar ca = Calendar.getInstance();
-		ca.setTime(beginDate);
-		ca.add(Calendar.DAY_OF_MONTH, offset);
-		return datacube(datacubeType, beginDate, ca.getTime());
-	}
-
-	/**
-	 * 数据统计
-	 * 
-	 * @param datacubeType
-	 *            统计类型
-	 * @param offset
-	 *            增量 表示向后几天 比如 offset=1 则查询 beginDate的前一天之间的数据
-	 * @param endDate
-	 *            截至日期
-	 * @see {@link #datacube(DatacubeType, Date,Date)}
-	 * @throws WeixinException
-	 */
-	public List<?> datacube(DatacubeType datacubeType, int offset, Date endDate)
-			throws WeixinException {
-		Calendar ca = Calendar.getInstance();
-		ca.setTime(endDate);
-		ca.add(Calendar.DAY_OF_MONTH, 0 - offset);
-		return datacube(datacubeType, ca.getTime(), endDate);
-	}
-
-	/**
-	 * 查询日期跨度为0的统计数据(当天)
-	 * 
-	 * @param datacubeType
-	 *            统计类型
-	 * @param date
-	 *            统计日期
-	 * @see {@link #datacube(DatacubeType, Date,Date)}
-	 * @throws WeixinException
-	 */
-	public List<?> datacube(DatacubeType datacubeType, Date date)
-			throws WeixinException {
-		return datacube(datacubeType, date, date);
-	}
-
-	/**
-	 * 数据统计
-	 * 
-	 * @param datacubeType
-	 *            数据统计类型
-	 * @param beginDate
-	 *            获取数据的起始日期，begin_date和end_date的差值需小于“最大时间跨度”（比如最大时间跨度为1时，
-	 *            begin_date和end_date的差值只能为0，才能小于1），否则会报错
-	 * @param endDate
-	 *            获取数据的结束日期，end_date允许设置的最大值为昨日
-	 * @see com.foxinmy.weixin4j.mp.datacube.UserSummary
-	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleSummary
-	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleTotal
-	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleDatacubeShare
-	 * @see com.foxinmy.weixin4j.mp.datacube.UpstreamMsg
-	 * @see com.foxinmy.weixin4j.mp.datacube.UpstreamMsgDist
-	 * @see com.foxinmy.weixin4j.mp.datacube.InterfaceSummary
-	 * @return 统计结果
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/3/ecfed6e1a0a03b5f35e5efac98e864b7.html">用户分析</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/8/c0453610fb5131d1fcb17b4e87c82050.html">图文分析</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/12/32d42ad542f2e4fc8a8aa60e1bce9838.html">消息分析</a>
-	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/8/30ed81ae38cf4f977194bf1a5db73668.html">接口分析</a>
-	 * @throws WeixinException
-	 */
-	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
-			Date endDate) throws WeixinException {
-		String datacube_uri = getRequestUri("datacube_uri");
-		Token token = tokenHolder.getToken();
-		JSONObject obj = new JSONObject();
-		obj.put("begin_date", DateUtil.fortmat2yyyy_MM_dd(beginDate));
-		obj.put("end_date", DateUtil.fortmat2yyyy_MM_dd(endDate));
-		WeixinResponse response = weixinExecutor.post(String.format(datacube_uri,
-				datacubeType.name().toLowerCase(), token.getAccessToken()), obj
-				.toJSONString());
-
-		return JSON.parseArray(response.getAsJson().getString("list"),
-				datacubeType.getClazz());
-	}
-}
+package com.foxinmy.weixin4j.mp.api;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.foxinmy.weixin4j.exception.WeixinException;
+import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
+import com.foxinmy.weixin4j.model.Token;
+import com.foxinmy.weixin4j.mp.type.DatacubeType;
+import com.foxinmy.weixin4j.token.TokenHolder;
+import com.foxinmy.weixin4j.util.DateUtil;
+
+/**
+ * 数据分析API
+ * <p>
+ * 1、接口侧的公众号数据的数据库中仅存储了2014年12月1日之后的数据，将查询不到在此之前的日期，即使有查到，也是不可信的脏数据；</br>
+ * 2、请开发者在调用接口获取数据后，将数据保存在自身数据库中，即加快下次用户的访问速度，也降低了微信侧接口调用的不必要损耗。</br>
+ * </p>
+ * 
+ * @className DataApi
+ * @author jy
+ * @date 2015年1月7日
+ * @since JDK 1.6
+ * @see
+ */
+public class DataApi extends MpApi {
+	private final TokenHolder tokenHolder;
+
+	public DataApi(TokenHolder tokenHolder) {
+		this.tokenHolder = tokenHolder;
+	}
+
+	/**
+	 * 数据统计
+	 * 
+	 * @param datacubeType
+	 *            统计类型
+	 * @param beginDate
+	 *            开始日期
+	 * @param offset
+	 *            增量 表示向前几天 比如 offset=1 则查询 beginDate的后一天之间的数据
+	 * @see {@link #datacube(DatacubeType, Date,Date)}
+	 * @throws WeixinException
+	 */
+	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
+			int offset) throws WeixinException {
+		Calendar ca = Calendar.getInstance();
+		ca.setTime(beginDate);
+		ca.add(Calendar.DAY_OF_MONTH, offset);
+		return datacube(datacubeType, beginDate, ca.getTime());
+	}
+
+	/**
+	 * 数据统计
+	 * 
+	 * @param datacubeType
+	 *            统计类型
+	 * @param offset
+	 *            增量 表示向后几天 比如 offset=1 则查询 beginDate的前一天之间的数据
+	 * @param endDate
+	 *            截至日期
+	 * @see {@link #datacube(DatacubeType, Date,Date)}
+	 * @throws WeixinException
+	 */
+	public List<?> datacube(DatacubeType datacubeType, int offset, Date endDate)
+			throws WeixinException {
+		Calendar ca = Calendar.getInstance();
+		ca.setTime(endDate);
+		ca.add(Calendar.DAY_OF_MONTH, 0 - offset);
+		return datacube(datacubeType, ca.getTime(), endDate);
+	}
+
+	/**
+	 * 查询日期跨度为0的统计数据(当天)
+	 * 
+	 * @param datacubeType
+	 *            统计类型
+	 * @param date
+	 *            统计日期
+	 * @see {@link #datacube(DatacubeType, Date,Date)}
+	 * @throws WeixinException
+	 */
+	public List<?> datacube(DatacubeType datacubeType, Date date)
+			throws WeixinException {
+		return datacube(datacubeType, date, date);
+	}
+
+	/**
+	 * 数据统计
+	 * 
+	 * @param datacubeType
+	 *            数据统计类型
+	 * @param beginDate
+	 *            获取数据的起始日期，begin_date和end_date的差值需小于“最大时间跨度”（比如最大时间跨度为1时，
+	 *            begin_date和end_date的差值只能为0，才能小于1），否则会报错
+	 * @param endDate
+	 *            获取数据的结束日期，end_date允许设置的最大值为昨日
+	 * @see com.foxinmy.weixin4j.mp.datacube.UserSummary
+	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleSummary
+	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleTotal
+	 * @see com.foxinmy.weixin4j.mp.datacube.ArticleDatacubeShare
+	 * @see com.foxinmy.weixin4j.mp.datacube.UpstreamMsg
+	 * @see com.foxinmy.weixin4j.mp.datacube.UpstreamMsgDist
+	 * @see com.foxinmy.weixin4j.mp.datacube.InterfaceSummary
+	 * @return 统计结果
+	 * @see <a
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141082&token=&lang=zh_CN">用户分析</a>
+	 * @see <a
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141084&token=&lang=zh_CN">图文分析</a>
+	 * @see <a
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141085&token=&lang=zh_CN">消息分析</a>
+	 * @see <a
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141086&token=&lang=zh_CN">接口分析</a>
+	 * @throws WeixinException
+	 */
+	public List<?> datacube(DatacubeType datacubeType, Date beginDate,
+			Date endDate) throws WeixinException {
+		String datacube_uri = getRequestUri("datacube_uri");
+		Token token = tokenHolder.getToken();
+		JSONObject obj = new JSONObject();
+		obj.put("begin_date", DateUtil.fortmat2yyyy_MM_dd(beginDate));
+		obj.put("end_date", DateUtil.fortmat2yyyy_MM_dd(endDate));
+		WeixinResponse response = weixinExecutor.post(String.format(datacube_uri,
+				datacubeType.name().toLowerCase(), token.getAccessToken()), obj
+				.toJSONString());
+
+		return JSON.parseArray(response.getAsJson().getString("list"),
+				datacubeType.getClazz());
+	}
+}
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java
index 377a682c..515dc178 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java
@@ -18,8 +18,6 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @author jy.hu
  * @date 2014年9月25日
  * @since JDK 1.6
- * @see <a
- *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html">分组接口</a>
  * @see com.foxinmy.weixin4j.mp.model.Group
  */
 public class GroupApi extends MpApi {
@@ -38,7 +36,7 @@ public class GroupApi extends MpApi {
 	 * @return group对象
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E5.88.9B.E5.BB.BA.E5.88.86.E7.BB.84">创建分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">创建分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.model.Group#toCreateJson()
 	 */
@@ -59,7 +57,7 @@ public class GroupApi extends MpApi {
 	 * @return 组集合
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E6.9F.A5.E8.AF.A2.E6.89.80.E6.9C.89.E5.88.86.E7.BB.844">查询所有分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">查询所有分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 */
 	public List<Group> getGroups() throws WeixinException {
@@ -80,7 +78,7 @@ public class GroupApi extends MpApi {
 	 * @return 组ID
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E6.9F.A5.E8.AF.A2.E7.94.A8.E6.88.B7.E6.89.80.E5.9C.A8.E5.88.86.E7.BB.84">查询用户所在分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">查询用户所在分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 */
 	public int getGroupByOpenId(String openId) throws WeixinException {
@@ -102,7 +100,7 @@ public class GroupApi extends MpApi {
 	 *            组名称
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E4.BF.AE.E6.94.B9.E5.88.86.E7.BB.84.E5.90.8D">修改分组名</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">修改分组名</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 * @see com.foxinmy.weixin4j.mp.model.Group#toModifyJson()
 	 */
@@ -127,7 +125,7 @@ public class GroupApi extends MpApi {
 	 *            用户对应的ID
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/13/be5272dc4930300ba561d927aead2569.html#.E7.A7.BB.E5.8A.A8.E7.94.A8.E6.88.B7.E5.88.86.E7.BB.84">移动分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">移动分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 */
 	public JsonResult moveGroup(int groupId, String openId)
@@ -150,7 +148,7 @@ public class GroupApi extends MpApi {
 	 *            用户ID列表(不能超过50个)
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/0/56d992c605a97245eb7e617854b169fc.html#.E6.89.B9.E9.87.8F.E7.A7.BB.E5.8A.A8.E7.94.A8.E6.88.B7.E5.88.86.E7.BB.84">批量移动分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">批量移动分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 */
 	public JsonResult moveGroup(int groupId, String... openIds)
@@ -174,7 +172,7 @@ public class GroupApi extends MpApi {
 	 *            组ID
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/0/56d992c605a97245eb7e617854b169fc.html#.E5.88.A0.E9.99.A4.E5.88.86.E7.BB.84">删除用户分组</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">删除用户分组</a>
 	 * @see com.foxinmy.weixin4j.mp.model.Group
 	 */
 	public JsonResult deleteGroup(int groupId) throws WeixinException {
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java
index d2d31fd6..d1b7373b 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java
@@ -45,7 +45,7 @@ public class HelperApi extends MpApi {
 	 * @return 短链接
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/10/165c9b15eddcfbd8699ac12b0bd89ae6.html">长链接转短链接</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1443433600&token=&lang=zh_CN">长链接转短链接</a>
 	 */
 	public String getShorturl(String url) throws WeixinException {
 		String shorturl_uri = getRequestUri("shorturl_uri");
@@ -69,7 +69,7 @@ public class HelperApi extends MpApi {
 	 * @see com.foxinmy.weixin4j.mp.model.SemQuery
 	 * @see com.foxinmy.weixin4j.mp.model.SemResult
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/0/0ce78b3c9524811fee34aba3e33f3448.html">语义理解</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141241&token=&lang=zh_CN">语义理解</a>
 	 * @throws WeixinException
 	 */
 	public SemResult semantic(SemQuery semQuery) throws WeixinException {
@@ -87,7 +87,7 @@ public class HelperApi extends MpApi {
 	 * 
 	 * @return IP地址
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html">获取IP地址</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140187&token=&lang=zh_CN">获取IP地址</a>
 	 * @throws WeixinException
 	 */
 	public List<String> getCallbackip() throws WeixinException {
@@ -106,7 +106,7 @@ public class HelperApi extends MpApi {
 	 * @return 菜单集合
 	 * @see {@link MenuApi#getMenu()}
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/17/4dc4b0514fdad7a5fbbd477aa9aab5ed.html">获取自定义菜单配置</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1434698695&token=&lang=zh_CN">获取自定义菜单配置</a>
 	 * @see com.foxinmy.weixin4j.model.Button
 	 * @see com.foxinmy.weixin4j.mp.model.MenuSetting
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
@@ -182,7 +182,7 @@ public class HelperApi extends MpApi {
 	 * 
 	 * @see com.foxinmy.weixin4j.mp.model.AutoReplySetting
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/7/7b5789bb1262fb866d01b4b40b0efecb.html">获取自动回复规则</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751299&token=&lang=zh_CN">获取自动回复规则</a>
 	 * @throws WeixinException
 	 */
 	public AutoReplySetting getAutoReplySetting() throws WeixinException {
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java
index fbd904b9..23bb8f49 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java
@@ -42,7 +42,7 @@ public class MassApi extends MpApi {
 	 * @return 媒体ID
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E4.B8.8A.E4.BC.A0.E5.9B.BE.E6.96.87.E6.B6.88.E6.81.AF.E7.B4.A0.E6.9D.90.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">上传图文素材</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">上传图文素材</a>
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 */
 	public String uploadArticle(List<MpArticle> articles)
@@ -84,7 +84,7 @@ public class MassApi extends MpApi {
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
 	 * @see {@link GroupApi#getGroups()}
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AE.E5.88.86.E7.BB.84.E8.BF.9B.E8.A1.8C.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">根据分组群发</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">根据分组群发</a>
 	 */
 	public String[] massByGroupId(MassTuple tuple, boolean isToAll, int groupId)
 			throws WeixinException {
@@ -129,7 +129,7 @@ public class MassApi extends MpApi {
 	 *            分组ID
 	 * @return 第一个元素为消息发送任务的ID,第二个元素为消息的数据ID，该字段只有在群发图文消息时，才会出现。
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AE.E5.88.86.E7.BB.84.E8.BF.9B.E8.A1.8C.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">根据分组群发</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">根据分组群发</a>
 	 * @see {@link #massByGroupId(Tuple,int)}
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @throws WeixinException
@@ -158,7 +158,7 @@ public class MassApi extends MpApi {
 	 * @see com.foxinmy.weixin4j.tuple.Card
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AEOpenID.E5.88.97.E8.A1.A8.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8D.E5.8F.AF.E7.94.A8.EF.BC.8C.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.8F.AF.E7.94.A8.E3.80.91">根据openid群发</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">根据openid群发</a>
 	 * @see {@link UserApi#getUser(String)}
 	 */
 	public String[] massByOpenIds(MassTuple tuple, String... openIds)
@@ -198,7 +198,7 @@ public class MassApi extends MpApi {
 	 *            openId列表
 	 * @return 第一个元素为消息发送任务的ID,第二个元素为消息的数据ID，该字段只有在群发图文消息时，才会出现,可以用于在图文分析数据接口中.
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.A0.B9.E6.8D.AEOpenID.E5.88.97.E8.A1.A8.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8D.E5.8F.AF.E7.94.A8.EF.BC.8C.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.8F.AF.E7.94.A8.E3.80.91">根据openid群发</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">根据openid群发</a>
 	 * @see {@link #massByOpenIds(Tuple,String...)}
 	 * @see com.foxinmy.weixin4j.tuple.MpArticle
 	 * @throws WeixinException
@@ -219,7 +219,7 @@ public class MassApi extends MpApi {
 	 *            发送出去的消息ID
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E5.88.A0.E9.99.A4.E7.BE.A4.E5.8F.91.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">删除群发</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">删除群发</a>
 	 * @see {@link #massByGroupId(Tuple, int)}
 	 * @see {@link #massByOpenIds(Tuple, String...)

 	 */
@@ -248,7 +248,7 @@ public class MassApi extends MpApi {
 	 * @throws WeixinException
 	 * @see com.foxinmy.weixin4j.tuple.MassTuple
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E9.A2.84.E8.A7.88.E6.8E.A5.E5.8F.A3.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">预览群发消息</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">预览群发消息</a>
 	 */
 	public JsonResult previewMassNews(String toUser, String toWxName,
 			MassTuple tuple) throws WeixinException {
@@ -275,7 +275,7 @@ public class MassApi extends MpApi {
 	 * @return 消息发送状态,如sendsuccess:发送成功、sendfail:发送失败
 	 * @throws WeixinException
 	 * @see <a
-	 *      href="http://mp.weixin.qq.com/wiki/15/5380a4e6f02f2ffdc7981a8ed7a40753.html#.E6.9F.A5.E8.AF.A2.E7.BE.A4.E5.8F.91.E6.B6.88.E6.81.AF.E5.8F.91.E9.80.81.E7.8A.B6.E6.80.81.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91">查询群发状态</a>
+	 *      href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN">查询群发状态</a>
 	 */
 	public String getMassNewStatus(String msgId) throws WeixinException {
 		JSONObject obj = new JSONObject();
diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java
index 87deef29..7244de01 100644
--- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java
+++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java
@@ -115,7 +115,7 @@ public class CustomTest extends TokenTest {
 
 	@Test
 	public void getSessionWaitList() throws WeixinException {
-		List<KfSession> sessionList = customApi.listKfSessionWait();
+		List<KfSession> sessionList = customApi.listKfWaitSession();
 		System.err.println(sessionList);
 	}
 }