优化代码，规范变量命名

Author: binarywang

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java

@@ -1,6 +1,8 @@
 package me.chanjar.weixin.mp.bean.kefu;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.builder.kefu.*;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
@@ -35,12 +37,11 @@ public class WxMpKefuMessage implements Serializable {
   private String headContent;
   private String tailContent;
   private List<WxArticle> articles = new ArrayList<>();
-  private List<WxMsgMenu> list = new ArrayList<>();
+
   /**
    * 菜单消息里的菜单内容.
-   * 请使用逗号分割的形式将id和content连起来放在数组的里面
    */
-  private String[] msgMenuList;
+  private List<MsgMenu> msgMenus = new ArrayList<>();
 
   /**
    * 获得文本消息builder.
@@ -137,6 +138,8 @@ public String toJson() {
   }
 
   @Data
+  @AllArgsConstructor
+  @NoArgsConstructor
   public static class WxArticle implements Serializable {
     private static final long serialVersionUID = 5145137235440507379L;
 
@@ -147,7 +150,11 @@ public static class WxArticle implements Serializable {
   }
 
   @Data
-  public static class WxMsgMenu implements Serializable {
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class MsgMenu implements Serializable {
+    private static final long serialVersionUID = 7020769047598378839L;
+
     private String id;
     private String content;
   }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxMsgMenuBuilder.java

@@ -11,13 +11,13 @@
  * 菜单消息builder
  * <pre>
  * 用法:
- * WxMpKefuMessage m = WxMpKefuMessage.MSGMENU().addList(lists).headContent(headContent).tailContent(tailContent).toUser(...).build();
+ * WxMpKefuMessage m = WxMpKefuMessage.MSGMENU().addMenus(lists).headContent(headContent).tailContent(tailContent).toUser(...).build();
  * </pre>
  *
  * @author billytomato
  */
 public final class WxMsgMenuBuilder extends BaseBuilder<WxMsgMenuBuilder> {
-  private List<WxMpKefuMessage.WxMsgMenu> list = new ArrayList<>();
+  private List<WxMpKefuMessage.MsgMenu> msgMenus = new ArrayList<>();
   private String headContent;
   private String tailContent;
 
@@ -26,13 +26,13 @@ public WxMsgMenuBuilder() {
     this.msgType = WxConsts.KefuMsgType.MSGMENU;
   }
 
-  public WxMsgMenuBuilder addList(WxMpKefuMessage.WxMsgMenu... list) {
-    Collections.addAll(this.list, list);
+  public WxMsgMenuBuilder addMenus(WxMpKefuMessage.MsgMenu... msgMenus) {
+    Collections.addAll(this.msgMenus, msgMenus);
     return this;
   }
 
-  public WxMsgMenuBuilder list(List<WxMpKefuMessage.WxMsgMenu> list) {
-    this.list = list;
+  public WxMsgMenuBuilder msgMenus(List<WxMpKefuMessage.MsgMenu> msgMenus) {
+    this.msgMenus = msgMenus;
     return this;
   }
 
@@ -51,7 +51,7 @@ public WxMpKefuMessage build() {
     WxMpKefuMessage m = super.build();
     m.setHeadContent(this.headContent);
     m.setTailContent(this.tailContent);
-    m.setList(this.list);
+    m.setMsgMenus(this.msgMenus);
     return m;
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java

@@ -83,7 +83,7 @@ public JsonElement serialize(WxMpKefuMessage message, Type typeOfSrc, JsonSerial
       case KefuMsgType.MSGMENU: {
           JsonObject msgmenuJsonObject = new JsonObject();
           JsonArray listJsonArray = new JsonArray();
-          for (WxMpKefuMessage.WxMsgMenu list : message.getList()) {
+          for (WxMpKefuMessage.MsgMenu list : message.getMsgMenus()) {
             JsonObject listJson = new JsonObject();
             listJson.addProperty("id", list.getId());
             listJson.addProperty("content", list.getContent());

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessageTest.java

@@ -5,8 +5,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @Test
 public class WxMpKefuMessageTest {
 
@@ -156,18 +154,10 @@ public void testMiniProgramPageBuild() {
   }
 
   public void testMsgMenuBuild() {
-
-    WxMpKefuMessage.WxMsgMenu wxMsgMenu1=new WxMpKefuMessage.WxMsgMenu();
-    wxMsgMenu1.setId("101");
-    wxMsgMenu1.setContent("msgmenu1");
-
-    WxMpKefuMessage.WxMsgMenu wxMsgMenu2=new WxMpKefuMessage.WxMsgMenu();
-    wxMsgMenu2.setId("102");
-    wxMsgMenu2.setContent("msgmenu2");
-
     WxMpKefuMessage reply = WxMpKefuMessage.MSGMENU()
       .toUser("OPENID")
-      .addList(wxMsgMenu1).addList(wxMsgMenu2)
+      .addMenus(new WxMpKefuMessage.MsgMenu("101", "msgmenu1"),
+        new WxMpKefuMessage.MsgMenu("102", "msgmenu2"))
       .headContent("head_content")
       .tailContent("tail_content")
       .build();