Merge remote-tracking branch 'origin/local-ss' into local-ss

# Conflicts:
#	server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java

agent-go/a_init/AgentInitialization.go

@@ -308,10 +308,15 @@ func uniformAgentServerName(agentInfo *a_status.AgentInfo, agentServerInfo *a_ag
 
 	// 不是标准的AgentName格式
 	city := agentServerInfo.City
-	city = strings.Title(city)
-	if strings.Contains(city, " ") {
-		city = strings.Join(strings.Split(city, " "), "")
+	if city == "" {
+		city = "Local"
+	} else {
+		city = strings.Title(city)
+		if strings.Contains(city, " ") {
+			city = strings.Join(strings.Split(city, " "), "")
+		}
 	}
+
 	// uniform city format
 	agentServerInfo.City = city
 

agent-go/main.go

@@ -9,6 +9,8 @@ import (
 
 var log = logger.Log
 
+// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
+// /root/go/bin/gox -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
 func main() {
 
 	// 解析命令行参数