From 0c98231fcd9931c0c958969d6f88b4389c8f74c2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 9 Mar 2023 13:26:58 +0800 Subject: [PATCH] script --- cmd/rpc/auth/main.go | 12 ++++++++---- internal/api/auth.go | 2 +- pkg/common/cmd/auth.go | 5 ----- pkg/common/cmd/root.go | 12 +++++++++++- pkg/common/cmd/rpc.go | 32 +++++++++++--------------------- pkg/common/config/config.go | 22 +++++++++++----------- 6 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 pkg/common/cmd/auth.go diff --git a/cmd/rpc/auth/main.go b/cmd/rpc/auth/main.go index 93626f3f8..634162e4b 100644 --- a/cmd/rpc/auth/main.go +++ b/cmd/rpc/auth/main.go @@ -9,10 +9,14 @@ import ( ) func main() { - rpcCmd := cmd.NewRpcCmd() - rpcCmd.AddPortFlag() - rpcCmd.AddPrometheusPortFlag() - if err := rpcCmd.Exec2(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil { + authCmd := cmd.NewAuthCmd() + authCmd.AddPortFlag() + authCmd.AddPrometheusPortFlag() + if err := authCmd.Execute(); err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } + if err := authCmd.StartSvr(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil { fmt.Println(err.Error()) os.Exit(1) } diff --git a/internal/api/auth.go b/internal/api/auth.go index 209196f78..e997ba6aa 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -20,7 +20,7 @@ type Auth struct { } func (o *Auth) client() (auth.AuthClient, error) { - conn, err := o.c.GetConn(*config.Config.RpcRegisterName.OpenImAuthName) + conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImAuthName) if err != nil { return nil, err } diff --git a/pkg/common/cmd/auth.go b/pkg/common/cmd/auth.go deleted file mode 100644 index 1d8f84aad..000000000 --- a/pkg/common/cmd/auth.go +++ /dev/null @@ -1,5 +0,0 @@ -package cmd - -type AuthCmd struct { - *RpcCmd -} diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 990a4b68b..c2f43f266 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -7,7 +7,9 @@ import ( ) type RootCmd struct { - Command cobra.Command + Command cobra.Command + port int + prometheusPort int } func NewRootCmd() (rootCmd *RootCmd) { @@ -50,6 +52,10 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) int { return port } +func (r *RootCmd) GetPortFlag() int { + return r.port +} + func (r *RootCmd) AddPrometheusPortFlag() { r.Command.Flags().String(constant.FlagPrometheusPort, "", "server prometheus listen port") } @@ -59,6 +65,10 @@ func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int { return port } +func (r *RootCmd) GetPrometheusPortFlag() int { + return r.prometheusPort +} + func (r *RootCmd) getConfFromCmdAndInit(cmdLines *cobra.Command) error { configFolderPath, _ := cmdLines.Flags().GetString(constant.FlagConf) return config.InitConfig(configFolderPath) diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 5f204e096..38c006909 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -7,33 +7,23 @@ import ( "google.golang.org/grpc" ) -type RpcCmd struct { +type AuthCmd struct { *RootCmd } -func NewRpcCmd() *RpcCmd { - rpcCmd := &RpcCmd{NewRootCmd()} - return rpcCmd +func NewAuthCmd() *AuthCmd { + authCmd := &AuthCmd{NewRootCmd()} + return authCmd } -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), rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn) +func (a *AuthCmd) Execute() error { + a.Command.Run = func(cmd *cobra.Command, args []string) { + a.port = a.getPortFlag(cmd) + a.prometheusPort = a.getPrometheusPortFlag(cmd) } + return a.Execute() } -func (r *RpcCmd) Exec(rpcRegisterName string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { - r.addRpc(rpcRegisterName, rpcFn) - return r.Execute() -} - -func (r *RpcCmd) addRpc2(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), *rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn) - } -} - -func (r *RpcCmd) Exec2(rpcRegisterName *string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { - r.addRpc2(rpcRegisterName, rpcFn) - return r.Execute() +func (a *AuthCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { + return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn) } diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 97badb317..ed0f5a0d9 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -159,17 +159,17 @@ type config struct { OpenImThirdPort []int `yaml:"openImThirdPort"` } RpcRegisterName struct { - OpenImUserName string `yaml:"openImUserName"` - OpenImFriendName string `yaml:"openImFriendName"` - OpenImMsgName string `yaml:"openImMsgName"` - OpenImPushName string `yaml:"openImPushName"` - OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"` - OpenImGroupName string `yaml:"openImGroupName"` - OpenImAuthName *string `yaml:"openImAuthName"` - OpenImConversationName string `yaml:"openImConversationName"` - OpenImCacheName string `yaml:"openImCacheName"` - OpenImRtcName string `yaml:"openImRtcName"` - OpenImThirdName string `yaml:"openImThirdName"` + OpenImUserName string `yaml:"openImUserName"` + OpenImFriendName string `yaml:"openImFriendName"` + OpenImMsgName string `yaml:"openImMsgName"` + OpenImPushName string `yaml:"openImPushName"` + OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"` + OpenImGroupName string `yaml:"openImGroupName"` + OpenImAuthName string `yaml:"openImAuthName"` + OpenImConversationName string `yaml:"openImConversationName"` + OpenImCacheName string `yaml:"openImCacheName"` + OpenImRtcName string `yaml:"openImRtcName"` + OpenImThirdName string `yaml:"openImThirdName"` } Zookeeper struct { Schema string `yaml:"schema"`