Merge branch 'refs/heads/local-ss'

# Conflicts:
#	agent-operator/deploy/OctopusDeploy.go
#	server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java

agent-common/image/ImageNameConvert.go

@@ -1,6 +1,8 @@
 package image
 
 import (
+	"os"
+	"path/filepath"
 	"strings"
 	"wdd.io/agent-common/logger"
 )
@@ -172,3 +174,31 @@ func GzipFileNameToImageNameAndTag(gzipFileName string) (imageName, imageTag str
 
 	return "", ""
 }
+
+func GzipFolderPathToCmiiImageTagMaps(gzipFolderPath string) (frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap map[string]string) {
+
+	frontendImageVersionMap = make(map[string]string)
+	backendImageVersionMap = make(map[string]string)
+	srsImageVersionMap = make(map[string]string)
+
+	filepath.WalkDir(gzipFolderPath, func(path string, d os.DirEntry, err error) error {
+		//fmt.Println(path)
+		name := d.Name()
+		if strings.HasSuffix(name, ".tar.gz") {
+			imageName, imageTag := GzipFileNameToImageNameAndTag(name)
+			if strings.Contains(imageName, "platform") {
+				frontendImageVersionMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "srs") {
+				srsImageVersionMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "operator") {
+				srsImageVersionMap[imageName] = imageTag
+			} else {
+				backendImageVersionMap[imageName] = imageTag
+			}
+		}
+
+		return nil
+	})
+
+	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
+}

agent-common/image/ImageNameConvert_test.go

@@ -2,7 +2,11 @@ package image
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
 	"testing"
+	"wdd.io/agent-common/utils"
 )
 
 func TestImageFullNameToGzipFileName(t *testing.T) {
@@ -195,3 +199,34 @@ func TestGzipFileNameToImageFullName(t *testing.T) {
 		fmt.Println("--------------------")
 	}
 }
+
+func TestImageGzipFileNameToImageFullName(t *testing.T) {
+
+	frontendMap := make(map[string]string)
+	backendMap := make(map[string]string)
+	srsMap := make(map[string]string)
+
+	gzipFilePrefix := "/root/octopus_image/xjyd/"
+	filepath.WalkDir(gzipFilePrefix, func(path string, d os.DirEntry, err error) error {
+		//fmt.Println(path)
+		name := d.Name()
+		if strings.HasSuffix(name, ".tar.gz") {
+			imageName, imageTag := GzipFileNameToImageNameAndTag(name)
+			if strings.Contains(imageName, "platform") {
+				frontendMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "srs") {
+				srsMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "operator") {
+				srsMap[imageName] = imageTag
+			} else {
+				backendMap[imageName] = imageTag
+			}
+		}
+
+		return nil
+	})
+
+	utils.BeautifulPrint(backendMap)
+	utils.BeautifulPrint(frontendMap)
+	utils.BeautifulPrint(srsMap)
+}

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 city == "" {
-	if strings.Contains(city, " ") {
+		city = "Local"
-		city = strings.Join(strings.Split(city, " "), "")
+	} 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() {
 
 	// 解析命令行参数

agent-operator/CmiiK8sOperator_test.go

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	// 计算20:00的时间
 	now := time.Now()
 
-	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 8, 58, 30, 0, now.Location())
+	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 18, 30, 00, 0, now.Location())
 
 	duration := time.Duration(0)
 
@@ -271,21 +271,28 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	time.Sleep(duration)
 
 	cmiiEnv := demo
-	//appName := "cmii-uav-platform"
+	//appName := "cmii-uav-platform"i
 	//newTag := "5.4.0-032601"
 
 	appNameTagMap := map[string]string{
 		//"cmii-uav-multilink": "5.5.0",
-		"cmii-uav-industrial-portfolio": "5.5.0-050801",
+		"cmii-uav-platform": "5.6.0-051301",
 	}
 
 	for appName, newTag := range appNameTagMap {
 		ok, oldImageTag, newImageTag := UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag)
-		assert.Equal(t, ok, true, "update image tag failed !")
+
+		if !ok {
+			log.ErrorF("update image tag failed !")
+			UpdateCmiiDeploymentImageTag(cmiiEnv, appName, oldImageTag)
+		}
 		utils.SplitLinePrint()
 
 		check := DefaultCmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 300)
 		assert.Equal(t, check, true, "deployment run failed!")
+		if !check {
+			UpdateCmiiDeploymentImageTag(cmiiEnv, appName, oldImageTag)
+		}
 
 		deploy := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, appName)
 

agent-operator/CmiiOperator_test.go

@@ -53,10 +53,11 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
 		},
 		FullNameImageList:        nil,
 		ProjectVersion:           "",
-		ProjectName:              "xjyd",
+		ProjectName:              "szga",
 		DirectHarborHost:         "harbor.wdd.io",
+		DownloadImage:            true,
 		CompressImageToGzip:      true,
-		UploadToDemoMinio:        true,
+		UploadToDemoMinio:        false,
 		ShouldDirectPushToHarbor: false,
 	}
 

agent-operator/deploy/OctopusDeploy.go

@@ -2,14 +2,13 @@ package deploy
 
 import (
 	"os"
+	image2 "wdd.io/agent-common/image"
 	"wdd.io/agent-common/logger"
 	"wdd.io/agent-operator/deploy/a_dashboard"
 	"wdd.io/agent-operator/deploy/a_nfs"
 	"wdd.io/agent-operator/deploy/b_middle"
 	"wdd.io/agent-operator/deploy/c_app"
 	"wdd.io/agent-operator/deploy/z_dep"
-	"wdd.io/agent-operator/image"
-	"wdd.io/agent-operator/real_project/zjjt"
 )
 
 var log = logger.Log
@@ -30,6 +29,30 @@ func OctopusDeploy() {
 		NFSServerIP:   "192.168.0.14",
 	}
 
+	//a_dashboard.K8sDashboardDeploy(common)
+	//
+	//a_nfs.NFSDeploy(common)
+	//a_nfs.NFSTestDeploy(common)
+	//
+	//// pvc
+	//b_middle.PVCDeploy(common)
+	//
+	//// middlewares
+	//b_middle.MidMySQlDeploy(common)
+	//b_middle.MidRedisDeploy(common)
+	//b_middle.MidEmqxDeploy(common)
+	//b_middle.MidMongoDeploy(common)
+	//b_middle.MidRabbitMQDeploy(common)
+	//b_middle.MidRabbitMQDeploy(common)
+	//b_middle.MidNacosDeploy(common)
+	//
+	//configMapDeploy(common)
+	//c_app.IngressDeploy(common)
+	//
+	//frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	//
+	//backendDeploy(common, backendImageVersionMap)
+	//frontendDeploy(common, frontendImageVersionMap)
 	a_dashboard.K8sDashboardDeploy(common)
 
 	a_nfs.NFSDeploy(common)
@@ -61,19 +84,21 @@ func CmiiAppDeploy() {
 
 	// common environment
 	common := &z_dep.CommonEnvironmentConfig{
-		WebIP:         "10.100.2.121",
+		WebIP:         "36.133.201.78",
 		WebPort:       "8888",
-		HarborIP:      "10.100.2.121",
+		HarborIP:      "192.168.0.14",
 		HarborPort:    "8033",
-		Namespace:     "zjjt",
+		Namespace:     "xjyd",
 		TagVersion:    "5.5.0",
 		TenantEnv:     "",
-		MinioPublicIP: "10.100.2.116",
+		MinioPublicIP: "36.133.201.146",
-		MinioInnerIP:  "10.100.2.116",
+		MinioInnerIP:  "192.168.0.21",
-		NFSServerIP:   "10.100.2.121",
+		NFSServerIP:   "192.168.0.14",
 	}
 
-	frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	//frontendImageVersionMap, backendImageVersionMap, _ := image.FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	gzipFilePrefix := "/root/octopus_image/xjyd/"
+	frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix)
 
 	backendDeploy(common, backendImageVersionMap)
 	frontendDeploy(common, frontendImageVersionMap)

agent-operator/deploy/z_dep/G.go

