From e953a748e0788f9d0ad2729955c4fe003094e197 Mon Sep 17 00:00:00 2001 From: jinyu Date: Tue, 30 Jun 2015 08:19:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=94=B9=E8=BF=9B=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E5=88=86API=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++-- .../com/foxinmy/weixin4j/mp/WeixinProxy.java | 26 +++++++------- .../foxinmy/weixin4j/mp/api/CustomApi.java | 8 ++--- .../foxinmy/weixin4j/mp/api/HelperApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/MassApi.java | 31 +++++++++++++++-- .../foxinmy/weixin4j/mp/test/CustomTest.java | 10 +++--- .../foxinmy/weixin4j/mp/test/HelpTest.java | 2 +- .../foxinmy/weixin4j/mp/test/MassTest.java | 2 +- .../com/foxinmy/weixin4j/qy/WeixinProxy.java | 20 +++++------ .../com/foxinmy/weixin4j/qy/api/BatchApi.java | 8 ++--- .../foxinmy/weixin4j/qy/api/HelperApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/PartyApi.java | 15 ++++---- .../foxinmy/weixin4j/qy/test/BatchTest.java | 4 +-- .../foxinmy/weixin4j/qy/test/HelperTest.java | 2 +- .../weixin4j/mp/event/MassEventMessage.java | 15 +------- .../foxinmy/weixin4j/util/MessageUtil.java | 34 ------------------- 16 files changed, 84 insertions(+), 103 deletions(-) diff --git a/README.md b/README.md index e1bc6ece..b4b3944e 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,13 @@ weixin4j ------- * **weixin4j-mp** - `公众平台API全封装` + `公众平台API封装` `微信支付(刷卡/扫码/公众号)` * **weixin4j-qy** - `企业号API全封装` + `企业号API封装` `微信支付(刷卡/扫码/公众号)` @@ -76,6 +76,6 @@ weixin4j * 硬件设备 & 摇一摇周边 -* 微信小店 +* 微信小店&门店 * 微信卡券 \ No newline at end of file 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 1d05bfb5..bae9f6de 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 @@ -440,9 +440,9 @@ public class WeixinProxy { * 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">获取在线客服接待信息 * @throws WeixinException */ - public List getKfAccountList(boolean isOnline) + public List listKfAccount(boolean isOnline) throws WeixinException { - return customApi.getKfAccountList(isOnline); + return customApi.listKfAccount(isOnline); } /** @@ -463,9 +463,9 @@ public class WeixinProxy { * @see 新增客服账号 */ - public JsonResult addAccount(String id, String name, String pwd) + public JsonResult createAccount(String id, String name, String pwd) throws WeixinException { - return customApi.addAccount(id, name, pwd); + return customApi.createAccount(id, name, pwd); } /** @@ -601,9 +601,9 @@ public class WeixinProxy { * @see 获取客服的会话列表 */ - public List getKfSessionList(String kfAccount) + public List listKfSession(String kfAccount) throws WeixinException { - return customApi.getKfSessionList(kfAccount); + return customApi.listKfSession(kfAccount); } /** @@ -617,8 +617,8 @@ public class WeixinProxy { * @see 获取客服的会话列表 */ - public List getKfSessionWaitList() throws WeixinException { - return customApi.getKfSessionWaitList(); + public List listKfSessionWait() throws WeixinException { + return customApi.listKfSessionWait(); } /** @@ -822,12 +822,12 @@ public class WeixinProxy { * @return 消息发送状态 * @throws WeixinException * @see com.foxinmy.weixin4j.mp.api.MassApi - * @see {@link com.foxinmy.weixin4j.mp.event.MassEventMessage#getStatusDesc(String)} + * @see {@link com.foxinmy.weixin4j.util.MessageUtil#getStatusDesc(String)} * @see 查询群发状态 */ - public String getMassNews(String msgId) throws WeixinException { - return massApi.getMassNews(msgId); + public String getMassNewStatus(String msgId) throws WeixinException { + return massApi.getMassNewStatus(msgId); } /** @@ -1210,8 +1210,8 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.mp.api.HelperApi * @throws WeixinException */ - public List getcallbackip() throws WeixinException { - return helperApi.getcallbackip(); + public List getCallbackip() throws WeixinException { + return helperApi.getCallbackip(); } /** 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 73d5708a..613d594c 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 @@ -95,7 +95,7 @@ public class CustomApi extends MpApi { * 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">获取在线客服接待信息 * @throws WeixinException */ - public List getKfAccountList(boolean isOnline) + public List listKfAccount(boolean isOnline) throws WeixinException { Token token = tokenHolder.getToken(); String text = ""; @@ -130,7 +130,7 @@ public class CustomApi extends MpApi { * @see 新增客服账号 */ - public JsonResult addAccount(String id, String name, String pwd) + public JsonResult createAccount(String id, String name, String pwd) throws WeixinException { JSONObject obj = new JSONObject(); obj.put("kf_account", id); @@ -322,7 +322,7 @@ public class CustomApi extends MpApi { * @see 获取客服的会话列表 */ - public List getKfSessionList(String kfAccount) + public List listKfSession(String kfAccount) throws WeixinException { Token token = tokenHolder.getToken(); String kfsession_list_uri = getRequestUri("kfsession_list_uri"); @@ -343,7 +343,7 @@ public class CustomApi extends MpApi { * @see 获取客服的会话列表 */ - public List getKfSessionWaitList() throws WeixinException { + public List listKfSessionWait() throws WeixinException { Token token = tokenHolder.getToken(); String kfsession_wait_uri = getRequestUri("kfsession_wait_uri"); WeixinResponse response = weixinClient.get(String.format(kfsession_wait_uri, 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 972b6ef0..b7dea7ff 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="http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html">获取IP地址 * @throws WeixinException */ - public List getcallbackip() throws WeixinException { + public List getCallbackip() throws WeixinException { String getcallbackip_uri = getRequestUri("getcallbackip_uri"); Token token = tokenHolder.getToken(); WeixinResponse response = weixinClient.post(String.format(getcallbackip_uri, 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 11758034..bb68a32d 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 @@ -1,7 +1,9 @@ package com.foxinmy.weixin4j.mp.api; import java.io.File; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -303,13 +305,13 @@ public class MassApi extends MpApi { * * @param msgId * 消息ID - * @return 消息发送状态 + * @return 消息发送状态,如sendsuccess:发送成功、sendfail:发送失败 * @throws WeixinException * @see {@link com.foxinmy.weixin4j.mp.event.MassEventMessage#getStatusDesc(String)} * @see 查询群发状态 */ - public String getMassNews(String msgId) throws WeixinException { + public String getMassNewStatus(String msgId) throws WeixinException { JSONObject obj = new JSONObject(); obj.put("msg_id", msgId); String mass_get_uri = getRequestUri("mass_get_uri"); @@ -318,6 +320,29 @@ public class MassApi extends MpApi { String.format(mass_get_uri, token.getAccessToken()), obj.toJSONString()); - return response.getAsJson().getString("msg_status"); + String status = response.getAsJson().getString("msg_status"); + String desc = massStatusMap.get(status); + return String.format("%s:%s", status, desc); + } + + private final static Map massStatusMap; + static { + massStatusMap = new HashMap(); + massStatusMap.put("sendsuccess", "发送成功"); + massStatusMap.put("send_success", "发送成功"); + massStatusMap.put("success", "发送成功"); + massStatusMap.put("send success", "发送成功"); + massStatusMap.put("sendfail", "发送失败"); + massStatusMap.put("send_fail", "发送失败"); + massStatusMap.put("fail", "发送失败"); + massStatusMap.put("send fail", "发送失败"); + massStatusMap.put("err(10001)", "涉嫌广告"); + massStatusMap.put("err(20001)", "涉嫌政治"); + massStatusMap.put("err(20004)", "涉嫌社会"); + massStatusMap.put("err(20006)", "涉嫌违法犯罪"); + massStatusMap.put("err(20008)", "涉嫌欺诈"); + massStatusMap.put("err(20013)", "涉嫌版权"); + massStatusMap.put("err(22000)", "涉嫌互推(互相宣传)"); + massStatusMap.put("err(21000)", "涉嫌其他"); } } 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 82891884..1a7b57fa 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 @@ -53,15 +53,15 @@ public class CustomTest extends TokenTest { @Test public void kfList() throws WeixinException { - List kfList = customApi.getKfAccountList(false); + List kfList = customApi.listKfAccount(false); System.out.println(kfList); - kfList = customApi.getKfAccountList(true); + kfList = customApi.listKfAccount(true); System.out.println(kfList); } @Test public void addAccount() throws WeixinException { - JsonResult result = customApi.addAccount("test@test", "test", "123456"); + JsonResult result = customApi.createAccount("test@test", "test", "123456"); Assert.assertEquals(0, result.getCode()); } @@ -108,13 +108,13 @@ public class CustomTest extends TokenTest { @Test public void getSessionList() throws WeixinException { - List sessionList = customApi.getKfSessionList("kfAccount"); + List sessionList = customApi.listKfSession("kfAccount"); System.err.println(sessionList); } @Test public void getSessionWaitList() throws WeixinException { - List sessionList = customApi.getKfSessionWaitList(); + List sessionList = customApi.listKfSessionWait(); System.err.println(sessionList); } } 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 48dc8042..ea99a585 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 @@ -19,7 +19,7 @@ public class HelpTest extends TokenTest { @Test public void getcallbackip() throws WeixinException { - List ipList = helperApi.getcallbackip(); + List ipList = helperApi.getCallbackip(); Assert.assertFalse(ipList.isEmpty()); } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java index ca115f97..1e53d636 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java @@ -102,7 +102,7 @@ public class MassTest extends TokenTest { @Test public void getMassNews() throws WeixinException { - String status = massApi.getMassNews("82358"); + String status = massApi.getMassNewStatus("82358"); System.out.println(status); Assert.assertNotNull(status); } 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 dd33f0cf..32dcede9 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 @@ -695,8 +695,8 @@ public class WeixinProxy { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%9B%9E%E8%B0%83%E6%A8%A1%E5%BC%8F#.E8.8E.B7.E5.8F.96.E5.BE.AE.E4.BF.A1.E6.9C.8D.E5.8A.A1.E5.99.A8.E7.9A.84ip.E6.AE.B5">获取IP地址 * @throws WeixinException */ - public List getcallbackip() throws WeixinException { - return helperApi.getcallbackip(); + public List getCallbackip() throws WeixinException { + return helperApi.getCallbackip(); } /** @@ -762,9 +762,9 @@ public class WeixinProxy { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E9.82.80.E8.AF.B7.E6.88.90.E5.91.98.E5.85.B3.E6.B3.A8">邀请成员关注 * @throws WeixinException */ - public String inviteuser(IdParameter parameter, Callback callback, + public String batchInviteUser(IdParameter parameter, Callback callback, String tips) throws WeixinException { - return batchApi.inviteuser(parameter, callback, tips); + return batchApi.inviteUser(parameter, callback, tips); } /** @@ -786,9 +786,9 @@ public class WeixinProxy { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.A2.9E.E9.87.8F.E6.9B.B4.E6.96.B0.E6.88.90.E5.91.98">批量更新成员 * @throws WeixinException */ - public String syncuser(String mediaId, Callback callback) + public String batchSyncUser(String mediaId, Callback callback) throws WeixinException { - return batchApi.syncuser(mediaId, callback); + return batchApi.syncUser(mediaId, callback); } /** @@ -811,9 +811,9 @@ public class WeixinProxy { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.85.A8.E9.87.8F.E8.A6.86.E7.9B.96.E6.88.90.E5.91.98">批量覆盖成员 * @throws WeixinException */ - public String replaceuser(String mediaId, Callback callback) + public String batchReplaceUser(String mediaId, Callback callback) throws WeixinException { - return batchApi.replaceuser(mediaId, callback); + return batchApi.replaceUser(mediaId, callback); } /** @@ -853,9 +853,9 @@ public class WeixinProxy { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.85.A8.E9.87.8F.E8.A6.86.E7.9B.96.E9.83.A8.E9.97.A8">批量覆盖部门 * @throws WeixinException */ - public String replaceparty(String mediaId, Callback callback) + public String batchReplaceParty(String mediaId, Callback callback) throws WeixinException { - return batchApi.replaceparty(mediaId, callback); + return batchApi.replaceParty(mediaId, callback); } /** 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 1c63f8cb..48b92077 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 @@ -47,7 +47,7 @@ public class BatchApi extends QyApi { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E9.82.80.E8.AF.B7.E6.88.90.E5.91.98.E5.85.B3.E6.B3.A8">邀请成员关注 * @throws WeixinException */ - public String inviteuser(IdParameter parameter, Callback callback, + public String inviteUser(IdParameter parameter, Callback callback, String tips) throws WeixinException { String batch_inviteuser_uri = getRequestUri("batch_inviteuser_uri"); Token token = tokenHolder.getToken(); @@ -81,7 +81,7 @@ public class BatchApi extends QyApi { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.A2.9E.E9.87.8F.E6.9B.B4.E6.96.B0.E6.88.90.E5.91.98">批量更新成员 * @throws WeixinException */ - public String syncuser(String mediaId, Callback callback) + public String syncUser(String mediaId, Callback callback) throws WeixinException { String batch_syncuser_uri = getRequestUri("batch_syncuser_uri"); return batch(batch_syncuser_uri, mediaId, callback); @@ -119,7 +119,7 @@ public class BatchApi extends QyApi { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.85.A8.E9.87.8F.E8.A6.86.E7.9B.96.E6.88.90.E5.91.98">批量覆盖成员 * @throws WeixinException */ - public String replaceuser(String mediaId, Callback callback) + public String replaceUser(String mediaId, Callback callback) throws WeixinException { String batch_replaceuser_uri = getRequestUri("batch_replaceuser_uri"); return batch(batch_replaceuser_uri, mediaId, callback); @@ -144,7 +144,7 @@ public class BatchApi extends QyApi { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BC%82%E6%AD%A5%E4%BB%BB%E5%8A%A1%E6%8E%A5%E5%8F%A3#.E5.85.A8.E9.87.8F.E8.A6.86.E7.9B.96.E9.83.A8.E9.97.A8">批量覆盖部门 * @throws WeixinException */ - public String replaceparty(String mediaId, Callback callback) + public String replaceParty(String mediaId, Callback callback) throws WeixinException { String batch_replaceparty_uri = getRequestUri("batch_replaceparty_uri"); return batch(batch_replaceparty_uri, mediaId, callback); diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/HelperApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/HelperApi.java index 3636a0d5..677defe5 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/HelperApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/HelperApi.java @@ -32,7 +32,7 @@ public class HelperApi extends QyApi { * href="http://qydev.weixin.qq.com/wiki/index.php?title=%E5%9B%9E%E8%B0%83%E6%A8%A1%E5%BC%8F#.E8.8E.B7.E5.8F.96.E5.BE.AE.E4.BF.A1.E6.9C.8D.E5.8A.A1.E5.99.A8.E7.9A.84ip.E6.AE.B5">获取IP地址 * @throws WeixinException */ - public List getcallbackip() throws WeixinException { + public List getCallbackip() throws WeixinException { String getcallbackip_uri = getRequestUri("getcallbackip_uri"); Token token = tokenHolder.getToken(); WeixinResponse response = weixinClient.post(String.format(getcallbackip_uri, diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java index 2a13588c..bf3e4326 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java @@ -43,7 +43,9 @@ public class PartyApi extends QyApi { public int createParty(Party depart) throws WeixinException { String department_create_uri = getRequestUri("department_create_uri"); JSONObject obj = (JSONObject) JSON.toJSON(depart); - obj.remove("id"); + if (depart.getId() < 1) { + obj.remove("id"); + } Token token = tokenHolder.getToken(); WeixinResponse response = weixinClient.post( String.format(department_create_uri, token.getAccessToken()), @@ -75,7 +77,8 @@ public class PartyApi extends QyApi { /** * 查询部门列表(以部门的order字段从小到大排列) * - * @param partId 部门ID。获取指定部门ID下的子部门 + * @param partId + * 部门ID。获取指定部门ID下的子部门 * @see com.foxinmy.weixin4j.qy.model.Party * @see 获取部门列表 @@ -85,8 +88,8 @@ public class PartyApi extends QyApi { public List listParty(int partId) throws WeixinException { String department_list_uri = getRequestUri("department_list_uri"); Token token = tokenHolder.getToken(); - WeixinResponse response = weixinClient.post(String.format(department_list_uri, - token.getAccessToken())); + WeixinResponse response = weixinClient.post(String.format( + department_list_uri, token.getAccessToken())); return JSON.parseArray(response.getAsJson().getString("department"), Party.class); } @@ -104,8 +107,8 @@ public class PartyApi extends QyApi { public JsonResult deleteParty(int partId) throws WeixinException { String department_delete_uri = getRequestUri("department_delete_uri"); Token token = tokenHolder.getToken(); - WeixinResponse response = weixinClient.post(String.format(department_delete_uri, - token.getAccessToken(), partId)); + WeixinResponse response = weixinClient.post(String.format( + department_delete_uri, token.getAccessToken(), partId)); return response.getAsJsonResult(); } } diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/BatchTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/BatchTest.java index c2390399..c79743bd 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/BatchTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/BatchTest.java @@ -34,7 +34,7 @@ public class BatchTest extends TokenTest { @Test public void syncuser() throws WeixinException { String jobId = batchApi - .syncuser( + .syncUser( "1QFmZ8LE9dFxPPx8EH5Kfm3cqGXB0OuXY432ZpsfwMFTJjEDt7QI4GZB1UhYGOSYr", new Callback("http://182.254.188.133:8090", "gp2eGT5mIpngr", @@ -46,7 +46,7 @@ public class BatchTest extends TokenTest { public void replaceparty() throws WeixinException { String mediaId = mediaApi.batchUploadParties(Arrays.asList(new Party(5, "部门1", 1, 1), new Party(6, "部门2", 1, 1))); - String jobId = batchApi.replaceparty(mediaId, new Callback( + String jobId = batchApi.replaceParty(mediaId, new Callback( "http://182.254.188.133:8090", "gp2eGT5mIpngr", "BRYfV4zPFUJb3v3MySNBg1ERKE3vyyMRoScu76vFySv")); System.err.println(jobId); diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/HelperTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/HelperTest.java index 50697983..1c9f431d 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/HelperTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/HelperTest.java @@ -28,7 +28,7 @@ public class HelperTest extends TokenTest { @Test public void backip() throws WeixinException { - List ips = helperApi.getcallbackip(); + List ips = helperApi.getCallbackip(); Assert.assertTrue(ips != null && !ips.isEmpty()); System.out.println(ips); } diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java index 174151ad..f3748364 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java @@ -4,7 +4,6 @@ import javax.xml.bind.annotation.XmlElement; import com.foxinmy.weixin4j.message.event.EventMessage; import com.foxinmy.weixin4j.type.EventType; -import com.foxinmy.weixin4j.util.MessageUtil; /** * 群发消息事件推送 @@ -55,18 +54,6 @@ public class MassEventMessage extends EventMessage { return status; } - /** - * 发送状态描述
err(10001,涉嫌广告) err(20001,涉嫌政治) err(20004,涉嫌社会)
- * err(20002,涉嫌色情) err(20006,涉嫌违法犯罪) err(20008,涉嫌欺诈)
err(20013,涉嫌版权) - * err(22000,涉嫌互推(互相宣传) err(21000,涉嫌其他) - * - * @param status - * @return 中文描述 - */ - public String getStatusDesc() { - return MessageUtil.getMassStatusDesc(status.toLowerCase()); - } - public int getTotalCount() { return totalCount; } @@ -85,7 +72,7 @@ public class MassEventMessage extends EventMessage { @Override public String toString() { - return "MassEventMessage [status=" + getStatusDesc() + ", totalCount=" + return "MassEventMessage [status=" + status + ", totalCount=" + totalCount + ", filterCount=" + filterCount + ", sentCount=" + sentCount + ", errorCount=" + errorCount + ", " + super.toString() + "]"; diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java index 98f8ad16..df47ad78 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java @@ -1,8 +1,6 @@ package com.foxinmy.weixin4j.util; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; @@ -155,36 +153,4 @@ public final class MessageUtil { } return xmlContent; } - - private final static Map massStatusMap; - static { - massStatusMap = new HashMap(); - massStatusMap.put("sendsuccess", "发送成功"); - massStatusMap.put("send_success", "发送成功"); - massStatusMap.put("success", "发送成功"); - massStatusMap.put("send success", "发送成功"); - massStatusMap.put("sendfail", "发送失败"); - massStatusMap.put("send_fail", "发送失败"); - massStatusMap.put("fail", "发送失败"); - massStatusMap.put("send fail", "发送失败"); - massStatusMap.put("err(10001)", "涉嫌广告"); - massStatusMap.put("err(20001)", "涉嫌政治"); - massStatusMap.put("err(20004)", "涉嫌社会"); - massStatusMap.put("err(20006)", "涉嫌违法犯罪"); - massStatusMap.put("err(20008)", "涉嫌欺诈"); - massStatusMap.put("err(20013)", "涉嫌版权"); - massStatusMap.put("err(22000)", "涉嫌互推(互相宣传)"); - massStatusMap.put("err(21000)", "涉嫌其他"); - } - - /** - * 获取群发状态描述 - * - * @param status - * 状态 - * @return - */ - public static String getMassStatusDesc(String status) { - return massStatusMap.get(status); - } }