update config

cmd/rootcmd.go

@@ -17,8 +17,7 @@ import (
 )
 
 var (
-	rewardAddr, dockerServer       string
-	isSetReward, isSetDockerServer bool
+	rewardAddr, dockerServer string
 )
 
 func init() {
@@ -33,23 +32,25 @@ var RootCmd = &cobra.Command{
 	Short: "The miner command-line interface",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		if rewardAddr != "" && dockerServer != "" {
-			isSetDockerServer = conf.GetConfig().SetDockerServerUrl(dockerServer)
-			if !isSetDockerServer {
-				log.Error("Enter right docker server address:", dockerServer)
-			}
-			log.Info("Enter docker server url:", dockerServer)
-			isSetReward = conf.GetConfig().SetRewardAddress(rewardAddr)
-			if !isSetReward {
-				log.Error("Please set right reward address")
-			}
-			log.Info("Enter reward address:", rewardAddr)
+		if rewardAddr == "" {
+			log.Error("Enter reward address is not nil")
+			return
 		}
-		if isSetReward && isSetDockerServer {
-			log.InitLog(log.LogConfig{Path: "logs", Level: "debug", Save: 3})
-			go nm.StartMonitor()
-			beego.Run()
+		isSetDockerServer := conf.GetConfig().SetDockerServerUrl(dockerServer)
+		if !isSetDockerServer {
+			log.Error("Enter right docker server address:", dockerServer)
+			return
 		}
+		log.Info("Enter docker server url:", dockerServer)
+		isSetReward := conf.GetConfig().SetRewardAddress(rewardAddr)
+		if !isSetReward {
+			log.Error("Please set right reward address")
+			return
+		}
+		log.Info("Enter reward address:", rewardAddr)
+		log.InitLog(log.LogConfig{Path: "logs", Level: "debug", Save: 3})
+		go nm.StartMonitor()
+		beego.Run()
 	},
 }
 

conf/config.go

@@ -3,6 +3,7 @@ package conf
 import (
 	"crypto/ecdsa"
 	"example.com/m/log"
+	"fmt"
 	"github.com/ethereum/go-ethereum/common"
 	"net/url"
 )
@@ -44,9 +45,9 @@ func (c *Config) SetRewardAddress(addr string) bool {
 }
 
 func (c *Config) SetDockerServerUrl(url string) bool {
-	isSuccess := checkDockerServer(url)
+	isSuccess, newUrl := checkDockerServer(url)
 	if isSuccess {
-		c.DockerServer = url
+		c.DockerServer = newUrl
 	}
 	return isSuccess
 }
@@ -55,16 +56,28 @@ func (c *Config) SetNmSeed(seed string) {
 	c.NmSeed = seed
 }
 
-func checkDockerServer(rawURL string) bool {
+func checkDockerServer(rawURL string) (bool, string) {
+	if rawURL == "" {
+		return true, fmt.Sprintf("tcp://%s:%s", "host.docker.internal", "2375")
+	}
 	parsedURL, err := url.Parse(rawURL)
 	if err != nil {
 		log.Error("Error parsing URL:", err)
-		return false
+		return false, ""
 	}
 	// 提取协议、主机和端口信息
 	protocol := parsedURL.Scheme
-	if protocol != "tcp" {
-		return false
+	if parsedURL.Scheme != "" && protocol != "tcp" {
+		return false, ""
+	}
+	ip := "host.docker.internal"
+	port := "2375"
+	if parsedURL.Port() != "" {
+		port = parsedURL.Port()
+	}
+	if parsedURL.Host != "" {
+		ip = parsedURL.Host
 	}
-	return true
+	newUrl := fmt.Sprintf("tcp://%s:%s", ip, port)
+	return true, newUrl
 }