feat: add some mp messages

api/event/types.go

@@ -17,6 +17,11 @@ const (
 	INFO_TYPE_UNAUTHORIZED = "unauthorized"
 )
 
+// CDATA 解析 xml cdata 字段
+type CDATA struct {
+	Value string `xml:",cdata"`
+}
+
 // ReceivedEncryptMessage 待解密数据
 type ReceivedEncryptMessage struct {
 	XMLName    xml.Name `xml:"xml"`
@@ -70,31 +75,3 @@ type AuthorizerEvent struct {
 	MsgType      CDATA    `xml:"MsgType"`
 	Event        CDATA    `xml:"Event"`
 }
-
-// SubscribeEvent 关注/取消关注事件
-// event subscribe(订阅)、unsubscribe(取消订阅)
-type SubscribeEvent struct {
-	AuthorizerEvent
-}
-
-// QRSceneEvent 扫描带参数二维码事件
-type QRSceneEvent struct {
-	AuthorizerEvent
-	EventKey CDATA `xml:"EventKey"`
-	Ticket   CDATA `xml:"Ticket"`
-}
-
-// LocationEvent 上报地理位置事件
-type LocationEvent struct {
-	AuthorizerEvent
-	Latitude  float64 `xml:"Latitude"`
-	Longitude float64 `xml:"Longitude"`
-	Precision float64 `xml:"Precision"`
-}
-
-// MenuEvent 自定义菜单事件
-// event 值为 CLICK
-type MenuEvent struct {
-	AuthorizerEvent
-	EventKey CDATA `xml:"EventKey"`
-}

api/event/xml.go

@@ -1,6 +0,0 @@
-package event
-
-// CDATA 解析 xml cdata 字段
-type CDATA struct {
-	Value string `xml:",cdata"`
-}

api/mp/event.go

@@ -0,0 +1,41 @@
+package mp
+
+import "encoding/xml"
+
+// Event 公众号事件
+type Event struct {
+	XMLName      xml.Name `xml:"xml"`
+	ToUserName   CDATA    `xml:"ToUserName"`
+	FromUserName CDATA    `xml:"FromUserName"`
+	CreateTime   int64    `xml:"CreateTime"`
+	MsgType      CDATA    `xml:"MsgType"`
+	Event        CDATA    `xml:"Event"`
+}
+
+// SubscribeEvent 关注/取消关注事件
+// event subscribe(订阅)、unsubscribe(取消订阅)
+type SubscribeEvent struct {
+	Event
+}
+
+// QRSceneEvent 扫描带参数二维码事件
+type QRSceneEvent struct {
+	Event
+	EventKey CDATA `xml:"EventKey"`
+	Ticket   CDATA `xml:"Ticket"`
+}
+
+// LocationEvent 上报地理位置事件
+type LocationEvent struct {
+	Event
+	Latitude  float64 `xml:"Latitude"`
+	Longitude float64 `xml:"Longitude"`
+	Precision float64 `xml:"Precision"`
+}
+
+// MenuEvent 自定义菜单事件
+// event 值为 CLICK
+type MenuEvent struct {
+	Event
+	EventKey CDATA `xml:"EventKey"`
+}

api/event/message.go → api/mp/message.go

@@ -1,8 +1,24 @@
-package event
+package mp
+
+import "encoding/xml"
+
+// CDATA 解析 xml cdata 字段
+type CDATA struct {
+	Value string `xml:",cdata"`
+}
+
+// Message 公众号消息
+type Message struct {
+	XMLName      xml.Name `xml:"xml"`
+	ToUserName   CDATA    `xml:"ToUserName"`
+	FromUserName CDATA    `xml:"FromUserName"`
+	CreateTime   int64    `xml:"CreateTime"`
+	MsgType      CDATA    `xml:"MsgType"`
+}
 
 // TextMessage 文本消息
 type TextMessage struct {
-	AuthorizerEvent
+	Message
 	Content CDATA `xml:"Content"`
 	MsgID   int64 `xml:"MsgId"`
 
@@ -10,60 +26,34 @@ type TextMessage struct {
 	BizMsgMenuID int `xml:"bizmsgmenuid"`
 }
 
-// TextReplyMessage 回复文本消息
-type TextReplyMessage struct {
-	AuthorizerEvent
-	Content CDATA `xml:"Content"`
-}
-
 // ImageMessage 图片消息
 type ImageMessage struct {
-	AuthorizerEvent
+	Message
 	PicURL  CDATA `xml:"PicUrl"`
 	MediaID CDATA `xml:"MediaId"`
 	MsgID   int64 `xml:"MsgId"`
 }
 
-// ImageReplyMessage 回复图片消息
-type ImageReplyMessage struct {
-	AuthorizerEvent
-	MediaID CDATA `xml:"Image>MediaId"`
-}
-
 // VoiceMessage 语音消息
 type VoiceMessage struct {
-	AuthorizerEvent
+	Message
 	MediaID     CDATA `xml:"MediaId"`
 	Format      CDATA `xml:"Format"`
 	Recognition CDATA `xml:"Recognition"`
 	MsgID       int64 `xml:"MsgId"`
 }
 
-// VoiceReplyMessage 回复语音消息
-type VoiceReplyMessage struct {
-	AuthorizerEvent
-	MediaID CDATA `xml:"Voice>MediaId"`
-}
-
 // VideoMessage 视频消息
 type VideoMessage struct {
-	AuthorizerEvent
+	Message
 	MediaID      CDATA `xml:"MediaId"`
 	ThumbMediaID CDATA `xml:"ThumbMediaId"`
 	MsgID        int64 `xml:"MsgId"`
 }
 
-// VideoReplyMessage 回复视频消息
-type VideoReplyMessage struct {
-	AuthorizerEvent
-	MediaID     CDATA `xml:"Video>MediaId"`
-	Title       CDATA `xml:"Video>Title"`
-	Description CDATA `xml:"Video>Description"`
-}
-
 // MusicReplyMessage 回复音乐消息
 type MusicReplyMessage struct {
-	AuthorizerEvent
+	Message
 	Title        CDATA `xml:"Music>Title"`
 	Description  CDATA `xml:"Video>Description"`
 	MusicURL     CDATA `xml:"Video>MusicUrl"`
@@ -73,7 +63,7 @@ type MusicReplyMessage struct {
 
 // ShortVideoMessage 小视频消息
 type ShortVideoMessage struct {
-	AuthorizerEvent
+	Message
 	MediaID      CDATA `xml:"MediaId"`
 	ThumbMediaID CDATA `xml:"ThumbMediaId"`
 	MsgID        int64 `xml:"MsgId"`
@@ -81,7 +71,7 @@ type ShortVideoMessage struct {
 
 // LocationMessage 地理位置消息
 type LocationMessage struct {
-	AuthorizerEvent
+	Message
 	LocationX float64 `xml:"Location_X"`
 	LocationY float64 `xml:"Location_Y"`
 	Scale     int     `xml:"Scale"`
@@ -91,24 +81,50 @@ type LocationMessage struct {
 
 // LinkMessage 链接消息
 type LinkMessage struct {
-	AuthorizerEvent
+	Message
 	Title       CDATA `xml:"Title"`
 	Description CDATA `xml:"Description"`
 	URL         CDATA `xml:"Url"`
 	MsgID       int64 `xml:"MsgId"`
 }
 
-// ItemMessage 回复图文消息的单独一个item
-type ItemMessage struct {
+// ReplyTextMessage 回复文本消息
+type ReplyTextMessage struct {
+	Message
+	Content CDATA `xml:"Content"`
+}
+
+// ReplyImageMessage 回复图片消息
+type ReplyImageMessage struct {
+	Message
+	MediaID CDATA `xml:"Image>MediaId"`
+}
+
+// ReplyVoiceMessage 回复语音消息
+type ReplyVoiceMessage struct {
+	Message
+	MediaID CDATA `xml:"Voice>MediaId"`
+}
+
+// ReplyVideoMessage 回复视频消息
+type ReplyVideoMessage struct {
+	Message
+	MediaID     CDATA `xml:"Video>MediaId"`
+	Title       CDATA `xml:"Video>Title"`
+	Description CDATA `xml:"Video>Description"`
+}
+
+// ReplyItem 回复图文消息的单独一个item
+type ReplyItem struct {
 	Title       CDATA `xml:"Title"`
 	Description CDATA `xml:"Description"`
 	PicURL      CDATA `xml:"PicUrl"`
 	URL         CDATA `xml:"Url"`
 }
 
-// NewsReplyMessage 回复图文消息
-type NewsReplyMessage struct {
-	AuthorizerEvent
-	ArticleCount int           `xml:"ArticleCount"`
-	Articles     []ItemMessage `xml:"Articles>item"`
+// ReplyNewsMessage 回复图文消息
+type ReplyNewsMessage struct {
+	Message
+	ArticleCount int         `xml:"ArticleCount"`
+	Articles     []ReplyItem `xml:"Articles>item"`
 }