diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 0d70f48a7..cbe5514b5 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,6 +16,7 @@ package group import ( "context" + "github.com/openimsdk/tools/utils/datautil" "time" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" @@ -28,7 +29,6 @@ import ( pbgroup "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" - "github.com/openimsdk/tools/utils/datautil" "google.golang.org/protobuf/types/known/wrapperspb" ) @@ -68,7 +68,6 @@ func CallbackBeforeCreateGroup(ctx context.Context, cfg *GroupEventCallbackConfi if err = http.CallBackPostReturn(ctx, cfg.CallbackUrl, cbReq, resp, cfg.BeforeCreateGroup); err != nil { return err } - datautil.NotNilReplace(&req.GroupInfo.GroupID, resp.GroupID) datautil.NotNilReplace(&req.GroupInfo.GroupName, resp.GroupName) datautil.NotNilReplace(&req.GroupInfo.Notification, resp.Notification) diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index a169e70ec..7c13a3666 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -16,9 +16,9 @@ package msg import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" diff --git a/internal/rpc/msg/msg_status.go b/internal/rpc/msg/msg_status.go index c61ac59cf..b524d6236 100644 --- a/internal/rpc/msg/msg_status.go +++ b/internal/rpc/msg/msg_status.go @@ -22,10 +22,7 @@ import ( "github.com/openimsdk/tools/mcontext" ) -func (m *msgServer) SetSendMsgStatus( - ctx context.Context, - req *pbmsg.SetSendMsgStatusReq, -) (*pbmsg.SetSendMsgStatusResp, error) { +func (m *msgServer) SetSendMsgStatus(ctx context.Context, req *pbmsg.SetSendMsgStatusReq) (*pbmsg.SetSendMsgStatusResp, error) { resp := &pbmsg.SetSendMsgStatusResp{} if err := m.MsgDatabase.SetSendMsgStatus(ctx, mcontext.GetOperationID(ctx), req.Status); err != nil { return nil, err @@ -33,10 +30,7 @@ func (m *msgServer) SetSendMsgStatus( return resp, nil } -func (m *msgServer) GetSendMsgStatus( - ctx context.Context, - req *pbmsg.GetSendMsgStatusReq, -) (*pbmsg.GetSendMsgStatusResp, error) { +func (m *msgServer) GetSendMsgStatus(ctx context.Context, req *pbmsg.GetSendMsgStatusReq) (*pbmsg.GetSendMsgStatusResp, error) { resp := &pbmsg.GetSendMsgStatusResp{} status, err := m.MsgDatabase.GetSendMsgStatus(ctx, mcontext.GetOperationID(ctx)) if IsNotFound(err) { diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index dfd1abce0..2b0bbe410 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -16,12 +16,13 @@ package msg import ( "context" + "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/redisutil" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/constant" @@ -66,16 +67,16 @@ func (m *msgServer) addInterceptorHandler(interceptorFunc ...MessageInterceptorF //} func Start(ctx context.Context, config *config.GlobalConfig, client discovery.SvcDiscoveryRegistry, server *grpc.Server) error { - rdb, err := cache.NewRedis(ctx, &config.Redis) + mgocli, err := mongoutil.NewMongoDB(ctx, config.Mongo.Build()) if err != nil { return err } - mongo, err := unrelation.NewMongoDB(ctx, &config.Mongo) + rdb, err := redisutil.NewRedisClient(ctx, config.Redis.Build()) if err != nil { return err } cacheModel := cache.NewMsgCacheModel(rdb, config.MsgCacheTimeout, &config.Redis) - msgDocModel, err := mgo.NewMsgMongo(mongo.GetDatabase(config.Mongo.Database)) + msgDocModel, err := mgo.NewMsgMongo(mgocli.GetDB()) if err != nil { return err } diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go index 409988497..bdb2c0911 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -16,16 +16,16 @@ package msg import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/timeutil" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" - "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/timeutil" ) func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) { diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index e03ad0d01..6680faaa6 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -16,19 +16,19 @@ package msg import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/encrypt" + "github.com/openimsdk/tools/utils/timeutil" "math/rand" "strconv" "time" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/encrypt" - "github.com/openimsdk/tools/utils/timeutil" ) var ExcludeContentType = []int{constant.HasReadReceipt} diff --git a/internal/rpc/user/callback.go b/internal/rpc/user/callback.go index 347c3a9b4..128ca7cb3 100644 --- a/internal/rpc/user/callback.go +++ b/internal/rpc/user/callback.go @@ -16,12 +16,12 @@ package user import ( "context" + "github.com/openimsdk/tools/utils/datautil" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" pbuser "github.com/openimsdk/protocol/user" - "github.com/openimsdk/tools/utils/datautil" ) func CallbackBeforeUpdateUserInfo(ctx context.Context, globalConfig *config.GlobalConfig, req *pbuser.UpdateUserInfoReq) error { diff --git a/internal/rpc/user/statistics.go b/internal/rpc/user/statistics.go index ea4c17bfd..d63a7ce31 100644 --- a/internal/rpc/user/statistics.go +++ b/internal/rpc/user/statistics.go @@ -22,10 +22,7 @@ import ( "github.com/openimsdk/tools/errs" ) -func (s *userServer) UserRegisterCount( - ctx context.Context, - req *pbuser.UserRegisterCountReq, -) (*pbuser.UserRegisterCountResp, error) { +func (s *userServer) UserRegisterCount(ctx context.Context, req *pbuser.UserRegisterCountReq) (*pbuser.UserRegisterCountResp, error) { if req.Start > req.End { return nil, errs.ErrArgs.WrapMsg("start > end") } diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 190275b61..48bbea285 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -17,6 +17,7 @@ package user import ( "context" "errors" + "github.com/openimsdk/tools/db/redisutil" "math/rand" "strings" "time" @@ -29,7 +30,6 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" tablerelation "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" @@ -61,11 +61,11 @@ func (s *userServer) GetGroupOnlineUser(ctx context.Context, req *pbuser.GetGrou } func Start(ctx context.Context, config *config.GlobalConfig, client registry.SvcDiscoveryRegistry, server *grpc.Server) error { - rdb, err := cache.NewRedis(ctx, &config.Redis) + mgocli, err := mongoutil.NewMongoDB(ctx, config.Mongo.Build()) if err != nil { return err } - mongo, err := unrelation.NewMongoDB(ctx, &config.Mongo) + rdb, err := redisutil.NewRedisClient(ctx, config.Redis.Build()) if err != nil { return err } @@ -76,13 +76,13 @@ func Start(ctx context.Context, config *config.GlobalConfig, client registry.Svc for k, v := range config.IMAdmin.UserID { users = append(users, &tablerelation.UserModel{UserID: v, Nickname: config.IMAdmin.Nickname[k], AppMangerLevel: constant.AppNotificationAdmin}) } - userDB, err := mgo.NewUserMongo(mongo.GetDatabase(config.Mongo.Database)) + userDB, err := mgo.NewUserMongo(mgocli.GetDB()) if err != nil { return err } cache := cache.NewUserCacheRedis(rdb, userDB, cache.GetDefaultOpt()) - userMongoDB := mgo.NewUserMongoDriver(mongo.GetDatabase(config.Mongo.Database)) - database := controller.NewUserDatabase(userDB, cache, mongoutil.NewMongo(mongo.GetClient()), userMongoDB) + userMongoDB := mgo.NewUserMongoDriver(mgocli.GetDB()) + database := controller.NewUserDatabase(userDB, cache, mgocli.GetTx(), userMongoDB) friendRpcClient := rpcclient.NewFriendRpcClient(client, config.RpcRegisterName.OpenImFriendName) groupRpcClient := rpcclient.NewGroupRpcClient(client, config.RpcRegisterName.OpenImGroupName) msgRpcClient := rpcclient.NewMessageRpcClient(client, config.RpcRegisterName.OpenImMsgName) diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 326b6127b..2da2b952f 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -16,15 +16,16 @@ package controller import ( "context" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/db/tx" + "github.com/openimsdk/tools/utils/datautil" "time" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/user" - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/db/tx" "github.com/openimsdk/tools/errs" - "github.com/openimsdk/tools/utils/datautil" + + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type UserDatabase interface {