Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Author: skiffer-git

internal/conversation_msg/conversation.go

@@ -261,7 +261,11 @@ func (c *Conversation) revokeOneMessage(callback open_im_sdk_callback.Base, req
 	req.Content = message.ClientMsgID
 	req.ClientMsgID = utils.GetMsgID(message.SendID)
 	req.ContentType = constant.Revoke
+	req.SendTime = 0
+	req.CreateTime = utils.GetCurrentTimestampByMill()
 	options := make(map[string]bool, 5)
+	utils.SetSwitchFromOptions(options, constant.IsUnreadCount, false)
+	utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
 	resp, _ := c.internalSendMessage(callback, (*sdk_struct.MsgStruct)(&req), recvID, groupID, operationID, &server_api_params.OfflinePushInfo{}, false, options)
 	req.ServerMsgID = resp.ServerMsgID
 	req.SendTime = resp.SendTime

sdk_struct/sdk_struct.go

@@ -893,7 +893,7 @@ type MsgStruct struct {
 	NotificationElem struct {
 		Detail      string `json:"detail"`
 		DefaultTips string `json:"defaultTips"`
-	}
+	} `json:"notificationElem"`
 	//RevokeMessage struct {
 	//	ServerMsgID    string `json:"serverMsgID"`
 	//	SendID         string `json:"sendID"`