菜单接口支持

chanjarster · chanjarster · commit 93f8726029a2 · 2014-10-21T18:57:31.000+08:00
diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java
@@ -107,17 +107,17 @@ public void messageSend(WxCpMessage message) throws WxErrorException {
   }
 
   public void menuCreate(WxCpMenu menu) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/create?agentid=" + wxCpConfigStorage.getAgentId();
     execute(new SimplePostRequestExecutor(), url, menu.toJson());
   }
 
   public void menuDelete() throws WxErrorException {
-    String url = "https://api.weixin.qq.com/cgi-bin/menu/delete";
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete?agentid=" + wxCpConfigStorage.getAgentId();
     execute(new SimpleGetRequestExecutor(), url, null);
   }
 
   public WxCpMenu menuGet() throws WxErrorException {
-    String url = "https://api.weixin.qq.com/cgi-bin/menu/get";
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get?agentid=" + wxCpConfigStorage.getAgentId();
     try {
       String resultContent = execute(new SimpleGetRequestExecutor(), url, null);
       return WxCpMenu.fromJson(resultContent);
diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java
@@ -65,7 +65,8 @@ public WxCpMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
      * 查询菜单时是 { menu : { button : ... } }
      */
     WxCpMenu menu = new WxCpMenu();
-    JsonArray buttonsJson = json.getAsJsonObject().get("button").getAsJsonArray();
+    JsonObject menuJson = json.getAsJsonObject().get("menu").getAsJsonObject();
+    JsonArray buttonsJson = menuJson.get("button").getAsJsonArray();
     for (int i = 0; i < buttonsJson.size(); i++) {
       JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject();
       WxCpMenu.WxMenuButton button = convertFromJson(buttonJson);
diff --git a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java
@@ -18,7 +18,8 @@
  * @author Daniel Qian
  *
  */
-@Test(groups="menuAPI", dependsOnGroups="baseAPI")
+//@Test(groups="menuAPI", dependsOnGroups="baseAPI")
+@Test
 @Guice(modules = ApiTestModule.class)
 public class WxCpMenuAPITest {
 

Original file line number	Diff line number	Diff line change
`@@ -107,17 +107,17 @@ public void messageSend(WxCpMessage message) throws WxErrorException {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public void menuCreate(WxCpMenu menu) throws WxErrorException {`
`110`		`- String url = "https://api.weixin.qq.com/cgi-bin/menu/create";`
	`110`	`+ String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/create?agentid=" + wxCpConfigStorage.getAgentId();`
`111`	`111`	`execute(new SimplePostRequestExecutor(), url, menu.toJson());`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public void menuDelete() throws WxErrorException {`
`115`		`- String url = "https://api.weixin.qq.com/cgi-bin/menu/delete";`
	`115`	`+ String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete?agentid=" + wxCpConfigStorage.getAgentId();`
`116`	`116`	`execute(new SimpleGetRequestExecutor(), url, null);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public WxCpMenu menuGet() throws WxErrorException {`
`120`		`- String url = "https://api.weixin.qq.com/cgi-bin/menu/get";`
	`120`	`+ String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get?agentid=" + wxCpConfigStorage.getAgentId();`
`121`	`121`	`try {`
`122`	`122`	`String resultContent = execute(new SimpleGetRequestExecutor(), url, null);`
`123`	`123`	`return WxCpMenu.fromJson(resultContent);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@`
`18`	`18`	`* @author Daniel Qian`
`19`	`19`	`*`
`20`	`20`	`*/`
`21`		`-@Test(groups="menuAPI", dependsOnGroups="baseAPI")`
	`21`	`+//@Test(groups="menuAPI", dependsOnGroups="baseAPI")`
	`22`	`+@Test`
`22`	`23`	`@Guice(modules = ApiTestModule.class)`
`23`	`24`	`public class WxCpMenuAPITest {`
`24`	`25`