|
|
@ -71,6 +71,10 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
|
|
|
|
bCustomContent, _ := json.Marshal(customContent)
|
|
|
|
bCustomContent, _ := json.Marshal(customContent)
|
|
|
|
jsonCustomContent := string(bCustomContent)
|
|
|
|
jsonCustomContent := string(bCustomContent)
|
|
|
|
var content string
|
|
|
|
var content string
|
|
|
|
|
|
|
|
if pushMsg.MsgData.OfflinePushInfo != nil {
|
|
|
|
|
|
|
|
content = pushMsg.MsgData.OfflinePushInfo.Title
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
switch pushMsg.MsgData.ContentType {
|
|
|
|
switch pushMsg.MsgData.ContentType {
|
|
|
|
case constant.Text:
|
|
|
|
case constant.Text:
|
|
|
|
content = constant.ContentType2PushContent[constant.Text]
|
|
|
|
content = constant.ContentType2PushContent[constant.Text]
|
|
|
@ -93,10 +97,8 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
content = constant.ContentType2PushContent[constant.Common]
|
|
|
|
content = constant.ContentType2PushContent[constant.Common]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if pushMsg.MsgData.OfflinePushInfo != nil {
|
|
|
|
|
|
|
|
content = pushMsg.MsgData.OfflinePushInfo.Title
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pushResult, err := push.JGAccountListPush(UIDList, content, jsonCustomContent, constant.PlatformIDToName(t))
|
|
|
|
pushResult, err := push.JGAccountListPush(UIDList, content, jsonCustomContent, constant.PlatformIDToName(t))
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error(), constant.PlatformIDToName(t))
|
|
|
|
log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error(), constant.PlatformIDToName(t))
|
|
|
|