diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go
index 45eb5a8..669f7f1 100644
--- a/modules/ssh/ssh.go
+++ b/modules/ssh/ssh.go
@@ -34,7 +34,7 @@ type Result struct {
 }
 
 func parseSSHConfig(sshConfig SSHConfig) (config *ssh.ClientConfig, err error) {
-    timeout := SSHConnectTimeout * time.Second
+    timeout := time.Duration(SSHConnectTimeout) * time.Second
     // 密码认证
     if sshConfig.AuthType == HostPassword {
         config = &ssh.ClientConfig{
diff --git a/service/task.go b/service/task.go
index 750156d..e6f3695 100644
--- a/service/task.go
+++ b/service/task.go
@@ -158,7 +158,7 @@ func (h *SSHCommandHandler) Run(taskModel models.TaskHost) (string, error) {
     sshConfig.User = hostModel.Username
     sshConfig.Host = hostModel.Name
     sshConfig.Port = hostModel.Port
-    sshConfig.ExecTimeout = 5
+    sshConfig.ExecTimeout = taskModel.Timeout
     sshConfig.AuthType = hostModel.AuthType
     var password string
     var privateKey string
@@ -204,7 +204,6 @@ func updateTaskLog(taskLogId int64, taskResult TaskResult) (int64, error) {
     var status models.Status
     var result string = taskResult.Result
     if taskResult.Err != nil {
-        result = taskResult.Err.Error() + "\n" + result
         status = models.Failure
     } else {
         status = models.Finish