diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java index ceb62cdf..37beb77e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java +++ b/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 articles = new ArrayList<>(); - private List list = new ArrayList<>(); + /** * 菜单消息里的菜单内容. - * 请使用逗号分割的形式将id和content连起来放在数组的里面 */ - private String[] msgMenuList; + private List msgMenus = new ArrayList<>(); /** * 获得文本消息builder. @@ -137,6 +138,8 @@ public class WxMpKefuMessage implements Serializable { } @Data + @AllArgsConstructor + @NoArgsConstructor public static class WxArticle implements Serializable { private static final long serialVersionUID = 5145137235440507379L; @@ -147,7 +150,11 @@ public class WxMpKefuMessage 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; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxMsgMenuBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxMsgMenuBuilder.java index 06f6bbd3..ac3edc23 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxMsgMenuBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxMsgMenuBuilder.java @@ -11,13 +11,13 @@ import java.util.List; * 菜单消息builder *
  * 用法:
- * WxMpKefuMessage m = WxMpKefuMessage.MSGMENU().addList(lists).headContent(headContent).tailContent(tailContent).toUser(...).build();
+ * WxMpKefuMessage m = WxMpKefuMessage.MSGMENU().addMenus(lists).headContent(headContent).tailContent(tailContent).toUser(...).build();
  * 
* * @author billytomato */ public final class WxMsgMenuBuilder extends BaseBuilder { - private List list = new ArrayList<>(); + private List msgMenus = new ArrayList<>(); private String headContent; private String tailContent; @@ -26,13 +26,13 @@ public final class WxMsgMenuBuilder extends BaseBuilder { 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 list) { - this.list = list; + public WxMsgMenuBuilder msgMenus(List msgMenus) { + this.msgMenus = msgMenus; return this; } @@ -51,7 +51,7 @@ public final class WxMsgMenuBuilder extends BaseBuilder { WxMpKefuMessage m = super.build(); m.setHeadContent(this.headContent); m.setTailContent(this.tailContent); - m.setList(this.list); + m.setMsgMenus(this.msgMenus); return m; } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java index 57eee1b7..e9e5112d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java @@ -83,7 +83,7 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer