主机管理状态检测 fix

src/main.go

@@ -72,7 +72,6 @@ func initConfig() {
 		MinioAccessKey:           util.SetEnvStr("MINIO_ACCESS_KEY", "beagleadmin"),                    // Minio Access Key
 		MinioSecretKey:           util.SetEnvStr("MINIO_SECRET_KEY", "H76cPmwvH7vJ"),                   // Minio Secret
 		MinioBucket:              util.SetEnvStr("MINIO_BUCKET", "so-operation"),                       // Minio Bucket
-		//TempDirPrefix:  util.SetEnvStr("TEMP_DIR_PREFIX", "/app/xlsx/"),                      //模板目录前缀
 		PrometheusHost:           util.SetEnvStr("PROMETHEUS_HOST", "https://prometheus.wodcloud.com"), // Prometheus Host
 		AccessRuleModeKey:        "accessRuleMode",
 		LocationUrl:              util.SetEnvStr("LOCATION_URL", "https://apis.map.qq.com/ws/location/v1/ip"),

src/service/host_manage.go

@@ -412,46 +412,46 @@ func (h *HostManageSvc) ListStateHostManage(req request.StateHostManageReq) (err
 	}
 
 	// 读取hosts中的主机组
-	//hosts, err := tools.HostsToJson()
-	//if err != nil {
-	//	err = resp.MarshalError.WithError(err)
-	//	session.Rollback()
-	//	return
-	//}
-	//
-	//if _, ok := hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"]; !ok {
-	//	// 不存在
-	//	hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] = nil
-	//}
-	////新增主机分组列表
-	//for _, v := range hostManageList {
-	//	hostsIp := ""
-	//	if v.VoucherType == 0 {
-	//		hostsIp = fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\"  ansible_host_key_checking=false",
-	//			AnsibleIp+fmt.Sprintf("%d", v.Id), v.Ip, v.Port, v.UserName, v.Password)
-	//	} else {
-	//		hostsIp = fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\"  ansible_ssh_private_key_file=/root/.ssh/id_rsa  ansible_host_key_checking=false",
-	//			AnsibleIp+fmt.Sprintf("%d", v.Id), v.Ip, v.Port, v.UserName)
-	//	}
-	//
-	//	flag := 0
-	//	for _, v1 := range hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] {
-	//		if v1 == hostsIp {
-	//			flag = 1
-	//		}
-	//	}
-	//	if flag == 0 {
-	//		hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] = append(hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"], hostsIp)
-	//	}
-	//}
-	//
-	////写入hosts
-	//err = tools.MapToSaveHosts(hosts)
-	//if err != nil {
-	//	err = resp.MarshalError.WithError(err)
-	//	session.Rollback()
-	//	return
-	//}
+	hosts, err := tools.HostsToJson()
+	if err != nil {
+		err = resp.MarshalError.WithError(err)
+		session.Rollback()
+		return
+	}
+
+	if _, ok := hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"]; !ok {
+		// 不存在
+		hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] = nil
+	}
+	//新增主机分组列表
+	for _, v := range hostManageList {
+		hostsIp := ""
+		if v.VoucherType == 0 {
+			hostsIp = fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\"  ansible_host_key_checking=false",
+				AnsibleIp+fmt.Sprintf("%d", v.Id), v.Ip, v.Port, v.UserName, v.Password)
+		} else {
+			hostsIp = fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\"  ansible_ssh_private_key_file=/root/.ssh/id_rsa  ansible_host_key_checking=false",
+				AnsibleIp+fmt.Sprintf("%d", v.Id), v.Ip, v.Port, v.UserName)
+		}
+
+		flag := 0
+		for _, v1 := range hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] {
+			if v1 == hostsIp {
+				flag = 1
+			}
+		}
+		if flag == 0 {
+			hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"] = append(hosts["["+AnsibleGroup+fmt.Sprintf("%d", req.Id)+"]"], hostsIp)
+		}
+	}
+
+	//写入hosts
+	err = tools.MapToSaveHosts(hosts)
+	if err != nil {
+		err = resp.MarshalError.WithError(err)
+		session.Rollback()
+		return
+	}
 
 	for _, v := range hostManageList {
 		//修改状态