@@ -20,7 +20,7 @@ var log = logger.Log
 func init() {
 	switch runtime.GOOS {
 	case "linux":
-		ApplyFilePrefix = "Linux value"
+		ApplyFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/deploy/z_file/"
 	case "darwin": // macOS
 		ApplyFilePrefix = "MacOS value"
 	case "windows":

agent-operator/deploy/z_file/k8s-configmap.yaml

@@ -1,336 +1,336 @@
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-threedsimulation
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "threedsimulation",
-        AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-jiangsuwenlv
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "jiangsuwenlv",
-        AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-supervision
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "supervision",
-        AppClientId: "APP_qqSu82THfexI8PLM"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-armypeople
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "armypeople",
-        AppClientId: "APP_UIegse6Lfou9pO1U"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-cmsportal
-  namespace: zjjt
+  namespace: xjyd
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
-        TenantEnvironment: "",
+      TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
+      CloudHOST: "36.133.201.78:8888",
-        ApplicationShortName: "cmsportal",
+      ApplicationShortName: "cmsportal",
-        AppClientId: "empty"
+      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-emergency
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "emergency",
-        AppClientId: "APP_aGsTAY1uMZrpKdfk"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-logistics
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "logistics",
-        AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-security
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "security",
-        AppClientId: "APP_JUSEMc7afyWXxvE7"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-qinghaitourism
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "qinghaitourism",
-        AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-base
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "base",
-        AppClientId: "APP_9LY41OaKSqk2btY0"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-multiterminal
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "multiterminal",
-        AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-supervisionh5
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "supervisionh5",
-        AppClientId: "APP_qqSu82THfexI8PLM"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-ai-brain
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "ai-brain",
-        AppClientId: "APP_rafnuCAmBESIVYMH"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-detection
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "detection",
-        AppClientId: "APP_FDHW2VLVDWPnnOCy"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: tenant-prefix-media
-  namespace: zjjt
+  namespace: xjyd
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
-        TenantEnvironment: "",
+      TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
+      CloudHOST: "36.133.201.78:8888",
-        ApplicationShortName: "media",
+      ApplicationShortName: "media",
-        AppClientId: "APP_4AU8lbifESQO4FD6"
+      AppClientId: "APP_4AU8lbifESQO4FD6"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-mws
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "mws",
-        AppClientId: "APP_uKniXPELlRERBBwK"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-seniclive
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "seniclive",
-        AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-traffic
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "traffic",
-        AppClientId: "APP_Jc8i2wOQ1t73QEJS"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-platform
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "platform",
-        AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: tenant-prefix-oms
-  namespace: zjjt
+  namespace: xjyd
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
-        TenantEnvironment: "",
+      TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
+      CloudHOST: "36.133.201.78:8888",
-        ApplicationShortName: "oms",
+      ApplicationShortName: "oms",
-        AppClientId: "empty"
+      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-open
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "open",
-        AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-securityh5
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "securityh5",
-        AppClientId: "APP_N3ImO0Ubfu9peRHD"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-share
-  namespace: zjjt
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-        TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
-        ApplicationShortName: "share",
-        AppClientId: "APP_4lVSVI0ZGxTssir8"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: tenant-prefix-splice
-  namespace: zjjt
+  namespace: xjyd
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
-        TenantEnvironment: "",
+      TenantEnvironment: "",
-        CloudHOST: "10.100.2.121:8888",
+      CloudHOST: "36.133.201.78:8888",
-        ApplicationShortName: "splice",
+      ApplicationShortName: "splice",
-        AppClientId: "APP_zE0M3sTRXrCIJS8Y"
+      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-threedsimulation
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "threedsimulation",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-supervision
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "supervision",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-platform
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "platform",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-mws
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "mws",
+      AppClientId: "APP_uKniXPELlRERBBwK"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-security
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "security",
+      AppClientId: "APP_JUSEMc7afyWXxvE7"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-securityh5
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "securityh5",
+      AppClientId: "APP_N3ImO0Ubfu9peRHD"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-qinghaitourism
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "qinghaitourism",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-detection
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "detection",
+      AppClientId: "APP_FDHW2VLVDWPnnOCy"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-multiterminal
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "multiterminal",
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-armypeople
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "armypeople",
+      AppClientId: "APP_UIegse6Lfou9pO1U"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-base
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "base",
+      AppClientId: "APP_9LY41OaKSqk2btY0"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-share
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "share",
+      AppClientId: "APP_4lVSVI0ZGxTssir8"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-jiangsuwenlv
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "jiangsuwenlv",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-supervisionh5
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "supervisionh5",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-ai-brain
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "ai-brain",
+      AppClientId: "APP_rafnuCAmBESIVYMH"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-open
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "open",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-seniclive
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "seniclive",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-traffic
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "traffic",
+      AppClientId: "APP_Jc8i2wOQ1t73QEJS"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-emergency
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "emergency",
+      AppClientId: "APP_aGsTAY1uMZrpKdfk"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-logistics
+  namespace: xjyd
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "",
+      CloudHOST: "36.133.201.78:8888",
+      ApplicationShortName: "logistics",
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
     }

agent-operator/image/CmiiImageSync.go

@@ -523,20 +523,25 @@ func CmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[
 	return cmiiImageVersionMap
 }
 
-func FrontendBackendImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap map[string]string) {
+func FrontendBackendSrsImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap map[string]string) {
 
 	frontendImageVersionMap = make(map[string]string)
 	backendImageVersionMap = make(map[string]string)
+	srsImageVersionMap = make(map[string]string)
 
 	for imageName, imageTag := range cmiiImageVersionMap {
 		if strings.Contains(imageName, "platform") {
 			frontendImageVersionMap[imageName] = imageTag
+		} else if strings.Contains(imageName, "srs") {
+			srsImageVersionMap[imageName] = imageTag
+		} else if strings.Contains(imageName, "operator") {
+			srsImageVersionMap[imageName] = imageTag
 		} else {
 			backendImageVersionMap[imageName] = imageTag
 		}
 	}
 
-	return frontendImageVersionMap, backendImageVersionMap
+	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
 }
 
 func loginToDockerHub(HarborFullHost string) {

agent-operator/image/CmiiImageSync_test.go

@@ -205,7 +205,7 @@ func TestConvertCmiiImageMapFromGzipFolder(t *testing.T) {
 }
 
 func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
-	frontendImageVersionMap, backendImageVersionMap := FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	frontendImageVersionMap, backendImageVersionMap := FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
 
 	utils.BeautifulPrint(frontendImageVersionMap)
 	utils.BeautifulPrint(backendImageVersionMap)

agent-operator/log/cmii-update-log.txt

@@ -36,3 +36,5 @@
 2024-04-30-11-57-00 uavcloud-demo  cmii-uav-platform                       5.5.0-042903                  5.5.0-043001
 2024-04-30-17-22-52 uavcloud-demo  cmii-uav-industrial-portfolio           5.5.0-042901                  5.5.0-043001
 2024-05-08-08-58-30 uavcloud-demo  cmii-uav-industrial-portfolio           5.5.0-043001                  5.5.0-050801
+2024-05-10-19-55-00 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0                         5.6.0-051001
+2024-05-13-18-30-00 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0-sense                   5.6.0-051301

agent-operator/real_project/szga/Config.go

@@ -0,0 +1,78 @@
+package szga
+
+var AllZipFileName = []string{
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-app-release:4.2.0-validation",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.6.0-051602",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.3.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.6.0-051501",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.6.0-0513",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-lifecycle:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.6.0-051401",
+	"harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.5.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-emergency-rescue:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.6.0-051503",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.6.0-mr830-051502",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:5.6.0-051401",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.3.0-hjltt",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:5.6.0-051401",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:4.1.6-24238-qingdao",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.6.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392",
+	"harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195",
+	"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA",
+}

agent-operator/real_project/xzyd/Config.go

@@ -0,0 +1 @@
+package xzyd

server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java

@@ -62,6 +62,11 @@ public class AcceptAgentInitInfo {
                 12);
         put("Xiamen",
                 13);
+        put("Shenzhen",
+                14);
+
+        put("Local",
+                15);
         put("Guangzhou",
                 13);
 
@@ -248,8 +253,14 @@ public class AcceptAgentInitInfo {
                 " ",
                 ""
         );
+        if (serverName.startsWith("-")) {
+            // empty city situation
+            serverName = "Local" + serverName;
+        }
+
         serverInfoVO.setServerName(serverName);
 
+
         // validate serverName
         String[] split = serverName.split("-");
         if (split.length <= 2 || !ALL_SERVER_CITY_INDEX.containsKey(split[0]) || !ALL_SERVER_ARCH_INFO.contains(split[1])) {

server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     allow-circular-references: true
     allow-bean-definition-overriding: true
   rabbitmq:
-    host: 42.192.52.227
+    host: 172.28.0.10
     port: 20672
     username: boge
     password: boge8tingH
@@ -24,7 +24,7 @@ spring:
           max-interval: 65000
           initial-interval: 2000
   redis:
-    host: 42.192.52.227
+    host: 172.28.0.10
     port: 21370
     database: 0
     password: boge8tingH
@@ -46,7 +46,7 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.28.0.10:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
     username: boge
     password: boge8tingH
     type: com.zaxxer.hikari.HikariDataSource