blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

singal offline push

Browse Source
This commit is contained in:
wangchuxiao 2022-06-02 19:52:29 +08:00
parent 409a8311b1
commit 2b25fea86c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/push/logic/push_to_client.go
View File

@ -125,6 +125,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
if err != nil { if err != nil {
log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error()) log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
} }
log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), "opts:", opts)
pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts) pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
if err != nil { if err != nil {
log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error()) log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
@ -141,11 +142,11 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) { func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) {
if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification { if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification {
req := &pbRtc.SignalMessageAssembleReq{} req := &pbRtc.SignalReq{}
if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil {
return opts, err return opts, err
} }
switch req.SignalReq.Payload.(type) { switch req.Payload.(type) {
case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup:
opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID
} }

13
pkg/common/db/redisModel.go
View File

@ -356,14 +356,15 @@ func (d *DataBases) CacheSignalInfo(msg *pbCommon.MsgData) error {
func (d *DataBases) GetSignalInfoFromCache(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { func (d *DataBases) GetSignalInfoFromCache(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
key := SignalCache + clientMsgID key := SignalCache + clientMsgID
result, err := redis.Bytes(d.Exec("GET", key)) result, err := redis.Bytes(d.Exec("GET", key))
log2.NewDebug("", utils.GetSelfFuncName(), clientMsgID, result) log2.NewDebug("", utils.GetSelfFuncName(), clientMsgID, result, string(result))
if err != nil { if err != nil {
invitationInfo := &pbRtc.SignalInviteReq{} return nil, err
return invitationInfo, err
} }
req := &pbRtc.SignalMessageAssembleReq{} req := &pbRtc.SignalReq{}
err = proto.Unmarshal(result, req) if err = proto.Unmarshal(result, req); err != nil {
req2 := req.SignalReq.Payload.(*pbRtc.SignalReq_Invite) return nil, err
}
req2 := req.Payload.(*pbRtc.SignalReq_Invite)
invitationInfo = req2.Invite invitationInfo = req2.Invite
return invitationInfo, err return invitationInfo, err
} }