diff --git a/internal/push/logic/callback.go b/internal/push/logic/callback.go index 68860757a..065d06ddc 100644 --- a/internal/push/logic/callback.go +++ b/internal/push/logic/callback.go @@ -28,6 +28,7 @@ func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb. UserIDList: userIDList, }, OfflinePushInfo: msg.OfflinePushInfo, + ClientMsgID: msg.ClientMsgID, SendID: msg.SendID, GroupID: msg.GroupID, ContentType: msg.ContentType, @@ -75,6 +76,7 @@ func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.M UserIDList: userIDList, }, OfflinePushInfo: msg.OfflinePushInfo, + ClientMsgID: msg.ClientMsgID, SendID: msg.SendID, GroupID: msg.GroupID, ContentType: msg.ContentType, diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 1e66189c5..f129ad385 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -171,24 +171,6 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) { return } pushToUserIDList = userIDList - //getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: pushMsg.OperationID, GroupID: pushMsg.MsgData.GroupID} - //etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, pushMsg.OperationID) - //if etcdConn == nil { - // errMsg := pushMsg.OperationID + "getcdv3.GetDefaultConn == nil" - // log.NewError(pushMsg.OperationID, errMsg) - // return - //} - //client := pbCache.NewCacheClient(etcdConn) - //cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq) - //if err != nil { - // log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error()) - // return - //} - //if cacheResp.CommonResp.ErrCode != 0 { - // log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String()) - // return - //} - //pushToUserIDList = cacheResp.UserIDList } grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), pushMsg.OperationID) diff --git a/pkg/call_back_struct/push.go b/pkg/call_back_struct/push.go index 6ff649a3d..9fcb99032 100644 --- a/pkg/call_back_struct/push.go +++ b/pkg/call_back_struct/push.go @@ -5,6 +5,7 @@ import commonPb "Open_IM/pkg/proto/sdk_ws" type CallbackBeforePushReq struct { UserStatusBatchCallbackReq *commonPb.OfflinePushInfo + ClientMsgID string `json:"clientMsgID"` SendID string `json:"sendID"` GroupID string `json:"groupID"` ContentType int32 `json:"contentType"`