From 44e96853f25eb643f46b8a22b259f5bd9a2126f3 Mon Sep 17 00:00:00 2001 From: dsx137 <70027572+dsx137@users.noreply.github.com> Date: Thu, 15 Oct 2026 15:28:48 +0800 Subject: [PATCH 1/2] fix(core): force to replace send time when malloc seq # Conflicts: # pkg/common/storage/controller/msg_transfer.go # Conflicts: # pkg/common/storage/controller/msg_transfer.go --- pkg/common/storage/controller/msg_transfer.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/common/storage/controller/msg_transfer.go b/pkg/common/storage/controller/msg_transfer.go index 28392d66e0..8bc21f86fe 100644 --- a/pkg/common/storage/controller/msg_transfer.go +++ b/pkg/common/storage/controller/msg_transfer.go @@ -2,12 +2,16 @@ package controller import ( "context" + "time" + + "google.golang.org/protobuf/proto" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/mq" "github.com/openimsdk/tools/utils/datautil" - "google.golang.org/protobuf/proto" + + "go.mongodb.org/mongo-driver/mongo" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/database" @@ -16,7 +20,6 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" - "go.mongodb.org/mongo-driver/mongo" ) type MsgTransferDatabase interface { @@ -206,6 +209,8 @@ func (db *msgTransferDatabase) BatchInsertChat2Cache(ctx context.Context, conver if lenList < 1 { return 0, false, nil, errs.New("no messages to insert", "minCount", 1).Wrap() } + //force to lead time as same + sendTime := time.Now().UnixMilli() currentMaxSeq, err := db.seqConversation.Malloc(ctx, conversationID, int64(len(msgs))) if err != nil { log.ZError(ctx, "storage.seq.Malloc", err) @@ -218,6 +223,7 @@ func (db *msgTransferDatabase) BatchInsertChat2Cache(ctx context.Context, conver for _, m := range msgs { currentMaxSeq++ m.Seq = currentMaxSeq + m.SendTime = sendTime userSeqMap[m.SendID] = m.Seq seqs = append(seqs, m.Seq) } From 83306e304c5ab55799e7c7c2b7bcfb3942351c84 Mon Sep 17 00:00:00 2001 From: dsx137 <70027572+dsx137@users.noreply.github.com> Date: Fri, 16 Oct 2026 14:08:18 +0800 Subject: [PATCH 2/2] refactor(core): reorder message transfer imports --- pkg/common/storage/controller/msg_transfer.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/common/storage/controller/msg_transfer.go b/pkg/common/storage/controller/msg_transfer.go index 8bc21f86fe..8a8d9e7d26 100644 --- a/pkg/common/storage/controller/msg_transfer.go +++ b/pkg/common/storage/controller/msg_transfer.go @@ -4,22 +4,20 @@ import ( "context" "time" + "go.mongodb.org/mongo-driver/mongo" "google.golang.org/protobuf/proto" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" - "github.com/openimsdk/protocol/constant" - "github.com/openimsdk/tools/mq" - "github.com/openimsdk/tools/utils/datautil" - - "go.mongodb.org/mongo-driver/mongo" - "github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/database" "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model" + "github.com/openimsdk/protocol/constant" pbmsg "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mq" + "github.com/openimsdk/tools/utils/datautil" ) type MsgTransferDatabase interface {