diff --git a/cmd/rpc/auth/main.go b/cmd/rpc/auth/main.go index a63401a71..609eab4a1 100644 --- a/cmd/rpc/auth/main.go +++ b/cmd/rpc/auth/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImAuthName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(auth.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/conversation/main.go b/cmd/rpc/conversation/main.go index 4bd600a16..4e5006815 100644 --- a/cmd/rpc/conversation/main.go +++ b/cmd/rpc/conversation/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImConversationName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(conversation.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/friend/main.go b/cmd/rpc/friend/main.go index 5e8293ba6..caf5750bf 100644 --- a/cmd/rpc/friend/main.go +++ b/cmd/rpc/friend/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImFriendName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(friend.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/group/main.go b/cmd/rpc/group/main.go index 098733e1c..1a4fa1355 100644 --- a/cmd/rpc/group/main.go +++ b/cmd/rpc/group/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImGroupName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(friend.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImGroupName, friend.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/msg/main.go b/cmd/rpc/msg/main.go index 661fa9817..be88b22a8 100644 --- a/cmd/rpc/msg/main.go +++ b/cmd/rpc/msg/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImMsgName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(msg.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/third/main.go b/cmd/rpc/third/main.go index 5b14a1ad1..20dcbb421 100644 --- a/cmd/rpc/third/main.go +++ b/cmd/rpc/third/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImThirdName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(third.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/cmd/rpc/user/main.go b/cmd/rpc/user/main.go index 72d5ee4e9..9f82776b2 100644 --- a/cmd/rpc/user/main.go +++ b/cmd/rpc/user/main.go @@ -9,10 +9,10 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImUserName) + rpcCmd := cmd.NewRpcCmd() rpcCmd.AddPortFlag() rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec(user.Start); err != nil { + if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/pkg/common/cmd/push.go b/pkg/common/cmd/push.go index db6144af4..a53286507 100644 --- a/pkg/common/cmd/push.go +++ b/pkg/common/cmd/push.go @@ -12,7 +12,7 @@ type PushCmd struct { } func NewPushCmd() *PushCmd { - return &PushCmd{NewRpcCmd(config.Config.RpcRegisterName.OpenImPushName)} + return &PushCmd{NewRpcCmd()} } func (r *RpcCmd) AddPush() { diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 463db5762..17ad0794d 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -2,34 +2,27 @@ package cmd import ( "OpenIM/internal/startrpc" - "OpenIM/pkg/common/config" "OpenIM/pkg/discoveryregistry" - "fmt" "github.com/spf13/cobra" "google.golang.org/grpc" ) type RpcCmd struct { *RootCmd - rpcRegisterName string } -func NewRpcCmd(rpcRegisterName string) *RpcCmd { - rpcCmd := &RpcCmd{NewRootCmd(), rpcRegisterName} - fmt.Println("line 18", *rpcCmd, rpcCmd, rpcRegisterName, config.Config.RpcRegisterName) +func NewRpcCmd() *RpcCmd { + rpcCmd := &RpcCmd{NewRootCmd()} return rpcCmd } -func (r *RpcCmd) AddRpc(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) { +func (r *RpcCmd) addRpc(rpcRegisterName string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) { r.Command.RunE = func(cmd *cobra.Command, args []string) error { - return startrpc.Start(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn) + return startrpc.Start(r.getPortFlag(cmd), rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn) } } -func (r *RpcCmd) Exec(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { - fmt.Println(r) - - r.AddRpc(rpcFn) - fmt.Println(r) +func (r *RpcCmd) Exec(rpcRegisterName string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { + r.addRpc(rpcRegisterName, rpcFn) return r.Execute() }