fix binarywang#56 分组群发消息没有 is_to_all 字段

chanjarster · chanjarster · commit b47cd3a18a99 · 2014-12-19T12:21:47.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java
@@ -9,7 +9,7 @@
  */
 public class WxMpMassGroupMessage {
   
-  private long groupId;
+  private Long groupId;
   private String msgtype;
   private String content;
   private String mediaId;
@@ -58,11 +58,15 @@ public String toJson() {
     return WxMpGsonBuilder.INSTANCE.create().toJson(this);
   }
 
-  public long getGroupId() {
+  public Long getGroupId() {
     return groupId;
   }
 
-  public void setGroupId(long groupId) {
+  /**
+   * 如果不设置则就意味着发给所有用户
+   * @param groupId
+   */
+  public void setGroupId(Long groupId) {
     this.groupId = groupId;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -14,7 +14,7 @@ public class WxMpGsonBuilder {
     INSTANCE.disableHtmlEscaping();
     INSTANCE.registerTypeAdapter(WxMpCustomMessage.class, new WxMpCustomMessageGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMassNews.class, new WxMpMassNewsGsonAdapter());
-    INSTANCE.registerTypeAdapter(WxMpMassGroupMessage.class, new WxMpMassMessageGsonAdapter());
+    INSTANCE.registerTypeAdapter(WxMpMassGroupMessage.class, new WxMpMassGroupMessageGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMassOpenIdsMessage.class, new WxMpMassOpenIdsMessageGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpGroup.class, new WxMpGroupGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpUser.class, new WxUserGsonAdapter());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
@@ -22,13 +22,18 @@
  * @author qianjia
  *
  */
-public class WxMpMassMessageGsonAdapter implements JsonSerializer<WxMpMassGroupMessage> {
+public class WxMpMassGroupMessageGsonAdapter implements JsonSerializer<WxMpMassGroupMessage> {
 
   public JsonElement serialize(WxMpMassGroupMessage message, Type typeOfSrc, JsonSerializationContext context) {
     JsonObject messageJson = new JsonObject();
     
     JsonObject filter = new JsonObject();
-    filter.addProperty("group_id", message.getGroupId());
+    if(null == message.getGroupId()) {
+      filter.addProperty("is_to_all", true);
+    } else {
+      filter.addProperty("is_to_all", false);
+      filter.addProperty("group_id", message.getGroupId());
+    }
     messageJson.add("filter", filter);
     
     if (WxConsts.MASS_MSG_NEWS.equals(message.getMsgtype())) {
