From 7377d3df00fd99b82d58bc98bd4348021b179b9e Mon Sep 17 00:00:00 2001 From: jinyu Date: Tue, 5 Apr 2016 19:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A=E5=92=8C?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/foxinmy/weixin4j/mp/WeixinProxy.java | 14 +- .../foxinmy/weixin4j/mp/api/HelperApi.java | 2 +- .../foxinmy/weixin4j/mp/test/HelpTest.java | 70 +++---- .../com/foxinmy/weixin4j/qy/WeixinProxy.java | 179 ++++++++---------- .../foxinmy/weixin4j/qy/WeixinSuiteProxy.java | 2 +- .../foxinmy/weixin4j/qy/api/HelperApi.java | 86 ++++----- .../com/foxinmy/weixin4j/qy/api/MenuApi.java | 46 ++--- .../foxinmy/weixin4j/qy/api/NotifyApi.java | 4 +- .../com/foxinmy/weixin4j/qy/api/TagApi.java | 8 +- .../com/foxinmy/weixin4j/qy/api/UserApi.java | 10 +- .../foxinmy/weixin4j/qy/test/HelperTest.java | 70 +++---- .../foxinmy/weixin4j/qy/test/MenuTest.java | 2 +- 12 files changed, 230 insertions(+), 263 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 c01a8e3d..13a19ed2 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 @@ -239,10 +239,10 @@ public class WeixinProxy { * 否则抛出异常. *

* + * @param isMaterial + * 是否永久上传 * @param is * 媒体数据流 - * @param mediaType - * 媒体文件类型：分别有图片（image）、语音（voice）、视频(video)和缩略图（thumb） * @param fileName * 文件名 * @return 上传到微信服务器返回的媒体标识 @@ -336,8 +336,7 @@ public class WeixinProxy { * "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1444738732&token=&lang=zh_CN"> * 更新永久图文素材 */ - public JsonResult updateMaterialArticle(String mediaId, int index, MpArticle article) - throws WeixinException { + public JsonResult updateMaterialArticle(String mediaId, int index, MpArticle article) throws WeixinException { return mediaApi.updateMaterialArticle(mediaId, index, article); } @@ -524,8 +523,7 @@ public class WeixinProxy { * 客服账号登录密码 * @return 处理结果 * @throws WeixinException - * @see com.foxinmy.weixin4j.mp.api.CustomApi - * 客服管理接口返回码 + * @see com.foxinmy.weixin4j.mp.api.CustomApi 客服管理接口返回码 * @see * 新增客服账号 @@ -1443,8 +1441,8 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.mp.api.HelperApi * @throws WeixinException */ - public List getCallbackip() throws WeixinException { - return helperApi.getCallbackip(); + public List getWechatServerIp() throws WeixinException { + return helperApi.getWechatServerIp(); } /** 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 d1b7373b..2085e785 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 @@ -90,7 +90,7 @@ public class HelperApi extends MpApi { * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140187&token=&lang=zh_CN">获取IP地址 * @throws WeixinException */ - public List getCallbackip() throws WeixinException { + public List getWechatServerIp() throws WeixinException { String getcallbackip_uri = getRequestUri("getcallbackip_uri"); Token token = tokenHolder.getToken(); WeixinResponse response = weixinExecutor.post(String.format(getcallbackip_uri, diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/HelpTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/HelpTest.java index ea99a585..bda98073 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/HelpTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/HelpTest.java @@ -1,35 +1,35 @@ -package com.foxinmy.weixin4j.mp.test; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.mp.api.HelperApi; - -public class HelpTest extends TokenTest { - private HelperApi helperApi; - - @Before - public void init() { - helperApi = new HelperApi(tokenHolder); - } - - @Test - public void getcallbackip() throws WeixinException { - List ipList = helperApi.getCallbackip(); - Assert.assertFalse(ipList.isEmpty()); - } - - @Test - public void getMenuSetting() throws WeixinException { - System.err.println(helperApi.getMenuSetting()); - } - - @Test - public void getAutoReplySetting() throws WeixinException { - System.err.println(helperApi.getAutoReplySetting()); - } -} +package com.foxinmy.weixin4j.mp.test; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.foxinmy.weixin4j.exception.WeixinException; +import com.foxinmy.weixin4j.mp.api.HelperApi; + +public class HelpTest extends TokenTest { + private HelperApi helperApi; + + @Before + public void init() { + helperApi = new HelperApi(tokenHolder); + } + + @Test + public void getWechatServerIp() throws WeixinException { + List ipList = helperApi.getWechatServerIp(); + Assert.assertFalse(ipList.isEmpty()); + } + + @Test + public void getMenuSetting() throws WeixinException { + System.err.println(helperApi.getMenuSetting()); + } + + @Test + public void getAutoReplySetting() throws WeixinException { + System.err.println(helperApi.getAutoReplySetting()); + } +} 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 225a6ca5..63c07a7c 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 @@ -126,8 +126,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; } @@ -144,17 +144,15 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.qy.api.SuiteApi * @see WeixinSuiteProxy#getWeixinProxy(String, String) */ - public WeixinProxy(SuitePerCodeHolder perCodeHolder, - TokenHolder suiteTokenHolder) { - this(new TokenHolder(new WeixinTokenSuiteCreator(perCodeHolder, - suiteTokenHolder), perCodeHolder.getTokenStorager())); - this.settings = new Weixin4jSettings(new WeixinAccount( - perCodeHolder.getAuthCorpId(), null)); + public WeixinProxy(SuitePerCodeHolder perCodeHolder, TokenHolder suiteTokenHolder) { + this(new TokenHolder(new WeixinTokenSuiteCreator(perCodeHolder, suiteTokenHolder), + perCodeHolder.getTokenStorager())); + this.settings = new Weixin4jSettings(new WeixinAccount(perCodeHolder.getAuthCorpId(), null)); } /** - * 注意：TokenCreator 需为 WeixinTokenCreator或WeixinTokenSuiteCreator + * 注意：TokenCreator 需为 + * WeixinTokenCreator或WeixinTokenSuiteCreator * * @see com.foxinmy.weixin4j.qy.token.WeixinTokenCreator.WeixinTokenCreator * @param tokenHolder @@ -199,8 +197,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()); } @@ -215,7 +212,8 @@ public class WeixinProxy { * @param message * 客服消息对象 * @return 如果对应用或收件人、部门、标签任何一个无权限，则本次发送失败；如果收件人、部门或标签不存在，发送仍然执行，但返回无效的部分 - *
{ "errcode": 0, "errmsg": "ok", "invaliduser": "UserID1", + *
+ * { "errcode": 0, "errmsg": "ok", "invaliduser": "UserID1", * "invalidparty":"PartyID1", "invalidtag":"TagID1" } * @throws WeixinException * @see com.foxinmy.weixin4j.qy.api.NotifyApi @@ -234,8 +232,7 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.tuple.MpNews * @see com.foxinmy.weixin4j.qy.model.IdParameter */ - public IdParameter sendNotifyMessage(NotifyMessage message) - throws WeixinException { + public IdParameter sendNotifyMessage(NotifyMessage message) throws WeixinException { return notifyApi.sendNotifyMessage(message); } @@ -245,8 +242,9 @@ public class WeixinProxy { * @param message * 客服消息对象 * @return 发送结果 - * @see 客服接口说明 + * @see + * 客服接口说明 * @see com.foxinmy.weixin4j.qy.api.NotifyApi * @see com.foxinmy.weixin4j.tuple.Text * @see com.foxinmy.weixin4j.tuple.Image @@ -256,8 +254,7 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.qy.message.CustomeMessage * @throws WeixinException */ - public JsonResult sendCustomeMessage(CustomeMessage message) - throws WeixinException { + public JsonResult sendCustomeMessage(CustomeMessage message) throws WeixinException { return notifyApi.sendCustomeMessage(message); } @@ -269,8 +266,9 @@ public class WeixinProxy { * @return 第一个元素为内部客服(internal),第二个参数为外部客服(external) * @see com.foxinmy.weixin4j.qy.api.NotifyApi * @see com.foxinmy.weixin4j.qy.model.IdParameter - * @see 客服列表 + * @see + * 客服列表 * @throws WeixinException */ public IdParameter[] getKfList(KfType kfType) throws WeixinException { @@ -280,10 +278,11 @@ public class WeixinProxy { /** * 自定义菜单(管理员须拥有应用的管理权限 并且应用必须设置在回调模式) * - * @param buttons - * 菜单列表 * @param agentid * 应用ID + * + * @param buttons + * 菜单列表 * @throws WeixinException * @see com.foxinmy.weixin4j.qy.api.MenuApi * @see * @see com.foxinmy.weixin4j.model.Button */ - public JsonResult createMenu(List