群发预览消息格式中加入对towxname和touser的支持

Author: binarywang

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java

@@ -9,7 +9,8 @@
  */
 public class WxMpMassPreviewMessage implements Serializable {
   private static final long serialVersionUID = 9095211638358424020L;
-  private String toWxUsername;
+  private String toWxUserName;
+  private String toWxUserOpenid;
   private String msgType;
   private String content;
   private String mediaId;
@@ -18,12 +19,12 @@ public WxMpMassPreviewMessage() {
     super();
   }
 
-  public String getToWxUsername() {
-    return this.toWxUsername;
+  public String getToWxUserName() {
+    return this.toWxUserName;
   }
 
-  public void setToWxUsername(String toWxUsername) {
-    this.toWxUsername = toWxUsername;
+  public void setToWxUserName(String toWxUserName) {
+    this.toWxUserName = toWxUserName;
   }
 
   public String getMsgType() {
@@ -41,7 +42,7 @@ public String getMsgType() {
    * 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误
    * </pre>
    *
-   * @param msgType
+   * @param msgType 消息类型
    */
   public void setMsgType(String msgType) {
     this.msgType = msgType;
@@ -63,6 +64,14 @@ public void setMediaId(String mediaId) {
     this.mediaId = mediaId;
   }
 
+  public String getToWxUserOpenid() {
+    return this.toWxUserOpenid;
+  }
+
+  public void setToWxUserOpenid(String toWxUserOpenid) {
+    this.toWxUserOpenid = toWxUserOpenid;
+  }
+
   public String toJson() {
     return WxMpGsonBuilder.INSTANCE.create().toJson(this);
   }

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

@@ -17,6 +17,7 @@ public class WxMpMassPreviewMessageGsonAdapter implements JsonSerializer<WxMpMas
   public JsonElement serialize(WxMpMassPreviewMessage wxMpMassPreviewMessage, Type type, JsonSerializationContext jsonSerializationContext) {
     JsonObject jsonObject = new JsonObject();
     jsonObject.addProperty("towxname", wxMpMassPreviewMessage.getToWxUsername());
+    jsonObject.addProperty("touser", wxMpMassPreviewMessage.getToWxUserOpenid());
     if (WxConsts.MASS_MSG_NEWS.equals(wxMpMassPreviewMessage.getMsgType())) {
       JsonObject news = new JsonObject();
       news.addProperty("media_id", wxMpMassPreviewMessage.getMediaId());