From b648c554445199178f756f3ddd4e5afca2741fbe Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Wed, 25 Feb 2015 15:36:19 +0800 Subject: [PATCH 1/7] upgrade to 1.1.3-SNAPSHOT --- pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 74032e85..f4656864 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 me.chanjar weixin-java-parent - 1.1.2 + 1.1.3-SNAPSHOT pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index cf886ba5..b8909d66 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.2 + 1.1.3-SNAPSHOT weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 779ef63c..c5195870 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.2 + 1.1.3-SNAPSHOT weixin-java-cp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index c4ed287e..a102ff3e 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.2 + 1.1.3-SNAPSHOT weixin-java-mp WeiXin Java Tools - MP From 0ae7a75f5637032569ab5ff16c171137fe127b89 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Thu, 26 Feb 2015 15:05:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?issue=20#109=20=E4=BC=81=E4=B8=9A=E5=8F=B7?= =?UTF-8?q?=E5=87=A0=E4=B8=AA=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0agentId?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/cp/api/WxCpService.java | 74 +++++++++++++++++++ .../weixin/cp/api/WxCpServiceImpl.java | 31 +++++++- 2 files changed, 101 insertions(+), 4 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java index 164a0874..70d59046 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java @@ -155,34 +155,87 @@ public interface WxCpService { *
    * 自定义菜单创建接口
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口
+   *
+   * 注意: 这个方法使用WxCpConfigStorage里的agentId
    * 
+ * @see #menuCreate(String, me.chanjar.weixin.common.bean.WxMenu) * * @param menu * @throws WxErrorException */ void menuCreate(WxMenu menu) throws WxErrorException; + /** + *
+   * 自定义菜单创建接口
+   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口
+   *
+   * 注意: 这个方法不使用WxCpConfigStorage里的agentId,需要开发人员自己给出
+   * 
+ * @see #menuCreate(me.chanjar.weixin.common.bean.WxMenu) + * + * @param agentId 企业号应用的id + * @param menu + * @throws WxErrorException + */ + void menuCreate(String agentId, WxMenu menu) throws WxErrorException; + /** *
    * 自定义菜单删除接口
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单删除接口
+   *
+   * 注意: 这个方法使用WxCpConfigStorage里的agentId
    * 
+ * @see #menuDelete(String) * * @throws WxErrorException */ void menuDelete() throws WxErrorException; + /** + *
+   * 自定义菜单删除接口
+   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单删除接口
+   *
+   * 注意: 这个方法不使用WxCpConfigStorage里的agentId,需要开发人员自己给出
+   * 
+ * @see #menuDelete() + * + * @param agentId 企业号应用的id + * @throws WxErrorException + */ + void menuDelete(String agentId) throws WxErrorException; + /** *
    * 自定义菜单查询接口
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单查询接口
+   *
+   * 注意: 这个方法使用WxCpConfigStorage里的agentId
    * 
+ * @see #menuGet(String) * * @return * @throws WxErrorException */ WxMenu menuGet() throws WxErrorException; + /** + *
+   * 自定义菜单查询接口
+   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单查询接口
+   *
+   * 注意: 这个方法不使用WxCpConfigStorage里的agentId,需要开发人员自己给出
+   * 
+ * @see #menuGet() + * + * @param agentId 企业号应用的id + * @return + * @throws WxErrorException + */ + WxMenu menuGet(String agentId) throws WxErrorException; + /** *
    * 部门管理接口 - 创建部门
@@ -364,12 +417,33 @@ public interface WxCpService {
    * 用oauth2获取用户信息
    * http://qydev.weixin.qq.com/wiki/index.php?title=根据code获取成员信息
    * 因为企业号oauth2.0必须在应用设置里设置通过ICP备案的可信域名,所以无法测试,因此这个方法很可能是坏的。
+   *
+   * 注意: 这个方法使用WxCpConfigStorage里的agentId
    * 
+ * @see #oauth2getUserInfo(String, String) + * * @param code * @return [userid, deviceid] */ String[] oauth2getUserInfo(String code) throws WxErrorException; + /** + *
+   * 用oauth2获取用户信息
+   * http://qydev.weixin.qq.com/wiki/index.php?title=根据code获取成员信息
+   * 因为企业号oauth2.0必须在应用设置里设置通过ICP备案的可信域名,所以无法测试,因此这个方法很可能是坏的。
+   *
+   * 注意: 这个方法不使用WxCpConfigStorage里的agentId,需要开发人员自己给出
+   * 
+ * @see #oauth2getUserInfo(String) + * + * @param agentId 企业号应用的id + * @param code + * @return [userid, deviceid] + */ + String[] oauth2getUserInfo(String agentId, String code) throws WxErrorException; + + /** * 移除标签成员 * diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java index c5b5e792..1c2e16e7 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java @@ -180,18 +180,36 @@ public class WxCpServiceImpl implements WxCpService { post(url, message.toJson()); } + @Override public void menuCreate(WxMenu menu) throws WxErrorException { + menuCreate(wxCpConfigStorage.getAgentId(), menu); + } + + @Override + public void menuCreate(String agentId, WxMenu menu) throws WxErrorException { String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/create?agentid=" + wxCpConfigStorage.getAgentId(); post(url, menu.toJson()); } + @Override public void menuDelete() throws WxErrorException { - String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete?agentid=" + wxCpConfigStorage.getAgentId(); + menuDelete(wxCpConfigStorage.getAgentId()); + } + + @Override + public void menuDelete(String agentId) throws WxErrorException { + String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete?agentid=" + agentId; get(url, null); } + @Override public WxMenu menuGet() throws WxErrorException { - String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get?agentid=" + wxCpConfigStorage.getAgentId(); + return menuGet(wxCpConfigStorage.getAgentId()); + } + + @Override + public WxMenu menuGet(String agentId) throws WxErrorException { + String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get?agentid=" + agentId; try { String resultContent = get(url, null); return WxMenu.fromJson(resultContent); @@ -427,9 +445,14 @@ public class WxCpServiceImpl implements WxCpService { @Override public String[] oauth2getUserInfo(String code) throws WxErrorException { + return oauth2getUserInfo(code, wxCpConfigStorage.getAgentId()); + } + + @Override + public String[] oauth2getUserInfo(String agentId, String code) throws WxErrorException { String url = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?" - + "code=" + code - + "&agendid=" + wxCpConfigStorage.getAgentId(); + + "code=" + code + + "&agendid=" + agentId; String responseText = get(url, null); JsonElement je = Streams.parse(new JsonReader(new StringReader(responseText))); JsonObject jo = je.getAsJsonObject(); From 8a7192813dbdf5248804d9143590af346e11d8ac Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Thu, 26 Feb 2015 15:12:03 +0800 Subject: [PATCH 3/7] fix README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1136a653..4e5dfd56 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ weixin-java-tools me.chanjar weixin-java-mp - 1.1.1 + 1.1.3 ``` @@ -27,7 +27,7 @@ weixin-java-tools me.chanjar weixin-java-cp - 1.1.1 + 1.1.3 ``` From 913f49e470908b7c523920f59a0e3c9ab813caec Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 20 Mar 2015 14:24:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/TestNonAtomicLongAssignment.java | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 weixin-java-mp/src/main/java/TestNonAtomicLongAssignment.java diff --git a/weixin-java-mp/src/main/java/TestNonAtomicLongAssignment.java b/weixin-java-mp/src/main/java/TestNonAtomicLongAssignment.java deleted file mode 100644 index e86d89fe..00000000 --- a/weixin-java-mp/src/main/java/TestNonAtomicLongAssignment.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Created by qianjia on 15/1/25. - */ -public class TestNonAtomicLongAssignment { - - private static final long HI = 1l << 32; - private static final long LO = 1l; - - private static final long TEST_NUMBER = HI | LO; - - private static long assignee = 0l; - - public static void main(String[] args) { - - Thread writer = new Thread(new Runnable() { - @Override - public void run() { - while (true) { - assignee = TEST_NUMBER; - } - } - }); - writer.setDaemon(true); - - Thread reader = new Thread(new Runnable() { - @Override - public void run() { - long i = 0; - while (true) { - i++; - long test = assignee; - if (test != TEST_NUMBER) { - System.out.print(i + " times:" + toBin(test)); - break; - } - } - } - }); - - // Thread worker = new Thread(new Runnable() { - // @Override - // public void run() { - // double d = 89009808877238948224343435452333323113131313133434434341212323232424243434335354232390490189190420928348910913094983.323334401928d; - // while(true) { - // Math.cbrt(d); - // d = d - 1l; - // } - // } - // }); - // worker.setDaemon(true); - // worker.start(); - - writer.start(); - reader.start(); - - } - - public static String toBin(long n) { - StringBuilder sb = new StringBuilder(Long.toBinaryString(n)); - int padding = 64 - sb.length(); - while (padding > 0) { - sb.insert(0, '0'); - padding--; - } - return sb.toString(); - } - -} From b885d2a1a925c2f15e25a9bcb08984c16eb08f35 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 20 Mar 2015 14:59:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?#111=20=E7=9A=84unit=20test=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/common/bean/WxMenu.java | 21 ++++++++- .../weixin/mp/api/WxMpMenuAPITest.java | 47 ++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java index 912d47c9..c92da3f3 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java @@ -36,7 +36,14 @@ public class WxMenu implements Serializable { public static WxMenu fromJson(InputStream is) { return WxGsonBuilder.create().fromJson(new InputStreamReader(is), WxMenu.class); } - + + @Override + public String toString() { + return "WxMenu{" + + "buttons=" + buttons + + '}'; + } + public static class WxMenuButton { private String type; @@ -85,7 +92,17 @@ public class WxMenu implements Serializable { public void setSubButtons(List subButtons) { this.subButtons = subButtons; } - + + @Override + public String toString() { + return "WxMenuButton{" + + "type='" + type + '\'' + + ", name='" + name + '\'' + + ", key='" + key + '\'' + + ", url='" + url + '\'' + + ", subButtons=" + subButtons + + '}'; + } } } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMenuAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMenuAPITest.java index 01acb179..581c67ee 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMenuAPITest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMenuAPITest.java @@ -24,9 +24,54 @@ public class WxMpMenuAPITest { @Test(dataProvider = "menu") public void testCreateMenu(WxMenu wxMenu) throws WxErrorException { + System.out.println(wxMenu.toJson()); wxService.menuCreate(wxMenu); } - + + @Test + public void testCreateMenu2() throws WxErrorException { + String a = "{\n" + + " \"menu\": {\n" + + " \"button\": [\n" + + " {\n" + + " \"type\": \"click\",\n" + + " \"name\": \"今日歌曲\",\n" + + " \"key\": \"V1001_TODAY_MUSIC\"\n" + + " },\n" + + " {\n" + + " \"type\": \"click\",\n" + + " \"name\": \"歌手简介\",\n" + + " \"key\": \"V1001_TODAY_SINGER\"\n" + + " },\n" + + " {\n" + + " \"name\": \"菜单\",\n" + + " \"sub_button\": [\n" + + " {\n" + + " \"type\": \"view\",\n" + + " \"name\": \"搜索\",\n" + + " \"url\": \"http://www.soso.com/\"\n" + + " },\n" + + " {\n" + + " \"type\": \"view\",\n" + + " \"name\": \"视频\",\n" + + " \"url\": \"http://v.qq.com/\"\n" + + " },\n" + + " {\n" + + " \"type\": \"click\",\n" + + " \"name\": \"赞一下我们\",\n" + + " \"key\": \"V1001_GOOD\"\n" + + " }\n" + + " ]\n" + + " }\n" + + " ]\n" + + " }\n" + + "}"; + + WxMenu menu = WxMenu.fromJson(a); + System.out.println(menu.toJson()); + wxService.menuCreate(menu); + } + @Test(dependsOnMethods = { "testCreateMenu"}) public void testGetMenu() throws WxErrorException { Assert.assertNotNull(wxService.menuGet()); From 8254caf9ed5f46450ecb579ac5a054249aba0273 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 20 Mar 2015 15:05:26 +0800 Subject: [PATCH 6/7] #111 --- .../me/chanjar/weixin/common/bean/WxMenu.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java index c92da3f3..38d960fc 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java @@ -28,11 +28,23 @@ public class WxMenu implements Serializable { public String toJson() { return WxGsonBuilder.create().toJson(this); } - + + /** + * 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化 + * 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式,外层多套了一个menu + * @param json + * @return + */ public static WxMenu fromJson(String json) { return WxGsonBuilder.create().fromJson(json, WxMenu.class); } - + + /** + * 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化 + * 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式,外层多套了一个menu + * @param is + * @return + */ public static WxMenu fromJson(InputStream is) { return WxGsonBuilder.create().fromJson(new InputStreamReader(is), WxMenu.class); } From 0c66505e451abb3a17fa33a96c6f2d56e6d74006 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 20 Mar 2015 17:40:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?#111=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B3=BB=E7=BB=9F=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?WxMenu=E6=97=B6=EF=BC=8C=E5=9C=A8windows=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8B=E4=BC=9A=E5=AD=98=E5=9C=A8=E7=BC=96=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/chanjar/weixin/common/bean/WxMenu.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java index 38d960fc..8e40c113 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java @@ -3,10 +3,12 @@ package me.chanjar.weixin.common.bean; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Serializable; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import me.chanjar.weixin.common.util.json.WxGsonBuilder; +import org.apache.commons.codec.Charsets; /** * 企业号菜单 @@ -46,7 +48,7 @@ public class WxMenu implements Serializable { * @return */ public static WxMenu fromJson(InputStream is) { - return WxGsonBuilder.create().fromJson(new InputStreamReader(is), WxMenu.class); + return WxGsonBuilder.create().fromJson(new InputStreamReader(is, Charsets.UTF_8), WxMenu.class); } @Override