Update version to v3.8.3-patch.7

internal/msggateway/hub_server.go

@@ -244,7 +244,6 @@ func (s *Server) MultiTerminalLoginCheck(ctx context.Context, req *msggateway.Mu
 		tempUserCtx.SetOperationID(mcontext.GetOperationID(ctx))
 		client := &Client{}
 		client.ctx = tempUserCtx
-		client.token = req.Token
 		client.UserID = req.UserID
 		client.PlatformID = int(req.PlatformID)
 		i := &kickHandler{

internal/msggateway/ws_server.go

@@ -337,51 +337,17 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 		}
 	}
 
-	// If reconnect: When multiple msgGateway instances are deployed, a client may disconnect from instance A and reconnect to instance B.
-	// During this process, instance A might still be executing, resulting in two clients with the same token existing simultaneously.
-	// This situation needs to be filtered to prevent duplicate clients.
-	checkSameTokenFunc := func(oldClients []*Client) []*Client {
-		var clientsNeedToKick []*Client
-
-		for _, c := range oldClients {
-			if c.token == newClient.token {
-				log.ZDebug(newClient.ctx, "token is same, not kick",
-					"userID", newClient.UserID,
-					"platformID", newClient.PlatformID,
-					"token", newClient.token)
-				continue
-			}
-
-			clientsNeedToKick = append(clientsNeedToKick, c)
-		}
-
-		return clientsNeedToKick
-	}
-
 	switch ws.msgGatewayConfig.Share.MultiLogin.Policy {
 	case constant.DefalutNotKick:
 	case constant.PCAndOther:
 		if constant.PlatformIDToClass(newClient.PlatformID) == constant.TerminalPC {
 			return
 		}
-		clients, ok := ws.clients.GetAll(newClient.UserID)
-		clientOK = ok
-		oldClients = make([]*Client, 0, len(clients))
-		for _, c := range clients {
-			if constant.PlatformIDToClass(c.PlatformID) == constant.TerminalPC {
-				continue
-			}
-			oldClients = append(oldClients, c)
-		}
-
 		fallthrough
 	case constant.AllLoginButSameTermKick:
 		if !clientOK {
 			return
 		}
-
-		oldClients = checkSameTokenFunc(oldClients)
-
 		ws.clients.DeleteClients(newClient.UserID, oldClients)
 		for _, c := range oldClients {
 			err := c.KickOnlineMessage()
@@ -407,15 +373,14 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 		if !ok {
 			return
 		}
-
-		var kickClients []*Client
+		var (
+			kickClients []*Client
+		)
 		for _, client := range clients {
 			if constant.PlatformIDToClass(client.PlatformID) == constant.PlatformIDToClass(newClient.PlatformID) {
 				kickClients = append(kickClients, client)
 			}
 		}
-		kickClients = checkSameTokenFunc(kickClients)
-
 		kickTokenFunc(kickClients)
 	}
 }

pkg/common/storage/controller/msg.go

@@ -675,19 +675,12 @@ func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.Searc
 func (db *commonMsgDatabase) FindOneByDocIDs(ctx context.Context, conversationIDs []string, seqs map[string]int64) (map[string]*sdkws.MsgData, error) {
 	totalMsgs := make(map[string]*sdkws.MsgData)
 	for _, conversationID := range conversationIDs {
-		seq, ok := seqs[conversationID]
-		if !ok {
-			log.ZWarn(ctx, "seq not found for conversationID", errs.New("seq not found for conversation"), "conversationID", conversationID)
-			continue
-		}
-
+		seq := seqs[conversationID]
 		docID := db.msgTable.GetDocID(conversationID, seq)
 		msgs, err := db.msgDocDatabase.FindOneByDocID(ctx, docID)
 		if err != nil {
-			log.ZWarn(ctx, "FindOneByDocID failed", err, "conversationID", conversationID, "docID", docID, "seq", seq)
-			continue
+			return nil, err
 		}
-
 		index := db.msgTable.GetMsgIndex(seq)
 		totalMsgs[conversationID] = convert.MsgDB2Pb(msgs.Msg[index].Msg)
 	}

pkg/common/storage/model/msg.go

@@ -120,11 +120,15 @@ func (m *MsgDocModel) GetDocID(conversationID string, seq int64) string {
 
 func (m *MsgDocModel) GetDocIDSeqsMap(conversationID string, seqs []int64) map[string][]int64 {
 	t := make(map[string][]int64)
-	for _, seq := range seqs {
-		docID := m.GetDocID(conversationID, seq)
-		t[docID] = append(t[docID], seq)
+	for i := 0; i < len(seqs); i++ {
+		docID := m.GetDocID(conversationID, seqs[i])
+		if value, ok := t[docID]; !ok {
+			var temp []int64
+			t[docID] = append(temp, seqs[i])
+		} else {
+			t[docID] = append(value, seqs[i])
+		}
 	}
-
 	return t
 }
 

version/version

@@ -1 +1 @@
-v3.8.3-patch.8
+v3.8.3-patch.7