From 79c30fdc69a9471db986d1442d6de76c31e647e9 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 10 Feb 2023 11:03:03 +0800 Subject: [PATCH] errcode --- internal/common/{rpc_server => rpcserver}/register.go | 7 +++---- internal/rpc/auth/auth.go | 6 +++--- internal/rpc/friend/friend.go | 6 +++--- internal/rpc/user/user.go | 6 +++--- pkg/common/db/controller/group.go | 2 +- pkg/common/db/controller/msg.go | 1 + pkg/common/db/unrelation/mongo.go | 9 +++++++++ pkg/common/db/unrelation/super_group.go | 9 --------- 8 files changed, 23 insertions(+), 23 deletions(-) rename internal/common/{rpc_server => rpcserver}/register.go (92%) create mode 100644 pkg/common/db/controller/msg.go diff --git a/internal/common/rpc_server/register.go b/internal/common/rpcserver/register.go similarity index 92% rename from internal/common/rpc_server/register.go rename to internal/common/rpcserver/register.go index 107c0cbf8..bc9e25fd7 100644 --- a/internal/common/rpc_server/register.go +++ b/internal/common/rpcserver/register.go @@ -1,4 +1,4 @@ -package rpc_server +package rpcserver import ( "Open_IM/internal/common/network" @@ -31,12 +31,11 @@ func NewRpcServer(registerIPInConfig string, port int, registerName string, zkSe if err != nil { return nil, err } - err = zkClient.Register(s.RegisterName, registerIP, s.Port) + s.RegisterCenter = zkClient + err = s.RegisterCenter.Register(s.RegisterName, registerIP, s.Port) if err != nil { return nil, err } - s.RegisterCenter = zkClient - return s, nil } diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index f723731e4..c6df00f05 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -20,7 +20,7 @@ import ( ) func NewRpcAuthServer(port int) *rpcAuth { - r, err := rpc_server.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImAuthName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) + r, err := rpcserver.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImAuthName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) if err != nil { panic(err) } @@ -35,7 +35,7 @@ func NewRpcAuthServer(port int) *rpcAuth { func (s *rpcAuth) Run() { operationID := utils.OperationIDGenerator() log.NewInfo(operationID, "rpc auth start...") - listener, address, err := rpc_server.GetTcpListen(config.Config.ListenIP, s.Port) + listener, address, err := rpcserver.GetTcpListen(config.Config.ListenIP, s.Port) if err != nil { panic(err) } @@ -141,6 +141,6 @@ func (s *rpcAuth) forceKickOff(ctx context.Context, userID string, platformID in } type rpcAuth struct { - *rpc_server.RpcServer + *rpcserver.RpcServer controller.AuthInterface } diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index e04700a91..00704381e 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -23,14 +23,14 @@ import ( ) type friendServer struct { - *rpc_server.RpcServer + *rpcserver.RpcServer controller.FriendInterface controller.BlackInterface } func NewFriendServer(port int) *friendServer { - r, err := rpc_server.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImFriendName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) + r, err := rpcserver.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImFriendName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) if err != nil { panic(err) } @@ -64,7 +64,7 @@ func NewFriendServer(port int) *friendServer { func (s *friendServer) Run() { operationID := utils.OperationIDGenerator() log.NewInfo(operationID, "friendServer run...") - listener, address, err := rpc_server.GetTcpListen(config.Config.ListenIP, s.Port) + listener, address, err := rpcserver.GetTcpListen(config.Config.ListenIP, s.Port) if err != nil { panic(err) } diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index bac7af32d..8210a74fa 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -25,12 +25,12 @@ import ( type userServer struct { rpcPort int rpcRegisterName string - *rpc_server.RpcServer + *rpcserver.RpcServer controller.UserInterface } func NewUserServer(port int) *userServer { - r, err := rpc_server.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImUserName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) + r, err := rpcserver.NewRpcServer(config.Config.RpcRegisterIP, port, config.Config.RpcRegisterName.OpenImUserName, config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema) if err != nil { panic(err) } @@ -52,7 +52,7 @@ func NewUserServer(port int) *userServer { func (s *userServer) Run() { operationID := utils.OperationIDGenerator() log.NewInfo(operationID, "rpc user start...") - listener, address, err := rpc_server.GetTcpListen(config.Config.ListenIP, s.Port) + listener, address, err := rpcserver.GetTcpListen(config.Config.ListenIP, s.Port) if err != nil { panic(err) } diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 96085d128..dec4af282 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -397,7 +397,7 @@ func (g *GroupDataBase) MapGroupMemberUserID(ctx context.Context, groupIDs []str mapGroupUserIDs, err := g.groupMemberDB.FindJoinUserID(ctx, groupIDs) if err != nil { return nil, err - } + } // 批量cache res := make(map[string]*GroupSimpleUserID) for _, groupID := range groupIDs { users := &GroupSimpleUserID{ diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go new file mode 100644 index 000000000..b0b429f89 --- /dev/null +++ b/pkg/common/db/controller/msg.go @@ -0,0 +1 @@ +package controller diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index a359e11d0..37daa9480 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -150,3 +150,12 @@ func MongoTransaction(ctx context.Context, mgo *mongo.Client, fn func(ctx mongo. } return utils.Wrap(sess.CommitTransaction(sCtx), "") } + +func getTxCtx(ctx context.Context, tx []any) context.Context { + if len(tx) > 0 { + if ctx, ok := tx[0].(mongo.SessionContext); ok { + return ctx + } + } + return ctx +} diff --git a/pkg/common/db/unrelation/super_group.go b/pkg/common/db/unrelation/super_group.go index a5763ea56..720693d6d 100644 --- a/pkg/common/db/unrelation/super_group.go +++ b/pkg/common/db/unrelation/super_group.go @@ -111,15 +111,6 @@ type SuperGroupMongoDriver struct { // panic("implement me") // } -func (s *SuperGroupMongoDriver) getTxCtx(ctx context.Context, tx []any) context.Context { - if len(tx) > 0 { - if ctx, ok := tx[0].(mongo.SessionContext); ok { - return ctx - } - } - return ctx -} - //func (s *SuperGroupMongoDriver) Transaction(ctx context.Context, fn func(ctx mongo.SessionContext) error) error { // sess, err := s.MgoClient.StartSession() // if err != nil {