From c30319c74ca4042f8d322cb71830426fcb2f6ae1 Mon Sep 17 00:00:00 2001
From: silenceper <silenceper@gmail.com>
Date: Tue, 12 Nov 2019 15:05:07 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E5=BA=8F=E5=88=97=E5=8C=96=20?=
 =?UTF-8?q?xml=20=E6=97=B6=E6=B7=BB=E5=8A=A0=20cdata=20=E6=A0=87=E7=AD=BE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 message/message.go | 26 ++++++++------------------
 message/text.go    |  4 ++--
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/message/message.go b/message/message.go
index 11f1535..8c7ae2a 100644
--- a/message/message.go
+++ b/message/message.go
@@ -148,10 +148,10 @@ type MixMessage struct {
 	UnionID             string `xml:"UnionId"`
 
 	// 内容审核相关
-	IsRisky       bool   `xml:"isrisky"`
-	ExtraInfoJSON string `xml:"extra_info_json"`
-	TraceID       string `xml:"trace_id"`
-	StatusCode    int    `xml:"status_code"`
+	IsRisky 		    bool `xml:"isrisky"`
+	ExtraInfoJSON 		string `xml:"extra_info_json"`
+	TraceID 			string `xml:"trace_id"`
+	StatusCode          int `xml:"status_code"`
 }
 
 //EventPic 发图事件推送
@@ -178,30 +178,20 @@ type ResponseEncryptedXMLMsg struct {
 // CommonToken 消息中通用的结构
 type CommonToken struct {
 	XMLName      xml.Name `xml:"xml"`
-	ToUserName   CDATA    `xml:"ToUserName"`
-	FromUserName CDATA    `xml:"FromUserName"`
+	ToUserName   string   `xml:"ToUserName"`
+	FromUserName string   `xml:"FromUserName"`
 	CreateTime   int64    `xml:"CreateTime"`
 	MsgType      MsgType  `xml:"MsgType"`
 }
 
-// CDATA  使用该类型,在序列化为 xml 文本时文本会被解析器忽略
-type CDATA string
-
-// MarshalXML 实现自己的序列化方法
-func (c CDATA) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-	return e.EncodeElement(struct {
-		string `xml:",cdata"`
-	}{string(c)}, start)
-}
-
 //SetToUserName set ToUserName
 func (msg *CommonToken) SetToUserName(toUserName string) {
-	msg.ToUserName = CDATA(toUserName)
+	msg.ToUserName = toUserName
 }
 
 //SetFromUserName set FromUserName
 func (msg *CommonToken) SetFromUserName(fromUserName string) {
-	msg.FromUserName = CDATA(fromUserName)
+	msg.FromUserName = fromUserName
 }
 
 //SetCreateTime set createTime
diff --git a/message/text.go b/message/text.go
index 88ac19a..d981d96 100644
--- a/message/text.go
+++ b/message/text.go
@@ -3,12 +3,12 @@ package message
 //Text 文本消息
 type Text struct {
 	CommonToken
-	Content CDATA `xml:"Content"`
+	Content string `xml:"Content"`
 }
 
 //NewText 初始化文本消息
 func NewText(content string) *Text {
 	text := new(Text)
-	text.Content = CDATA(content)
+	text.Content = content
 	return text
 }