diff --git a/db/update12.1.sql b/db/update12.1.sql index ea7119330d..0f60387d62 100644 --- a/db/update12.1.sql +++ b/db/update12.1.sql @@ -61,4 +61,4 @@ CREATE TABLE `zt_cibuild` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkBuildStatus', '同步Jenkins任务状态', 'zentao', -1, 'normal', '0000-00-00 00:00:00'); +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkBuildStatus', '同步Jenkins任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); diff --git a/db/zentao.sql b/db/zentao.sql index ecc185e5a0..f4357d33b5 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1174,7 +1174,7 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type ('*/5', '*', '*', '*', '*', 'moduleName=webhook&methodName=asyncSend', '异步发送Webhook', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkBuildStatus', '同步Jenkins任务状态', 'zentao', -1, 'normal', '0000-00-00 00:00:00'); +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkBuildStatus', '同步Jenkins任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES (1, 'ADMIN', 'admin', 'for administrator'), diff --git a/module/cron/control.php b/module/cron/control.php index c31e970959..0d9006f29c 100644 --- a/module/cron/control.php +++ b/module/cron/control.php @@ -207,9 +207,7 @@ class cron extends control if(isset($params['moduleName']) and isset($params['methodName'])) { $this->app->loadConfig($params['moduleName']); - - $paramArr = explode(",", $params['parm']); - $output = $this->fetch($params['moduleName'], $params['methodName'], $paramArr); + $output = $this->fetch($params['moduleName'], $params['methodName']); } } elseif(isset($crons[$id]) and $crons[$id]->type == 'system')