diff --git a/db/update12.0.1.sql b/db/update12.0.1.sql index 1833845390..7a940d7b7e 100644 --- a/db/update12.0.1.sql +++ b/db/update12.0.1.sql @@ -56,7 +56,7 @@ CREATE TABLE IF NOT EXISTS `zt_compile` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES -('1', '1', '*', '*', '*', 'moduleName=ci&methodName=buildTodayJob', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), +('1', '1', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', '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=exec', '执行Jenkins任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); diff --git a/db/zentao.sql b/db/zentao.sql index 2879bb414d..78074cee66 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1164,7 +1164,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'), -('1', '1', '*', '*', '*', 'moduleName=ci&methodName=buildTodayJob', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), +('1', '1', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', '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=exec', '执行Jenkins任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); diff --git a/module/ci/control.php b/module/ci/control.php index f3e0230c24..1fadd377d4 100644 --- a/module/ci/control.php +++ b/module/ci/control.php @@ -23,12 +23,12 @@ class ci extends control } /** - * Build today job. + * Init compile queue. * * @access public * @return void */ - public function buildTodayJob() + public function initQueue() { $scheduleJobs = $this->loadModel('integration')->getListByTriggerType('schedule'); diff --git a/module/install/lang/en.php b/module/install/lang/en.php index bc4bce4ee2..19b9c73137 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -165,7 +165,7 @@ $lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchr $lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronize sending Webhook'; $lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete overdue logs'; $lang->install->cronList['moduleName=todo&methodName=createCycle'] = 'Create recurring todos'; -$lang->install->cronList['moduleName=ci&methodName=buildTodayJob'] = 'Create recurring jenkins'; +$lang->install->cronList['moduleName=ci&methodName=initQueue'] = 'Create recurring jenkins'; $lang->install->cronList['moduleName=ci&methodName=checkBuildStatus'] = 'Synchronize Jenkins Status'; $lang->install->cronList['moduleName=ci&methodName=exec'] = 'Execute Jenkins'; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 074a934aed..5690bcfb26 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -165,7 +165,7 @@ $lang->install->cronList['moduleName=mail&methodName=asyncSend'] = '异步 $lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = '异步发送Webhook'; $lang->install->cronList['moduleName=admin&methodName=deleteLog'] = '删除过期日志'; $lang->install->cronList['moduleName=todo&methodName=createCycle'] = '生成周期性待办'; -$lang->install->cronList['moduleName=ci&methodName=buildTodayJob'] = '创建周期性任务'; +$lang->install->cronList['moduleName=ci&methodName=initQueue'] = '创建周期性任务'; $lang->install->cronList['moduleName=ci&methodName=checkBuildStatus'] = '同步Jenkins任务状态'; $lang->install->cronList['moduleName=ci&methodName=exec'] = '执行Jenkins任务';