退房

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

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