diff --git a/db/update1.0.rc2.sql b/db/update1.0.rc2.sql new file mode 100644 index 0000000000..085cf030e6 --- /dev/null +++ b/db/update1.0.rc2.sql @@ -0,0 +1 @@ +DELETE FROM zt_cron WHERE command='moduleName=weekly&methodName=computeWeekly'; diff --git a/db/update12.5.3.sql b/db/update12.5.3.sql index e4c41e3725..9dbed41d4b 100644 --- a/db/update12.5.3.sql +++ b/db/update12.5.3.sql @@ -151,8 +151,6 @@ CREATE TABLE IF NOT EXISTS `zt_taskspec` ( ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`; ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`; -INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53'); - ALTER TABLE `zt_story` ADD `URChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`; ALTER TABLE `zt_team` MODIFY `type` enum('project','task','execution') NOT NULL DEFAULT 'project' AFTER `root`; diff --git a/db/zentao.sql b/db/zentao.sql index 95bfaeefac..e2a3485dfd 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1303,7 +1303,6 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type ('1', '0', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步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'), -('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53'); INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES (1, 'ADMIN', 'admin', 'for administrator'), diff --git a/module/cron/model.php b/module/cron/model.php index 80ca922866..6690222c3b 100644 --- a/module/cron/model.php +++ b/module/cron/model.php @@ -35,7 +35,6 @@ class cronModel extends model return $this->dao->select('*')->from(TABLE_CRON) ->where('1=1') ->beginIF(strpos($params, 'nostop') !== false)->andWhere('status')->ne('stop')->fi() - ->beginIF(!isset($this->config->maxVersion))->andWhere('command')->notlike("%moduleName=weekly&%")->fi() ->fetchAll('id'); }