From 2ea272bddd075b5e24b51142c31f9372f15e46d2 Mon Sep 17 00:00:00 2001
From: scjtqs <scjtqs@qq.com>
Date: Sun, 30 Aug 2020 13:25:33 +0800
Subject: [PATCH 1/4] add element

---
 .gitignore          |  1 +
 message/elements.go | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..485dee64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/message/elements.go b/message/elements.go
index 155a8d0f..039fa4b2 100644
--- a/message/elements.go
+++ b/message/elements.go
@@ -161,6 +161,24 @@ func NewUrlShare(url, title, content, image string) *ServiceElement {
 		SubType: "UrlShare",
 	}
 }
+func NewXmlMsg(template string, ResId int64) *ServiceElement {
+	if ResId == 0 {
+		ResId = 2 //默认值2
+	}
+	return &ServiceElement{
+		Id:      int32(ResId),
+		Content: template,
+		SubType: "xml",
+	}
+}
+
+func NewJsonMsg(template string) *ServiceElement {
+	return &ServiceElement{
+		Id:      1,
+		Content: template,
+		SubType: "json",
+	}
+}
 
 func (e *TextElement) Type() ElementType {
 	return Text

From 71595a25673609ae39ebdf03545e08a644bc9679 Mon Sep 17 00:00:00 2001
From: scjtqs <scjtqs@qq.com>
Date: Sun, 30 Aug 2020 13:27:22 +0800
Subject: [PATCH 2/4] add element

---
 message/elements.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/message/elements.go b/message/elements.go
index 039fa4b2..528ca9a3 100644
--- a/message/elements.go
+++ b/message/elements.go
@@ -163,7 +163,7 @@ func NewUrlShare(url, title, content, image string) *ServiceElement {
 }
 func NewXmlMsg(template string, ResId int64) *ServiceElement {
 	if ResId == 0 {
-		ResId = 2 //默认值2
+		ResId = 60 //默认值60
 	}
 	return &ServiceElement{
 		Id:      int32(ResId),

From 9c48d0907b14ed08e720a3380ac32ea240d25ee1 Mon Sep 17 00:00:00 2001
From: scjtqs <scjtqs@qq.com>
Date: Mon, 31 Aug 2020 00:28:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0json=20=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

---
 message/message.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/message/message.go b/message/message.go
index a8388b00..34d11b7b 100644
--- a/message/message.go
+++ b/message/message.go
@@ -347,6 +347,15 @@ func ToProtoElems(elems []IMessageElement, generalFlags bool) (r []*msg.Elem) {
 				})
 				continue
 			}
+			if e.SubType == "json" {
+				r = append(r,&msg.Elem{
+					LightApp:&msg.LightAppElem{
+						Data:append([]byte{1}, binary.ZlibCompress([]byte(e.Content))...),
+						MsgResid: []byte{1},
+					},
+				})
+				continue
+			}
 			r = append(r, &msg.Elem{
 				RichMsg: &msg.RichMsg{
 					Template1: append([]byte{1}, binary.ZlibCompress([]byte(e.Content))...),
@@ -539,7 +548,7 @@ func (forMsg *ForwardMessage) CalculateValidationData(seq, random int32, groupCo
 				FromUin: node.SenderId,
 				MsgSeq:  seq,
 				MsgTime: node.Time,
-				MsgUid:  0x01000000000000000 | (int64(random) & 0xFFFF_FFFF),
+				MsgUid:  0x01000000000000000 | (int64(random) & 0xFFFFFFFF),
 				MutiltransHead: &msg.MutilTransHead{
 					MsgId: 1,
 				},

From 8965f680f4d9de509efb755934d6a53cfb6a48a4 Mon Sep 17 00:00:00 2001
From: scjtqs <scjtqs@qq.com>
Date: Mon, 31 Aug 2020 00:29:25 +0800
Subject: [PATCH 4/4] fmt

---
 message/message.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/message/message.go b/message/message.go
index 34d11b7b..cbca629d 100644
--- a/message/message.go
+++ b/message/message.go
@@ -348,9 +348,9 @@ func ToProtoElems(elems []IMessageElement, generalFlags bool) (r []*msg.Elem) {
 				continue
 			}
 			if e.SubType == "json" {
-				r = append(r,&msg.Elem{
-					LightApp:&msg.LightAppElem{
-						Data:append([]byte{1}, binary.ZlibCompress([]byte(e.Content))...),
+				r = append(r, &msg.Elem{
+					LightApp: &msg.LightAppElem{
+						Data:     append([]byte{1}, binary.ZlibCompress([]byte(e.Content))...),
 						MsgResid: []byte{1},
 					},
 				})