diff --git a/.gitignore b/.gitignore index 6f8c0931d..40ffa04f2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ components out-test .github .idea - +.exe deploy/open_im_api deploy/open_im_msg_gateway diff --git a/internal/api/user.go b/internal/api/user.go index 12e720e99..272121abb 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -20,7 +20,7 @@ import ( func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User { conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImUserName) if err != nil { - panic(err) + // panic(err) } log.ZInfo(context.Background(), "user rpc conn", "conn", conn) return &User{conn: conn, discov: discov} @@ -34,7 +34,7 @@ type User struct { func (u *User) client(ctx context.Context) (user.UserClient, error) { conn, err := u.discov.GetConn(ctx, config.Config.RpcRegisterName.OpenImUserName) if err != nil { - panic(err) + return nil, err } return user.NewUserClient(conn), nil } diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index b970a2758..79c7160eb 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -408,7 +408,13 @@ func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversat // } func (db *commonMsgDatabase) findMsgInfoBySeq(ctx context.Context, userID, docID string, seqs []int64) (totalMsgs []*unRelationTb.MsgInfoModel, err error) { - return db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, userID, docID, seqs) + msgs, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, userID, docID, seqs) + for _, msg := range msgs { + if msg.IsRead { + msg.Msg.IsRead = true + } + } + return msgs, err } func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID string, conversationID string, allSeqs []int64, begin, end int64) (seqMsgs []*sdkws.MsgData, err error) {