mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-10-30 07:44:19 +08:00
update
This commit is contained in:
parent
37405b7366
commit
ef19d5695a
@ -16,12 +16,20 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
msgTransferCmd := cmd.NewMsgTransferCmd()
|
msgTransferCmd := cmd.NewMsgTransferCmd()
|
||||||
|
msgTransferCmd.PreLoadConfig()
|
||||||
|
msgTransferCmd.SetSvcName(config.Config.RpcRegisterName.OpenImMessageTransfer)
|
||||||
|
|
||||||
msgTransferCmd.AddPrometheusPortFlag()
|
msgTransferCmd.AddPrometheusPortFlag()
|
||||||
if err := msgTransferCmd.Exec(); err != nil {
|
if err := msgTransferCmd.Exec(); err != nil {
|
||||||
panic(err.Error())
|
panic(err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if err := msgTransferCmd.StartSvr(config.Config.RpcRegisterName.OpenImMessageTransfer, msgTransferCmd.Start); err != nil {
|
||||||
|
// panic(err.Error())
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,6 +22,9 @@ import (
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
pushCmd := cmd.NewRpcCmd("push")
|
pushCmd := cmd.NewRpcCmd("push")
|
||||||
|
pushCmd.PreLoadConfig()
|
||||||
|
pushCmd.SetSvcName(config.Config.RpcRegisterName.OpenImPushName)
|
||||||
|
|
||||||
pushCmd.AddPortFlag()
|
pushCmd.AddPortFlag()
|
||||||
pushCmd.AddPrometheusPortFlag()
|
pushCmd.AddPrometheusPortFlag()
|
||||||
if err := pushCmd.Exec(); err != nil {
|
if err := pushCmd.Exec(); err != nil {
|
||||||
|
|||||||
@ -22,6 +22,9 @@ import (
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
rpcCmd := cmd.NewRpcCmd("msg")
|
rpcCmd := cmd.NewRpcCmd("msg")
|
||||||
|
rpcCmd.PreLoadConfig()
|
||||||
|
rpcCmd.SetSvcName(config.Config.RpcRegisterName.OpenImMsgName)
|
||||||
|
|
||||||
rpcCmd.AddPortFlag()
|
rpcCmd.AddPortFlag()
|
||||||
rpcCmd.AddPrometheusPortFlag()
|
rpcCmd.AddPrometheusPortFlag()
|
||||||
if err := rpcCmd.Exec(); err != nil {
|
if err := rpcCmd.Exec(); err != nil {
|
||||||
|
|||||||
@ -196,6 +196,7 @@ rpcRegisterName:
|
|||||||
openImMsgName: Msg
|
openImMsgName: Msg
|
||||||
openImPushName: Push
|
openImPushName: Push
|
||||||
openImMessageGatewayName: MessageGateway
|
openImMessageGatewayName: MessageGateway
|
||||||
|
openImMessageTransfer: MessageTransfer
|
||||||
openImGroupName: Group
|
openImGroupName: Group
|
||||||
openImAuthName: Auth
|
openImAuthName: Auth
|
||||||
openImConversationName: Conversation
|
openImConversationName: Conversation
|
||||||
|
|||||||
@ -30,7 +30,12 @@ func NewMsgTransferCmd() MsgTransferCmd {
|
|||||||
|
|
||||||
func (m *MsgTransferCmd) addRunE() {
|
func (m *MsgTransferCmd) addRunE() {
|
||||||
m.Command.RunE = func(cmd *cobra.Command, args []string) error {
|
m.Command.RunE = func(cmd *cobra.Command, args []string) error {
|
||||||
return msgtransfer.StartTransfer(m.getPrometheusPortFlag(cmd))
|
promePort := m.getPrometheusPortFlag(cmd)
|
||||||
|
if promePort == 0 {
|
||||||
|
promePort = m.GetPrometheusPortFlag()
|
||||||
|
}
|
||||||
|
|
||||||
|
return msgtransfer.StartTransfer(promePort)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,3 +43,17 @@ func (m *MsgTransferCmd) Exec() error {
|
|||||||
m.addRunE()
|
m.addRunE()
|
||||||
return m.Execute()
|
return m.Execute()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// func (a *MsgTransferCmd) StartSvr(
|
||||||
|
// name string,
|
||||||
|
// rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
|
||||||
|
// ) error {
|
||||||
|
// if a.GetPortFlag() == 0 {
|
||||||
|
// return errors.New("port is required")
|
||||||
|
// }
|
||||||
|
// return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
|
||||||
|
// }
|
||||||
|
|
||||||
|
// func (a *MsgTransferCmd) Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
|
||||||
|
// return nil
|
||||||
|
// }
|
||||||
|
|||||||
@ -135,6 +135,8 @@ func (r *RootCmd) GetPrometheusPortFlag() int {
|
|||||||
return config.Config.Prometheus.PushPrometheusPort[0]
|
return config.Config.Prometheus.PushPrometheusPort[0]
|
||||||
case config.Config.RpcRegisterName.OpenImMessageGatewayName:
|
case config.Config.RpcRegisterName.OpenImMessageGatewayName:
|
||||||
return config.Config.Prometheus.MessageGatewayPrometheusPort[0]
|
return config.Config.Prometheus.MessageGatewayPrometheusPort[0]
|
||||||
|
case config.Config.RpcRegisterName.OpenImMessageTransfer:
|
||||||
|
return config.Config.Prometheus.MessageTransferPrometheusPort[0]
|
||||||
case config.Config.RpcRegisterName.OpenImThirdName:
|
case config.Config.RpcRegisterName.OpenImThirdName:
|
||||||
return config.Config.Prometheus.ThirdPrometheusPort[0]
|
return config.Config.Prometheus.ThirdPrometheusPort[0]
|
||||||
default:
|
default:
|
||||||
|
|||||||
@ -167,6 +167,7 @@ type configStruct struct {
|
|||||||
OpenImMsgName string `yaml:"openImMsgName"`
|
OpenImMsgName string `yaml:"openImMsgName"`
|
||||||
OpenImPushName string `yaml:"openImPushName"`
|
OpenImPushName string `yaml:"openImPushName"`
|
||||||
OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"`
|
OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"`
|
||||||
|
OpenImMessageTransfer string `yaml:"openImMessageTransfer"`
|
||||||
OpenImGroupName string `yaml:"openImGroupName"`
|
OpenImGroupName string `yaml:"openImGroupName"`
|
||||||
OpenImAuthName string `yaml:"openImAuthName"`
|
OpenImAuthName string `yaml:"openImAuthName"`
|
||||||
OpenImConversationName string `yaml:"openImConversationName"`
|
OpenImConversationName string `yaml:"openImConversationName"`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user