From ffe29993b36637f741b95f6d8ed9213ca02cc1fb Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Wed, 8 Nov 2023 16:26:53 +0800
Subject: [PATCH] [ Agent ] [ Initialization ] - modify Initialization process

---
 agent-go/AgentInitialization.go   | 28 ++++++++++++++++++++++++++++
 agent-go/executor/BaseFunction.go |  6 +++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/agent-go/AgentInitialization.go b/agent-go/AgentInitialization.go
index 1a9e3cc..0f21925 100644
--- a/agent-go/AgentInitialization.go
+++ b/agent-go/AgentInitialization.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
+	"reflect"
 	"strings"
 	"time"
 )
@@ -190,12 +191,39 @@ func parseAgentServerInfo(agentServerInfoConf string) *register.AgentServerInfo
 	}
 	log.Info(fmt.Sprintf("agent server info is %v", string(jsonFormat)))
 
+	// uniform agent server info
+	UniformAgentServerInfo(agentServerInfo)
+
 	// build operator cache
 	BuildAgentOsOperator(agentServerInfo)
 
 	return agentServerInfo
 }
 
+// UniformAgentServerInfo uniform deal with ip
+func UniformAgentServerInfo(agentServerInfo *register.AgentServerInfo) {
+
+	// reflect to iterator all field
+	log.Info("[Initialization] - UniformAgentServerInfo !")
+	value := reflect.ValueOf(agentServerInfo)
+	for i := 0; i < value.NumField(); i++ {
+		field := value.Field(i)
+		if field.Kind() == reflect.String && field.CanSet() {
+			field.SetString(strings.TrimSpace(field.String()))
+		}
+	}
+
+	log.Debug("[Initialization] - uniform ip address !")
+	if strings.Contains(agentServerInfo.ServerIPInV4, "/") {
+		agentServerInfo.ServerIPInV4 = strings.Split(agentServerInfo.ServerIPInV4, "/")[0]
+	}
+
+	if strings.Contains(agentServerInfo.ServerIPInV6, "/") {
+		agentServerInfo.ServerIPInV6 = strings.Split(agentServerInfo.ServerIPInV6, "/")[0]
+	}
+
+}
+
 func BuildAgentOsOperator(agentServerInfo *register.AgentServerInfo) {
 
 	// 2023年8月4日 passthrough some key information
diff --git a/agent-go/executor/BaseFunction.go b/agent-go/executor/BaseFunction.go
index 1bea52a..da75872 100644
--- a/agent-go/executor/BaseFunction.go
+++ b/agent-go/executor/BaseFunction.go
@@ -1077,19 +1077,19 @@ func (op *AgentOsOperator) installHarborExec() (bool, []string) {
 		{
 			"sed",
 			"-i",
-			"s/HarborHostName/" + op.AgentServerInfo.ServerIPInV4 + "/g",
+			"s/$HarborHostName/" + op.AgentServerInfo.ServerIPInV4 + "/g",
 			"/root/wdd/harbor/harbor.yml",
 		},
 		{
 			"sed",
 			"-i",
-			"s/HarborHostPort/8033/g",
+			"s/$HarborHostPort/8033/g",
 			"/root/wdd/harbor/harbor.yml",
 		},
 		{
 			"sed",
 			"-i",
-			"s/HarborAdminPas/V2ryStr@ngPss/g",
+			"s/$HarborAdminPas/V2ryStr@ngPss/g",
 			"/root/wdd/harbor/harbor.yml",
 		}})