IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-15 06:25:58 +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
Download Patch File Download Diff File Expand all files Collapse all files
internal/common/rpc_server/register.go → internal/common/rpcserver/register.go
+3 -4
View File
@@ -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
}
internal/rpc/auth/auth.go
+3 -3
View File
@@ -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
}
internal/rpc/friend/friend.go
+3 -3
View File
@@ -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)
}
internal/rpc/user/user.go
+3 -3
View File
@@ -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)
}