Merge remote-tracking branch 'origin/master'

message/message.go

@@ -184,30 +184,20 @@ type ResponseEncryptedXMLMsg struct {
 // CommonToken 消息中通用的结构
 type CommonToken struct {
 	XMLName      xml.Name `xml:"xml"`
-	ToUserName   CDATA    `xml:"ToUserName"`
+	ToUserName   string   `xml:"ToUserName"`
-	FromUserName CDATA    `xml:"FromUserName"`
+	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

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
 }