This commit is contained in:
wangchuxiao 2023-03-09 14:54:05 +08:00
parent 3bcc696826
commit 82f499f942
10 changed files with 40 additions and 17 deletions

View File

@ -9,7 +9,7 @@ import (
) )
func main() { func main() {
authCmd := cmd.NewAuthCmd() authCmd := cmd.NewRpcCmd()
authCmd.AddPortFlag() authCmd.AddPortFlag()
authCmd.AddPrometheusPortFlag() authCmd.AddPrometheusPortFlag()
if err := authCmd.Exec(); err != nil { if err := authCmd.Exec(); err != nil {

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImGroupName, friend.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, friend.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -12,7 +12,11 @@ func main() {
rpcCmd := cmd.NewRpcCmd() rpcCmd := cmd.NewRpcCmd()
rpcCmd.AddPortFlag() rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag() rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil { if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

View File

@ -8,7 +8,7 @@ import (
) )
type PushCmd struct { type PushCmd struct {
*AuthCmd *RpcCmd
} }
func NewPushCmd() *PushCmd { func NewPushCmd() *PushCmd {

View File

@ -23,7 +23,7 @@ func NewRootCmd() (rootCmd *RootCmd) {
}, },
} }
rootCmd.Command = c rootCmd.Command = c
rootCmd.init() rootCmd.addConfFlag()
return rootCmd return rootCmd
} }
@ -39,7 +39,7 @@ func (r *RootCmd) AddRpc(f func(port, prometheusPort int) error) {
} }
} }
func (r *RootCmd) init() { func (r *RootCmd) addConfFlag() {
r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder") r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
} }

View File

@ -7,24 +7,23 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
) )
type AuthCmd struct { type RpcCmd struct {
*RootCmd *RootCmd
} }
func NewAuthCmd() *AuthCmd { func NewRpcCmd() *RpcCmd {
authCmd := &AuthCmd{NewRootCmd()} authCmd := &RpcCmd{NewRootCmd()}
return authCmd return authCmd
} }
func (a *AuthCmd) Exec() error { func (a *RpcCmd) Exec() error {
a.Command.RunE = func(cmd *cobra.Command, args []string) error { a.Command.Run = func(cmd *cobra.Command, args []string) {
a.port = a.getPortFlag(cmd) a.port = a.getPortFlag(cmd)
a.prometheusPort = a.getPrometheusPortFlag(cmd) a.prometheusPort = a.getPrometheusPortFlag(cmd)
return a.getConfFromCmdAndInit(cmd)
} }
return a.Execute() return a.Execute()
} }
func (a *AuthCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { func (a *RpcCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn) return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
} }