Merge branch 'dev-czl' into dev

src/service/host_manage.go

@@ -10,8 +10,10 @@ import (
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/response"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/client"
+	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/tools"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp"
+	"go.uber.org/zap"
 	"os/exec"
 	"strings"
 	"time"
@@ -453,6 +455,7 @@ func (h *HostManageSvc) ListStateHostManage(req request.StateHostManageReq) (err
 		return
 	}
 
+	fmt.Println("开始：")
 	for _, v := range hostManageList {
 		//修改状态
 		connStatus, err1 := StatusDetection(v.Ip)
@@ -472,6 +475,7 @@ func (h *HostManageSvc) ListStateHostManage(req request.StateHostManageReq) (err
 			return
 		}
 	}
+	fmt.Println("结束")
 	session.Commit()
 	return
 }
@@ -627,11 +631,15 @@ func StatusDetection(ip string) (ipConn int, err error) {
 	//执行cmd命令
 	if err = cmd.Start(); err != nil {
 		err = resp.CmdExecError.WithError(err)
+		conf.Logger.Info("执行shell命令", zap.String("err:", err.Error()))
 		return
 	}
+	cmd.Wait()
 	if cmd.ProcessState.Success() {
+		fmt.Println("连通性测试成功！")
 		return 0, nil
 	}
+	fmt.Println("连通性测试失败！")
 	return 1, nil
 	//output, err := cmd.Output()
 	//if err != nil {