diff --git a/domain/model/group_m/micData.go b/domain/model/group_m/micData.go index 168e05237f173c6d5afee649ca80c9823ed0a4a4..6fa6cdfd8a77d57a66e74216ed0b8829230e094b 100644 --- a/domain/model/group_m/micData.go +++ b/domain/model/group_m/micData.go @@ -95,7 +95,7 @@ func MicGroupKickOutRPush(model *domain.Model, groupUid string, userExternalId s return } // socket通知被拉黑者退房 - rpc.SendQuitRoom(beKickuserId) + rpc.SendQuitRoom(beKickuserId, 2, txGroupId) if n, err := redisCli.GetRedis().RPush(context.Background(), redis_key.GetMicInfoChange(), string(str)).Result(); err != nil || n == 0 { model.Log.Errorf("MicChangeRPush MicGroupKickOutRPush err:%+v, groupUuid:%v, micContent:%+v", err, groupUid, string(str)) return diff --git a/route/group_r/group_setting.go b/route/group_r/group_setting.go index bf1d291b892bffe31e926e7e2bd4ba6960fdd3f4..c01c32363680573d7e20af1d4ac7f61a69c57296 100644 --- a/route/group_r/group_setting.go +++ b/route/group_r/group_setting.go @@ -523,7 +523,7 @@ func AddGroupBlacklist(c *gin.Context) (*mycontext.MyContext, error) { signal_s.SendCustomMsg(model, groupId, nil, string(buf)) } // socket通知被拉黑者退房 - rpc.SendQuitRoom(user.ID) + rpc.SendQuitRoom(user.ID, 1, txGroupId) if err = group_s.NewGroupService(myContext).LeaveGroup(model, groupId, user.ID, externalId); err != nil { return myContext, err @@ -721,6 +721,7 @@ func KickGroupMembers(c *gin.Context) (*mycontext.MyContext, error) { model := domain.CreateModelContext(myContext) + txGroupId := groupId groupId, err = group_m.ToImGroupId(model, groupId) if err != nil { return myContext, err @@ -752,8 +753,8 @@ func KickGroupMembers(c *gin.Context) (*mycontext.MyContext, error) { Source: myExtId, Target: externalId, Content: string(buf)} signal_s.SendSignalMsg(model, groupId, systemMsg, false) } - // socket通知被拉黑者退房 - rpc.SendQuitRoom(user.ID) + // socket通知退房 + rpc.SendQuitRoom(user.ID, 2, txGroupId) if err = group_s.NewGroupService(myContext).LeaveGroup(model, groupId, user.ID, externalId); err != nil { return myContext, err