#136 修复WxMenuRule反序列化的问题tag_id为空的问题

binarywang · Sep 11, 2017 · 3875635 · 3875635
1 parent 7c3f6cc
commit 3875635
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java
@@ -1,12 +1,17 @@
 package me.chanjar.weixin.common.bean.menu;
 
+import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
 import java.io.Serializable;
 
 public class WxMenuRule implements Serializable {
   private static final long serialVersionUID = -4587181819499286670L;
 
+  /**
+   * 变态的微信接口，反序列化时这里反人类的使用和序列化时不一样的名字
+   */
+  @SerializedName(value = "tag_id", alternate = "group_id")
   private String tagId;
   private String sex;
   private String country;

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
@@ -70,6 +70,7 @@ protected JsonObject convertToJson(WxMenuRule menuRule) {
     return matchRule;
   }
 
+  @Deprecated
   private WxMenuRule convertToRule(JsonObject json) {
     WxMenuRule menuRule = new WxMenuRule();
     //变态的微信接口，这里居然反人类的使用和序列化时不一样的名字

diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImplTest.java
@@ -9,9 +9,10 @@
 import me.chanjar.weixin.mp.api.test.ApiTestModule;
 import me.chanjar.weixin.mp.bean.menu.WxMpGetSelfMenuInfoResult;
 import me.chanjar.weixin.mp.bean.menu.WxMpMenu;
-import org.testng.*;
 import org.testng.annotations.*;
 
+import static org.testng.Assert.*;
+
 /**
  * 测试菜单
  *
@@ -87,6 +88,14 @@ public void testCreateConditionalMenu() throws WxErrorException {
     System.out.println(this.menuId);
   }
 
+  @Test(dependsOnMethods = {"testCreateConditionalMenu"})
+  public void testMenuGet_AfterCreateConditionalMenu() throws WxErrorException {
+    WxMpMenu wxMenu = this.wxService.getMenuService().menuGet();
+    assertNotNull(wxMenu);
+    System.out.println(wxMenu.toJson());
+    assertNotNull(wxMenu.getConditionalMenu().get(0).getRule().getTagId());
+  }
+
   @Test(dependsOnMethods = {"testCreateConditionalMenu"})
   public void testDeleteConditionalMenu() throws WxErrorException {
     this.wxService.getMenuService().menuDelete(menuId);
@@ -134,7 +143,7 @@ public void testCreateMenu_by_json() throws WxErrorException {
   @Test(dependsOnMethods = {"testMenuCreate"})
   public void testMenuGet() throws WxErrorException {
     WxMpMenu wxMenu = this.wxService.getMenuService().menuGet();
-    Assert.assertNotNull(wxMenu);
+    assertNotNull(wxMenu);
     System.out.println(wxMenu.toJson());
   }