From 1dbc8fe882ad8ce76d868b35b76c9e0fd7f18ad4 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 14 Jul 2023 17:55:41 +0800
Subject: [PATCH] fix bug: multiple gateway kick user

---
 internal/api/msg.go               | 3 +++
 internal/msggateway/hub_server.go | 3 ++-
 internal/rpc/auth/auth.go         | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/internal/api/msg.go b/internal/api/msg.go
index d1858bf8b..41ab4dc48 100644
--- a/internal/api/msg.go
+++ b/internal/api/msg.go
@@ -214,6 +214,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 	if err != nil {
 		log.ZError(c, "decodeData failed", err)
 		apiresp.GinError(c, err)
+		return
 	}
 	sendMsgReq.MsgData.RecvID = req.RecvID
 	var status int
@@ -259,6 +260,7 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) {
 			if err != nil {
 				log.ZError(c, "GetAllUserIDs failed", err)
 				apiresp.GinError(c, err)
+				return
 			}
 			if len(recvIDsPart) < showNumber {
 				recvIDs = append(recvIDs, recvIDsPart...)
@@ -274,6 +276,7 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) {
 	if err != nil {
 		log.ZError(c, "decodeData failed", err)
 		apiresp.GinError(c, err)
+		return
 	}
 	for _, recvID := range recvIDs {
 		sendMsgReq.MsgData.RecvID = recvID
diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go
index 81aade1cb..fe74c018f 100644
--- a/internal/msggateway/hub_server.go
+++ b/internal/msggateway/hub_server.go
@@ -185,9 +185,10 @@ func (s *Server) KickUserOffline(
 				if err != nil {
 					return nil, err
 				}
+				s.LongConnServer.UnRegister(client)
 			}
 		} else {
-			log.ZWarn(ctx, "conn not exist", nil, "userID", v, "platformID", req.PlatformID)
+			log.ZInfo(ctx, "conn not exist", nil, "userID", v, "platformID", req.PlatformID)
 		}
 	}
 	return &msggateway.KickUserOfflineResp{}, nil
diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go
index 48e21fbce..ebb5f4c9f 100644
--- a/internal/rpc/auth/auth.go
+++ b/internal/rpc/auth/auth.go
@@ -23,6 +23,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
@@ -129,6 +130,7 @@ func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID
 	if err != nil {
 		return err
 	}
+	log.ZDebug(ctx, "forceKickOff", "conns", conns)
 	for _, v := range conns {
 		client := msggateway.NewMsgGatewayClient(v)
 		kickReq := &msggateway.KickUserOfflineReq{KickUserIDList: []string{userID}, PlatformID: platformID}