🎨 #2477 【小程序】增加订阅消息通知事件的相关属性支持

This commit is contained in:
dany1
2022-01-03 23:15:31 +08:00
committed by GitHub
parent 4b92f94a41
commit 76ea7fe2a8
5 changed files with 450 additions and 1 deletions

View File

@@ -11,6 +11,7 @@ import lombok.Data;
import me.chanjar.weixin.common.error.WxRuntimeException;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -165,6 +166,39 @@ public class WxMaMessage implements Serializable {
@XStreamConverter(value = XStreamCDataConverter.class)
private String openPid;
@XStreamAlias("SubscribeMsgPopupEvent")
private WxMaSubscribeMsgEvent.SubscribeMsgPopupEvent subscribeMsgPopupEvent;
@XStreamAlias("SubscribeMsgChangeEvent")
private WxMaSubscribeMsgEvent.SubscribeMsgChangeEvent subscribeMsgChangeEvent;
@XStreamAlias("SubscribeMsgSentEvent")
private WxMaSubscribeMsgEvent.SubscribeMsgSentEvent subscribeMsgSentEvent;
/**
* 不要直接使用这个字段,
* 这个字段只是为了适配 SubscribeMsgPopupEvent SubscribeMsgChangeEvent SubscribeMsgSentEvent
* 在json里面名称都是List并且有时候是对象有时候是数组的问题
* 当List只有一个对象的时候微信服务器推送过来的的List是对象而非数组当有多个对象的时候推送过来的才是数组
* 当只有一个对象的时候
* "List": {
* "TemplateId": "hD-ixGOhYmUfjOnI8MCzQMPshzGVeux_2vzyvQu7O68",
* "SubscribeStatusString": "accept",
* "PopupScene": "0"
* }
* 当有多条数据的时候
* "List": [ {
* "TemplateId": "hD-ixGOhYmUfjOnI8MCzQMPshzGVeux_2vzyvQu7O68",
* "SubscribeStatusString": "accept",
* "PopupScene": "0"
* }, {
* "TemplateId": "hD-ixGOhYmUfjOnI8MCzQMPshzGVeux_2vzyvQu7O68",
* "SubscribeStatusString": "accept",
* "PopupScene": "0"
* }]
*/
@SerializedName("List")
private WxMaSubscribeMsgEvent.WxMaSubscribeMsgEventJson uselessMsg;
public static WxMaMessage fromXml(String xml) {
return XStreamTransformer.fromXml(WxMaMessage.class, xml);
@@ -201,7 +235,19 @@ public class WxMaMessage implements Serializable {
}
public static WxMaMessage fromJson(String json) {
return WxMaGsonBuilder.create().fromJson(json, WxMaMessage.class);
WxMaMessage message = WxMaGsonBuilder.create().fromJson(json, WxMaMessage.class);
// 在这里处理 event的json格式时候的 list 问题让json和xml的程序接口可以保持一致 详见 uselessMsg 字段的注释
if (message.getUselessMsg() != null) {
if (StringUtils.equals(message.getEvent(), "subscribe_msg_popup_event")) {
message.setSubscribeMsgPopupEvent(message.getUselessMsg().getPopupEvents());
} else if (StringUtils.equals(message.getEvent(), "subscribe_msg_change_event")) {
message.setSubscribeMsgChangeEvent(message.getUselessMsg().getChangeEvents());
} else if (StringUtils.equals(message.getEvent(), "subscribe_msg_sent_event")) {
message.setSubscribeMsgSentEvent(message.getUselessMsg().getSentEvent());
}
message.setUselessMsg(null);
}
return message;
}
public static WxMaMessage fromEncryptedJson(String encryptedJson, WxMaConfig config) {

View File

@@ -0,0 +1,118 @@
package cn.binarywang.wx.miniapp.bean;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
/**
* WxMaSubscribeMsgEvent class
* 客户端订阅,服务端收到的通知
* @author dany
* @date 2021/12/31
*/
public class WxMaSubscribeMsgEvent {
/**
* https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/subscribe-message.html
*/
@Data
@XStreamAlias("SubscribeMsgPopupEvent")
public static class SubscribeMsgPopupEvent implements Serializable {
private static final long serialVersionUID = 6319723189257161326L;
@XStreamImplicit(itemFieldName = "List")
private List<PopupEvent> list = new LinkedList<>();
}
@Data
@XStreamAlias("SubscribeMsgChangeEvent")
public static class SubscribeMsgChangeEvent implements Serializable {
private static final long serialVersionUID = 7705686111539437751L;
@XStreamImplicit(itemFieldName = "List")
private List<ChangeEvent> list = new LinkedList<>();
}
@Data
@XStreamAlias("SubscribeMsgSentEvent")
public static class SubscribeMsgSentEvent implements Serializable {
private static final long serialVersionUID = 7705686111539437751L;
@XStreamAlias("List")
private SentEvent list;
}
@Data
public static class PopupEvent implements Serializable {
private static final long serialVersionUID = 4934029303241387226L;
/**
* 模板id
*/
@XStreamAlias("TemplateId")
@XStreamConverter(value = XStreamCDataConverter.class)
private String templateId;
/**
* 订阅结果accept接收reject拒收
*/
@XStreamAlias("SubscribeStatusString")
@XStreamConverter(value = XStreamCDataConverter.class)
private String subscribeStatusString;
/**
* 弹框场景0代表在小程序页面内
*/
@XStreamAlias("PopupScene")
private String popupScene;
}
@Data
public static class ChangeEvent implements Serializable {
private static final long serialVersionUID = 1523634146232757624L;
/**
* 模板id
*/
@XStreamAlias("TemplateId")
@XStreamConverter(value = XStreamCDataConverter.class)
private String templateId;
/**
* 订阅结果accept接收reject拒收
*/
@XStreamAlias("SubscribeStatusString")
@XStreamConverter(value = XStreamCDataConverter.class)
private String subscribeStatusString;
}
@Data
public static class SentEvent implements Serializable {
private static final long serialVersionUID = -8734478345463177940L;
/**
* 模板id
*/
@XStreamAlias("TemplateId")
@XStreamConverter(value = XStreamCDataConverter.class)
private String templateId;
@XStreamAlias("MsgID")
private String msgId;
@XStreamAlias("ErrorCode")
private String errorCode;
@XStreamAlias("ErrorStatus")
@XStreamConverter(value = XStreamCDataConverter.class)
private String errorStatus;
}
@Data
public static class WxMaSubscribeMsgEventJson implements Serializable {
private static final long serialVersionUID = -4820758280837190275L;
private SubscribeMsgPopupEvent popupEvents;
private SubscribeMsgChangeEvent changeEvents;
private SubscribeMsgSentEvent sentEvent;
}
}