Merge pull request #485 from ArtisanCloud/develop

Develop

Author: Matrix-X

src/kernel/models/callback.go

@@ -33,6 +33,7 @@ type CallbackMessageHeader struct {
 	MsgType      string   `xml:"MsgType"`
 	Event        string   `xml:"Event"`
 	ChangeType   string   `xml:"ChangeType"`
+	EventKey     string   `xml:"EventKey,omitempty"`
 	Content      []byte
 }
 

src/officialAccount/server/handlers/models/event.go

@@ -48,6 +48,7 @@ type EventScan struct {
 	models.CallbackMessageHeader
 	AgentID string `xml:"AgentID"`
 	Ticket  string `xml:"Ticket"`
+	//EventKey string `xml:"EventKey"`
 }
 
 type EventEnterAgent struct {
@@ -96,7 +97,7 @@ type EventView struct {
 type EventScanCodePush struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	ScanCodeInfo struct {
 		Text       string `xml:",chardata"`
 		ScanType   string `xml:"ScanType"`
@@ -108,7 +109,7 @@ type EventScanCodePush struct {
 type EventScancodeWaitMsg struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	ScanCodeInfo struct {
 		Text       string `xml:",chardata"`
 		ScanType   string `xml:"ScanType"`
@@ -120,7 +121,7 @@ type EventScancodeWaitMsg struct {
 type EventPicSysPhoto struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	SendPicsInfo struct {
 		Text    string `xml:",chardata"`
 		Count   string `xml:"Count"`
@@ -138,7 +139,7 @@ type EventPicSysPhoto struct {
 type EventPicPhotoOrAlbum struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	SendPicsInfo struct {
 		Text    string `xml:",chardata"`
 		Count   string `xml:"Count"`
@@ -156,7 +157,7 @@ type EventPicPhotoOrAlbum struct {
 type EventPicWeixin struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	SendPicsInfo struct {
 		Text    string `xml:",chardata"`
 		Count   string `xml:"Count"`
@@ -266,7 +267,7 @@ type EventTemplateCardEvent struct {
 type EventTemplateCardMenuEvent struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	TaskID       string `xml:"TaskId"`
 	CardType     string `xml:"CardType"`
 	ResponseCode string `xml:"ResponseCode"`

src/work/server/handlers/models/event.go

@@ -263,7 +263,7 @@ type EventTemplateCardEvent struct {
 type EventTemplateCardMenuEvent struct {
 	contract.EventInterface
 	models.CallbackMessageHeader
-	EventKey     string `xml:"EventKey"`
+	//EventKey     string `xml:"EventKey"`
 	TaskID       string `xml:"TaskId"`
 	CardType     string `xml:"CardType"`
 	ResponseCode string `xml:"ResponseCode"`