From 9edc48d088dbc3b05b271676ac9518d8a2b11b13 Mon Sep 17 00:00:00 2001
From: Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:27:02 +0800
Subject: [PATCH] refactor: cmd update.

---
 pkg/common/cmd/group.go |  2 ++
 pkg/common/cmd/root.go  | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/common/cmd/group.go b/pkg/common/cmd/group.go
index 1f85072ba..aa76125dd 100644
--- a/pkg/common/cmd/group.go
+++ b/pkg/common/cmd/group.go
@@ -19,6 +19,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/group"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
+	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/system/program"
 	"github.com/spf13/cobra"
 )
@@ -56,6 +57,7 @@ func (a *GroupRpcCmd) Exec() error {
 }
 
 func (a *GroupRpcCmd) preRunE() error {
+	log.CInfo(a.ctx, "GroupRpcCmd preRunE", "rpc config", a.groupConfig.RpcConfig)
 	return startrpc.Start(a.ctx, &a.groupConfig.ZookeeperConfig, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
 		a.groupConfig.RpcConfig.RPC.RegisterIP, a.groupConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.groupConfig.Share.RpcRegisterName.Auth, &a.groupConfig.Share, &a.groupConfig, group.Start)
diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go
index a0d9a7d9f..900281367 100644
--- a/pkg/common/cmd/root.go
+++ b/pkg/common/cmd/root.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/spf13/cobra"
@@ -29,7 +29,7 @@ type RootCmd struct {
 	processName    string
 	port           int
 	prometheusPort int
-	log            config2.Log
+	log            config.Log
 	index          int
 }
 
@@ -102,14 +102,14 @@ func (r *RootCmd) initializeConfiguration(cmd *cobra.Command, opts *CmdOpts) err
 	// Load common configuration file
 	//opts.configMap[ShareFileName] = StructEnvPrefix{EnvPrefix: shareEnvPrefix, ConfigStruct: &r.share}
 	for configFileName, configStruct := range opts.configMap {
-		err := config2.LoadConfig(filepath.Join(configDirectory, configFileName),
+		err := config.LoadConfig(filepath.Join(configDirectory, configFileName),
 			ConfigEnvPrefixMap[configFileName], configStruct)
 		if err != nil {
 			return err
 		}
 	}
 	// Load common log configuration file
-	return config2.LoadConfig(filepath.Join(configDirectory, LogConfigFileName),
+	return config.LoadConfig(filepath.Join(configDirectory, LogConfigFileName),
 		ConfigEnvPrefixMap[LogConfigFileName], &r.log)
 }
 
@@ -133,12 +133,12 @@ func (r *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
 		r.log.StorageLocation,
 		r.log.RemainRotationCount,
 		r.log.RotationTime,
-		config2.Version,
+		config.Version,
 	)
 	if err != nil {
 		return errs.Wrap(err)
 	}
-	return errs.Wrap(log.InitConsoleLogger(r.processName, r.log.RemainLogLevel, r.log.IsJson, config2.Version))
+	return errs.Wrap(log.InitConsoleLogger(r.processName, r.log.RemainLogLevel, r.log.IsJson, config.Version))
 
 }