diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java index 0c64b9bf6..7dce73ad0 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java @@ -1,10 +1,15 @@ package me.chanjar.weixin.cp.bean.external.msg; import com.google.gson.annotations.SerializedName; +import lombok.Data; import me.chanjar.weixin.cp.constant.WxCpConsts; import java.io.Serializable; +/** + * @author chutian0124 + */ +@Data public class Attachment implements Serializable { private static final long serialVersionUID = -8078748379570640198L; @@ -15,62 +20,35 @@ public class Attachment implements Serializable { private Link link; - private MiniProgram miniprogram; + @SerializedName("miniprogram") + private MiniProgram miniProgram; private Video video; - @Override - public String toString() { - return "Attachment{" + - "msgType='" + msgType + '\'' + - ", image=" + image + - ", link=" + link + - ", miniprogram=" + miniprogram + - ", video=" + video + - '}'; - } - - private String getMsgType() { - return msgType; - } - - private void setMsgType(String msgType) { - this.msgType = msgType; - } - - public Image getImage() { - return image; - } + private File file; public void setImage(Image image) { this.image = image; this.msgType = WxCpConsts.WelcomeMsgType.IMAGE; } - public Link getLink() { - return link; - } - public void setLink(Link link) { this.link = link; this.msgType = WxCpConsts.WelcomeMsgType.LINK; } - public MiniProgram getMiniprogram() { - return miniprogram; - } - - public void setMiniprogram(MiniProgram miniprogram) { - this.miniprogram = miniprogram; + public void setMiniProgram(MiniProgram miniProgram) { + this.miniProgram = miniProgram; this.msgType = WxCpConsts.WelcomeMsgType.MINIPROGRAM; } - public Video getVideo() { - return video; - } - public void setVideo(Video video) { this.video = video; this.msgType = WxCpConsts.WelcomeMsgType.VIDEO; } + + public void setFile(File file ) { + this.file = file; + this.msgType = WxCpConsts.WelcomeMsgType.FILE; + } } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/File.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/File.java new file mode 100644 index 000000000..a9726322e --- /dev/null +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/File.java @@ -0,0 +1,18 @@ +package me.chanjar.weixin.cp.bean.external.msg; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Binary Wang + * @date 2021-08-23 + */ +@Data +public class File implements Serializable { + private static final long serialVersionUID = 2794189478198329090L; + + @SerializedName("media_id") + private String mediaId; +} diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java index 69db78efb..601c7dbb3 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java @@ -353,5 +353,10 @@ public class WxCpConsts { * 小程序消息. */ public static final String MINIPROGRAM = "miniprogram"; + + /** + * 文件消息. + */ + public static final String FILE = "file"; } }