blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-10 13:09:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-02-10 11:03:03 +08:00
parent 5d7809624c
commit 79c30fdc69
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/common/rpc_server/register.go → internal/common/rpcserver/register.go
View File

@ -1,4 +1,4 @@
package rpc_server package rpcserver
import ( import (
"Open_IM/internal/common/network" "Open_IM/internal/common/network"
@ -31,12 +31,11 @@ func NewRpcServer(registerIPInConfig string, port int, registerName string, zkSe
if err != nil { if err != nil {
return nil, err 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 { if err != nil {
return nil, err return nil, err
} }
s.RegisterCenter = zkClient
return s, nil return s, nil
} }

6
internal/rpc/auth/auth.go
View File

@ -20,7 +20,7 @@ import (
) )
func NewRpcAuthServer(port int) *rpcAuth { 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 { if err != nil {
panic(err) panic(err)
} }
@ -35,7 +35,7 @@ func NewRpcAuthServer(port int) *rpcAuth {
func (s *rpcAuth) Run() { func (s *rpcAuth) Run() {
operationID := utils.OperationIDGenerator() operationID := utils.OperationIDGenerator()
log.NewInfo(operationID, "rpc auth start...") 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 { if err != nil {
panic(err) panic(err)
} }
@ -141,6 +141,6 @@ func (s *rpcAuth) forceKickOff(ctx context.Context, userID string, platformID in
} }
type rpcAuth struct { type rpcAuth struct {
*rpc_server.RpcServer *rpcserver.RpcServer
controller.AuthInterface controller.AuthInterface
} }

6
internal/rpc/friend/friend.go
View File

@ -23,14 +23,14 @@ import (
) )
type friendServer struct { type friendServer struct {
*rpc_server.RpcServer *rpcserver.RpcServer
controller.FriendInterface controller.FriendInterface
controller.BlackInterface controller.BlackInterface
} }
func NewFriendServer(port int) *friendServer { 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 { if err != nil {
panic(err) panic(err)
} }
@ -64,7 +64,7 @@ func NewFriendServer(port int) *friendServer {
func (s *friendServer) Run() { func (s *friendServer) Run() {
operationID := utils.OperationIDGenerator() operationID := utils.OperationIDGenerator()
log.NewInfo(operationID, "friendServer run...") 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 { if err != nil {
panic(err) panic(err)
} }

6
internal/rpc/user/user.go
View File

@ -25,12 +25,12 @@ import (
type userServer struct { type userServer struct {
rpcPort int rpcPort int
rpcRegisterName string rpcRegisterName string
*rpc_server.RpcServer *rpcserver.RpcServer
controller.UserInterface controller.UserInterface
} }
func NewUserServer(port int) *userServer { 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 { if err != nil {
panic(err) panic(err)
} }
@ -52,7 +52,7 @@ func NewUserServer(port int) *userServer {
func (s *userServer) Run() { func (s *userServer) Run() {
operationID := utils.OperationIDGenerator() operationID := utils.OperationIDGenerator()
log.NewInfo(operationID, "rpc user start...") 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 { if err != nil {
panic(err) panic(err)
} }

2
pkg/common/db/controller/group.go
View File

@ -397,7 +397,7 @@ func (g *GroupDataBase) MapGroupMemberUserID(ctx context.Context, groupIDs []str
mapGroupUserIDs, err := g.groupMemberDB.FindJoinUserID(ctx, groupIDs) mapGroupUserIDs, err := g.groupMemberDB.FindJoinUserID(ctx, groupIDs)
if err != nil { if err != nil {
return nil, err return nil, err
} } // 批量cache
res := make(map[string]*GroupSimpleUserID) res := make(map[string]*GroupSimpleUserID)
for _, groupID := range groupIDs { for _, groupID := range groupIDs {
users := &GroupSimpleUserID{ users := &GroupSimpleUserID{

1
pkg/common/db/controller/msg.go Normal file
View File

@ -0,0 +1 @@
package controller

9
pkg/common/db/unrelation/mongo.go
View File

@ -150,3 +150,12 @@ func MongoTransaction(ctx context.Context, mgo *mongo.Client, fn func(ctx mongo.
} }
return utils.Wrap(sess.CommitTransaction(sCtx), "") 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
}

9
pkg/common/db/unrelation/super_group.go
View File

@ -111,15 +111,6 @@ type SuperGroupMongoDriver struct {
// panic("implement me") // 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 { //func (s *SuperGroupMongoDriver) Transaction(ctx context.Context, fn func(ctx mongo.SessionContext) error) error {
// sess, err := s.MgoClient.StartSession() // sess, err := s.MgoClient.StartSession()
// if err != nil { // if err != nil {