diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeData.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeData.java deleted file mode 100644 index 048e6dae8..000000000 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeData.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.binarywang.wx.miniapp.bean; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - *
- * 参考文档 https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
- * 
- */ -@Data -@NoArgsConstructor -public class WxMaSubscribeData { - private String name; - private String value; - private String color; - - public WxMaSubscribeData(String name, String value) { - this.name = name; - this.value = value; - } - - public WxMaSubscribeData(String name, String value, String color) { - this.name = name; - this.value = value; - this.color = color; - } - - -} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java index a43fd5b47..fda195984 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaSubscribeMessage.java @@ -10,6 +10,8 @@ import java.util.List; /** * 订阅消息. * https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html + * + * @author S */ @Getter @Setter @@ -17,7 +19,6 @@ import java.util.List; @AllArgsConstructor @Builder public class WxMaSubscribeMessage implements Serializable { - private static final long serialVersionUID = 6846729898251286686L; /** @@ -58,10 +59,9 @@ public class WxMaSubscribeMessage implements Serializable { * 描述: 模板内容,不填则下发空模板 * */ - private List data; + private List data; - - public WxMaSubscribeMessage addData(WxMaSubscribeData datum) { + public WxMaSubscribeMessage addData(Data datum) { if (this.data == null) { this.data = new ArrayList<>(); } @@ -74,4 +74,12 @@ public class WxMaSubscribeMessage implements Serializable { return WxMaGsonBuilder.create().toJson(this); } + @lombok.Data + @NoArgsConstructor + @AllArgsConstructor + public static class Data { + private String name; + private String value; + } + } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java index d15226a9e..1d213d4a0 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaSubscribeMessageGsonAdapter.java @@ -1,6 +1,5 @@ package cn.binarywang.wx.miniapp.util.json; -import cn.binarywang.wx.miniapp.bean.WxMaSubscribeData; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -9,8 +8,12 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.Type; +/** + * . + * + * @author S + */ public class WxMaSubscribeMessageGsonAdapter implements JsonSerializer { - @Override public JsonElement serialize(WxMaSubscribeMessage message, Type typeOfSrc, JsonSerializationContext context) { JsonObject messageJson = new JsonObject(); @@ -20,7 +23,6 @@ public class WxMaSubscribeMessageGsonAdapter implements JsonSerializer