diff --git a/controllers/task.go b/controllers/task.go index 4d1d381..ff9152e 100644 --- a/controllers/task.go +++ b/controllers/task.go @@ -735,7 +735,7 @@ func (self *TaskController) Table() { TaskServerIdsArr := strings.Split(v.ServerIds, ",") serverId := 0 - if len(TaskServerIdsArr) > 1 { + if len(TaskServerIdsArr) > 0 { serverId, _ = strconv.Atoi(TaskServerIdsArr[0]) } jobskey := libs.JobKey(v.Id, serverId) diff --git a/jobs/job.go b/jobs/job.go index ac8db6a..68e645b 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -280,10 +280,12 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers jobresult.ErrMsg = c.String() jobresult.OutMsg = b.String() jobresult.IsOk = false + return } jobresult.OutMsg = b.String() jobresult.ErrMsg = c.String() jobresult.IsOk = true + return } return job diff --git a/ppgo_job2.sql b/ppgo_job2.sql index a61529d..e703374 100644 --- a/ppgo_job2.sql +++ b/ppgo_job2.sql @@ -331,7 +331,7 @@ ALTER TABLE `pp_task_server` ADD `connection_type` TINYINT(1) NOT NULL DEFAULT ' COMMIT; BEGIN; -ALTER TABLE `pp_task` CHANGE COLUMN `server_id` `server_ids` varchar(200) NOT NULL DEFAULT '0' COMMENT '服务器id字符串,英文都好隔开'; +ALTER TABLE `pp_task` CHANGE COLUMN `server_id` `server_ids` varchar(200) NOT NULL DEFAULT '0' COMMENT '服务器id字符串,英文逗号隔开'; COMMIT; BEGIN;