优化返回结果

.gitignore

@@ -18,5 +18,5 @@
 # vendor/
 .idea
 .vscode
-mail_test.go
+*_test.go
 

define/result.go

@@ -13,6 +13,8 @@ package define
 //
 // Date : 22:00 2022/5/20
 type Result struct {
+	WorkDir    string // 执行的目录
+	CmdPath    string // 命令的路径
 	Err        error  // 异常信息
 	Output     []byte // 输出的内容
 	StartTime  int64  // 开始时间

execute.go

@@ -22,6 +22,7 @@ import (
 func Execute(workDir string, command string, param []string) define.Result {
 	//执行命令
 	result := define.Result{
+		WorkDir:    workDir,
 		Err:        nil,
 		Output:     nil,
 		StartTime:  time.Now().UnixNano(),
@@ -30,6 +31,9 @@ func Execute(workDir string, command string, param []string) define.Result {
 	defer func() {
 		result.FinishTime = time.Now().UnixNano()
 	}()
+	if result.CmdPath, result.Err = Check(command); nil != result.Err {
+		return result
+	}
 	cmdInstance := exec.Command(command, param...)
 	cmdInstance.Dir = workDir
 	result.Output, result.Err = cmdInstance.CombinedOutput()