optimization: change the configuration file from being read globally … (#1935)

* optimization: change the configuration file from being read globally to being read independently. * optimization: change the configuration file from being read globally to being read independently. * optimization: change the configuration file from being read globally to being read independently. * optimization: config file changed to dependency injection. * fix: replace global config with dependency injection * fix: replace global config with dependency injection * fix: import the enough param * fix: import the enough param * fix: import the enough param * fix: fix the component check of path * fix: fix the kafka of tls is nil problem * fix: fix the TLS.CACrt is nil error * fix: fix the valiable shadows problem * fix: fix the comflect * optimization: message remove options. * fix: fix the param pass error * fix: find error * fix: find error * fix: find eror * fix: find error * fix: find error * fix: del the undifined func * fix: find error * fix: fix the error * fix: pass config * fix: find error * fix: find error * fix: find error * fix: find error * fix: find error * fix: fix the config * fix: fix the error * fix: fix the config pass error * fix: fix the eror * fix: fix the error * fix: fix the error * fix: fix the error * fix: find error * fix: fix the error * fix: fix the config * fix: add return err * fix: fix the err2 * fix: err * fix: fix the func * fix: del the chinese comment * fix: fix the func * fix: fix the gateway_test logic * fix: s3 * test * test * fix: not found --------- Co-authored-by: luhaoling <2198702716@qq.com> Co-authored-by: withchao <993506633@qq.com>
2026-04-28 06:19:20 +08:00 · 2024-03-05 17:53:22 +08:00
parent efb8310531
commit 383758782e
114 changed files with 1743 additions and 1802 deletions
@@ -16,11 +16,10 @@ package cmd

 import (
 	"fmt"
-
 	"github.com/OpenIMSDK/protocol/constant"
-	"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
+
+	"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
 )

 type MsgTransferCmd struct {
@@ -29,37 +28,29 @@ type MsgTransferCmd struct {

 func NewMsgTransferCmd() *MsgTransferCmd {
 	ret := &MsgTransferCmd{NewRootCmd("msgTransfer")}
+	ret.addRunE()
 	ret.SetRootCmdPt(ret)
 	return ret
 }

 func (m *MsgTransferCmd) addRunE() {
 	m.Command.RunE = func(cmd *cobra.Command, args []string) error {
-		prometheusPort, err := m.getPrometheusPortFlag(cmd)
-		if err != nil {
-			return err
-		}
-		return msgtransfer.StartTransfer(prometheusPort)
+		return msgtransfer.StartTransfer(m.config, m.getPrometheusPortFlag(cmd))
 	}
 }

 func (m *MsgTransferCmd) Exec() error {
-	m.addRunE()
 	return m.Execute()
 }

-func (m *MsgTransferCmd) GetPortFromConfig(portType string) (int, error) {
+func (m *MsgTransferCmd) GetPortFromConfig(portType string) int {
 	if portType == constant.FlagPort {
-		return 0, nil
+		return 0
 	} else if portType == constant.FlagPrometheusPort {
 		n := m.getTransferProgressFlagValue()
-
-		if n < len(config2.Config.Prometheus.MessageTransferPrometheusPort) {
-			return config2.Config.Prometheus.MessageTransferPrometheusPort[n], nil
-		}
-		return 0, fmt.Errorf("index out of range for MessageTransferPrometheusPort with index %d", n)
+		return m.config.Prometheus.MessageTransferPrometheusPort[n]
 	}
-	return 0, fmt.Errorf("unknown port type: %s", portType)
+	return 0
 }

 func (m *MsgTransferCmd) AddTransferProgressFlag() {
@@ -67,10 +58,10 @@ func (m *MsgTransferCmd) AddTransferProgressFlag() {
 }

 func (m *MsgTransferCmd) getTransferProgressFlagValue() int {
-	nindex, err := m.Command.Flags().GetInt(constant.FlagTransferProgressIndex)
+	nIndex, err := m.Command.Flags().GetInt(constant.FlagTransferProgressIndex)
 	if err != nil {
-		fmt.Println("get transfercmd error,make sure it is k8s env or not")
+		fmt.Println("get transfer cmd error,make sure it is k8s env or not")
 		return 0
 	}
-	return nindex
+	return nIndex
 }