From 28156fcb3a2501d2f4912348e5c53e9b337dee86 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 23 Aug 2021 22:34:33 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#2272=20=E3=80=90=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E5=8F=91=E9=80=81=E6=96=B0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=AC=A2=E8=BF=8E=E8=AF=AD=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=B9file=E6=96=87=E4=BB=B6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cp/bean/external/msg/Attachment.java      | 52 ++++++-------------
 .../weixin/cp/bean/external/msg/File.java     | 18 +++++++
 .../weixin/cp/constant/WxCpConsts.java        |  5 ++
 3 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/File.java

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 0c64b9bf63..7dce73ad03 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 0000000000..a9726322e6
--- /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 <a href="https://github.com/binarywang">Binary Wang</a>
+ * @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 69db78efbe..601c7dbb30 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 static class WelcomeMsgType {
      * 小程序消息.
      */
     public static final String MINIPROGRAM = "miniprogram";
+
+    /**
+     * 文件消息.
+     */
+    public static final String FILE = "file";
   }
 }