blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

script

Browse Source
This commit is contained in:
wangchuxiao 2023-03-09 12:34:08 +08:00
parent 889f3031bf
commit fae6fdc3ed
9 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/rpc/auth/main.go
View File

@ -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)
}

4
cmd/rpc/conversation/main.go
View File

@ -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)
}

4
cmd/rpc/friend/main.go
View File

@ -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)
}

4
cmd/rpc/group/main.go
View File

@ -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)
}

4
cmd/rpc/msg/main.go
View File

@ -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)
}

4
cmd/rpc/third/main.go
View File

@ -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)
}

4
cmd/rpc/user/main.go
View File

@ -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)
}

2
pkg/common/cmd/push.go
View File

@ -12,7 +12,7 @@ type PushCmd struct {
}
func NewPushCmd() *PushCmd {
return &PushCmd{NewRpcCmd(config.Config.RpcRegisterName.OpenImPushName)}
return &PushCmd{NewRpcCmd()}
}
func (r *RpcCmd) AddPush() {

19
pkg/common/cmd/rpc.go
View File

@ -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()
}