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

push update

Browse Source
This commit is contained in:
Gordon 2022-06-13 15:24:13 +08:00
parent 2cbffb96fd
commit 043188ab5e
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
internal/msg_gateway/gate/batch_push.go
View File

@ -36,43 +36,43 @@ func (r *RPCServer) GenPullSeqList(currentSeq uint32, operationID string, userID
func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformIDList []int) map[int]*sdk_ws.MsgDataList { func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformIDList []int) map[int]*sdk_ws.MsgDataList {
user2PushMsg := make(map[int]*sdk_ws.MsgDataList, 0) user2PushMsg := make(map[int]*sdk_ws.MsgDataList, 0)
//for _, v := range platformIDList { for _, v := range platformIDList {
//user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, pushToUserID, v) user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, pushToUserID, v)
//log.Info(operationID, "GetSingleUserMsgForPush", msgData.Seq, pushToUserID, v, "len:", len(user2PushMsg[v])) //log.Info(operationID, "GetSingleUserMsgForPush", msgData.Seq, pushToUserID, v, "len:", len(user2PushMsg[v]))
//} }
return user2PushMsg return user2PushMsg
} }
func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformID int) []*sdk_ws.MsgData { func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformID int) *sdk_ws.MsgDataList {
msgData.MsgDataList = nil msgData.MsgDataList = nil
return []*sdk_ws.MsgData{msgData} return &sdk_ws.MsgDataList{}
userConn := ws.getUserConn(pushToUserID, platformID) //userConn := ws.getUserConn(pushToUserID, platformID)
if userConn == nil { //if userConn == nil {
log.Debug(operationID, "userConn == nil") // log.Debug(operationID, "userConn == nil")
return []*sdk_ws.MsgData{msgData} // return []*sdk_ws.MsgData{msgData}
} //}
//
if msgData.Seq <= userConn.PushedMaxSeq { //if msgData.Seq <= userConn.PushedMaxSeq {
log.Debug(operationID, "msgData.Seq <= userConn.PushedMaxSeq", msgData.Seq, userConn.PushedMaxSeq) // log.Debug(operationID, "msgData.Seq <= userConn.PushedMaxSeq", msgData.Seq, userConn.PushedMaxSeq)
return nil // return nil
} //}
//
msgList := r.GetSingleUserMsg(operationID, msgData.Seq, pushToUserID) //msgList := r.GetSingleUserMsg(operationID, msgData.Seq, pushToUserID)
if msgList == nil { //if msgList == nil {
log.Debug(operationID, "GetSingleUserMsg msgList == nil", msgData.Seq, userConn.PushedMaxSeq) // log.Debug(operationID, "GetSingleUserMsg msgList == nil", msgData.Seq, userConn.PushedMaxSeq)
userConn.PushedMaxSeq = msgData.Seq // userConn.PushedMaxSeq = msgData.Seq
return []*sdk_ws.MsgData{msgData} // return []*sdk_ws.MsgData{msgData}
} //}
msgList = append(msgList, msgData) //msgList = append(msgList, msgData)
//
for _, v := range msgList { //for _, v := range msgList {
if v.Seq > userConn.PushedMaxSeq { // if v.Seq > userConn.PushedMaxSeq {
userConn.PushedMaxSeq = v.Seq // userConn.PushedMaxSeq = v.Seq
} // }
} //}
log.Debug(operationID, "GetSingleUserMsg msgList len ", len(msgList), userConn.PushedMaxSeq) //log.Debug(operationID, "GetSingleUserMsg msgList len ", len(msgList), userConn.PushedMaxSeq)
return msgList //return msgList
} }
func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, userID string) []*sdk_ws.MsgData { func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, userID string) []*sdk_ws.MsgData {
@ -102,10 +102,10 @@ func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, u
return reply.List return reply.List
} }
func (r *RPCServer) GetBatchUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserIDList []string, platformID int) map[string][]*sdk_ws.MsgData { //func (r *RPCServer) GetBatchUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserIDList []string, platformID int) map[string][]*sdk_ws.MsgData {
user2PushMsg := make(map[string][]*sdk_ws.MsgData, 0) // user2PushMsg := make(map[string][]*sdk_ws.MsgData, 0)
for _, v := range pushToUserIDList { // for _, v := range pushToUserIDList {
user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, v, platformID) // user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, v, platformID)
} // }
return user2PushMsg // return user2PushMsg
} //}