fix(core): force to replace send time when malloc seq (#3818)

* fix(core): force to replace send time when malloc seq

# Conflicts:
#	pkg/common/storage/controller/msg_transfer.go

* refactor(core): Reorganize message transfer imports
This commit is contained in:
dsx137 2026-10-16 15:48:19 +08:00 committed by GitHub
parent 120cee6d57
commit c9b164fa59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2,21 +2,22 @@ package controller
import (
"context"
"time"
"github.com/openimsdk/open-im-server/v3/pkg/common/convert"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/kafka"
"github.com/openimsdk/protocol/constant"
"github.com/openimsdk/tools/utils/datautil"
"go.mongodb.org/mongo-driver/mongo"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/convert"
"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/kafka"
"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"
"go.mongodb.org/mongo-driver/mongo"
"github.com/openimsdk/tools/utils/datautil"
)
type MsgTransferDatabase interface {
@ -238,6 +239,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)
@ -250,6 +253,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)
}