red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/george518/PPGo_Job

Browse Source
This commit is contained in:
georgehao
2021-05-18 00:40:04 +08:00
parent 5fbc2bbe6e fdb6ab575c
commit 405bc8d4ec
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/task.go
View File

@@ -735,7 +735,7 @@ func (self *TaskController) Table() {
TaskServerIdsArr := strings.Split(v.ServerIds, ",") TaskServerIdsArr := strings.Split(v.ServerIds, ",")
serverId := 0 serverId := 0
if len(TaskServerIdsArr) > 1 { if len(TaskServerIdsArr) > 0 {
serverId, _ = strconv.Atoi(TaskServerIdsArr[0]) serverId, _ = strconv.Atoi(TaskServerIdsArr[0])
} }
jobskey := libs.JobKey(v.Id, serverId) jobskey := libs.JobKey(v.Id, serverId)

2
jobs/job.go
View File

@@ -280,10 +280,12 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers
jobresult.ErrMsg = c.String() jobresult.ErrMsg = c.String()
jobresult.OutMsg = b.String() jobresult.OutMsg = b.String()
jobresult.IsOk = false jobresult.IsOk = false
return
} }
jobresult.OutMsg = b.String() jobresult.OutMsg = b.String()
jobresult.ErrMsg = c.String() jobresult.ErrMsg = c.String()
jobresult.IsOk = true jobresult.IsOk = true
return return
} }
return job return job

2
ppgo_job2.sql
View File

@@ -331,7 +331,7 @@ ALTER TABLE `pp_task_server` ADD `connection_type` TINYINT(1) NOT NULL DEFAULT '
COMMIT; COMMIT;
BEGIN; 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; COMMIT;
BEGIN; BEGIN;