Merge branch 'wxMenuRule' into develop

Author: binarywang

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java

@@ -131,20 +131,20 @@ public String toString() {
   }
 
   public static class WxMenuRule {
-    private String groupId;
+    private String tagId;
     private String sex;
     private String country;
     private String province;
     private String city;
     private String clientPlatformType;
     private String language;
 
-    public String getGroupId() {
-      return groupId;
+    public String getTagId() {
+      return tagId;
     }
 
-    public void setGroupId(String groupId) {
-      this.groupId = groupId;
+    public void setTagId(String tagId) {
+      this.tagId = tagId;
     }
 
     public String getSex() {
@@ -198,7 +198,7 @@ public void setLanguage(String language) {
       @Override
     public String toString() {
       return "matchrule:{" +
-          "group_id='" + groupId + '\'' +
+          "tag_id='" + tagId + '\'' +
           ", sex='" + sex + '\'' +
           ", country" + country + '\'' +
           ", province" + province + '\'' +

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java

@@ -62,7 +62,7 @@ protected JsonObject convertToJson(WxMenu.WxMenuButton button) {
 
   protected JsonObject convertToJson(WxMenu.WxMenuRule menuRule){
     JsonObject matchRule = new JsonObject();
-    matchRule.addProperty("group_id",menuRule.getGroupId());
+    matchRule.addProperty("tag_id",menuRule.getTagId());
     matchRule.addProperty("sex",menuRule.getSex());
     matchRule.addProperty("country",menuRule.getCountry());
     matchRule.addProperty("province",menuRule.getProvince());

weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java

@@ -67,7 +67,7 @@ public void testAddConditionalToJson(String json) {
     menu.getButtons().add(button1);
 
     WxMenu.WxMenuRule wxMenuRule = new WxMenu.WxMenuRule();
-    wxMenuRule.setGroupId("2");
+    wxMenuRule.setTagId("2");
     wxMenuRule.setSex("1");
     wxMenuRule.setCountry("中国");
     wxMenuRule.setProvince("广东");