diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index 1258a80a7..f0843a3f0 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -13,14 +13,14 @@ import ( type JPushResp struct { } -func JGAccountListPush(accounts []string, content, detailContent, platform string) ([]byte, error) { +func JGAccountListPush(accounts []string, alert, detailContent, platform string) ([]byte, error) { var pf requestBody.Platform _ = pf.SetPlatform(platform) var au requestBody.Audience au.SetAlias(accounts) var no requestBody.Notification - no.SetAlert(content, platform) + no.SetAlert(alert, platform) var me requestBody.Message me.SetMsgContent(detailContent) var o requestBody.Options diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index e7cbf20e0..7d566a10a 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -93,6 +93,10 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { default: 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)) if err != nil { log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error(), constant.PlatformIDToName(t))