From ad51c0ec88b3e59d08c2d68aba64ddeecf96af22 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Jul 2021 17:25:59 +0800 Subject: [PATCH] * adjust for upgrade. --- VERSION | 2 +- config/config.php | 2 +- .../{zentao15.1.sql => zentao15.2.sql} | 64 ++++++++++--------- db/update15.0.3.sql | 3 +- db/zentao.sql | 34 +++++----- module/upgrade/lang/version.php | 1 + module/upgrade/model.php | 5 +- 7 files changed, 58 insertions(+), 53 deletions(-) rename db/standard/{zentao15.1.sql => zentao15.2.sql} (98%) diff --git a/VERSION b/VERSION index adbc6d2b1b..dafb659a69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.1 +15.2 diff --git a/config/config.php b/config/config.php index dca995a082..0f2bc19fd6 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '15.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '15.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/db/standard/zentao15.1.sql b/db/standard/zentao15.2.sql similarity index 98% rename from db/standard/zentao15.1.sql rename to db/standard/zentao15.2.sql index dfbe848935..b0952a0d97 100644 --- a/db/standard/zentao15.1.sql +++ b/db/standard/zentao15.2.sql @@ -253,7 +253,7 @@ CREATE TABLE `zt_config` ( `value` longtext NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8; CREATE TABLE `zt_cron` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `m` varchar(20) NOT NULL, @@ -269,7 +269,7 @@ CREATE TABLE `zt_cron` ( `lastTime` datetime NOT NULL, PRIMARY KEY (`id`), KEY `lastTime` (`lastTime`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; CREATE TABLE `zt_dept` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `name` char(60) NOT NULL, @@ -430,7 +430,7 @@ CREATE TABLE `zt_group` ( `desc` char(255) NOT NULL DEFAULT '', `acl` text DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; CREATE TABLE `zt_grouppriv` ( `group` mediumint(8) unsigned NOT NULL DEFAULT 0, `module` char(30) NOT NULL DEFAULT '', @@ -447,20 +447,6 @@ CREATE TABLE `zt_history` ( PRIMARY KEY (`id`), KEY `action` (`action`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE `zt_jenkins` ( - `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL, - `url` varchar(255) DEFAULT NULL, - `account` varchar(30) DEFAULT NULL, - `password` varchar(255) NOT NULL, - `token` varchar(255) DEFAULT NULL, - `createdBy` varchar(30) NOT NULL, - `createdDate` datetime NOT NULL, - `editedBy` varchar(30) NOT NULL, - `editedDate` datetime NOT NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE `zt_job` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL, @@ -495,7 +481,7 @@ CREATE TABLE `zt_lang` ( `system` enum('0','1') NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; CREATE TABLE `zt_log` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `objectType` varchar(30) NOT NULL, @@ -555,6 +541,22 @@ CREATE TABLE `zt_oauth` ( KEY `providerType` (`providerType`), KEY `providerID` (`providerID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_pipeline` ( + `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT, + `type` char(30) NOT NULL, + `name` varchar(50) NOT NULL, + `url` varchar(255) DEFAULT NULL, + `account` varchar(30) DEFAULT NULL, + `password` varchar(255) NOT NULL, + `token` varchar(255) DEFAULT NULL, + `private` char(32) DEFAULT NULL, + `createdBy` varchar(30) NOT NULL, + `createdDate` datetime NOT NULL, + `editedBy` varchar(30) NOT NULL, + `editedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE `zt_planstory` ( `plan` mediumint(8) unsigned NOT NULL, `story` mediumint(8) unsigned NOT NULL, @@ -608,7 +610,7 @@ CREATE TABLE `zt_project` ( `model` char(30) NOT NULL, `type` char(30) NOT NULL DEFAULT 'sprint', `product` char(30) NOT NULL DEFAULT 'single', - `lifetime` char(30) NOT NULL, + `lifetime` char(30) NOT NULL DEFAULT '', `budget` varchar(30) NOT NULL DEFAULT '0', `budgetUnit` char(30) NOT NULL DEFAULT 'CNY', `attribute` varchar(30) NOT NULL DEFAULT '', @@ -709,7 +711,7 @@ CREATE TABLE `zt_relation` ( `BVersion` char(30) NOT NULL, `extra` char(30) NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `relation` (`relation`,`AType`,`BType`,`AID`,`BID`) + UNIQUE KEY `relation` (`product`,`relation`,`AType`,`BType`,`AID`,`BID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE `zt_release` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, @@ -864,7 +866,7 @@ CREATE TABLE `zt_story` ( `lastEditedBy` varchar(30) NOT NULL DEFAULT '', `lastEditedDate` datetime NOT NULL, `reviewedBy` varchar(255) NOT NULL, - `reviewedDate` datetime NOT NULL, + `reviewedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `closedBy` varchar(30) NOT NULL DEFAULT '', `closedDate` datetime NOT NULL, `closedReason` varchar(30) NOT NULL, @@ -880,6 +882,15 @@ CREATE TABLE `zt_story` ( KEY `status` (`status`), KEY `assignedTo` (`assignedTo`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_storyestimate` ( + `story` mediumint(9) NOT NULL, + `round` smallint(6) NOT NULL, + `estimate` text NOT NULL, + `average` float NOT NULL, + `openedBy` varchar(30) NOT NULL, + `openedDate` datetime NOT NULL, + UNIQUE KEY `story` (`story`,`round`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE `zt_storyreview` ( `story` mediumint(9) NOT NULL, `version` smallint(6) NOT NULL, @@ -888,15 +899,6 @@ CREATE TABLE `zt_storyreview` ( `reviewDate` datetime NOT NULL, UNIQUE KEY `story` (`story`,`version`,`reviewer`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE `zt_storyestimate` ( - `story` mediumint(9) NOT NULL, - `round` smallint(6) NOT NULL, - `estimate` text NOT NULL, - `average` float(10,2) NOT NULL, - `openedBy` varchar(30) NOT NULL, - `openedDate` datetime NOT NULL, - UNIQUE KEY `story` (`story`,`round`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE `zt_storyspec` ( `story` mediumint(9) NOT NULL, `version` smallint(6) NOT NULL, @@ -998,7 +1000,7 @@ CREATE TABLE `zt_team` ( `limited` char(8) NOT NULL DEFAULT 'no', `join` date NOT NULL DEFAULT '0000-00-00', `days` smallint(5) unsigned NOT NULL, - `hours` float(2,1) unsigned NOT NULL DEFAULT 0.0, + `hours` float(3,1) unsigned NOT NULL DEFAULT 0.0, `estimate` decimal(12,2) unsigned NOT NULL DEFAULT 0.00, `consumed` decimal(12,2) unsigned NOT NULL DEFAULT 0.00, `left` decimal(12,2) unsigned NOT NULL DEFAULT 0.00, diff --git a/db/update15.0.3.sql b/db/update15.0.3.sql index 4b67f4492a..b3f3664e8f 100644 --- a/db/update15.0.3.sql +++ b/db/update15.0.3.sql @@ -8,5 +8,6 @@ ALTER TABLE `zt_jenkins` ADD COLUMN `type` char(30) NOT NULL AFTER `id`; ALTER TABLE `zt_jenkins` ADD COLUMN `private` char(32) NOT NULL AFTER `token`; RENAME TABLE `zt_jenkins` TO `zt_pipeline`; -ALTER TABLE `zt_relation` DROP INDEX `relation`, ADD UNIQUE INDEX `relation`(`product`, `relation`, `AType`, `BType`, `AID`, `BID`) USING BTREE; +ALTER TABLE `zt_relation` DROP INDEX `relation`; +ALTER TABLE `zt_relation` ADD UNIQUE INDEX `relation`(`product`, `relation`, `AType`, `BType`, `AID`, `BID`); diff --git a/db/zentao.sql b/db/zentao.sql index 3e1fc29691..0d5e499708 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -471,23 +471,6 @@ CREATE TABLE IF NOT EXISTS `zt_history` ( PRIMARY KEY (`id`), KEY `action` (`action`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_pipeline`; -CREATE TABLE IF NOT EXISTS `zt_pipeline` ( - `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT, - `type` char(30) NOT NULL, - `name` varchar(50) NOT NULL, - `url` varchar(255) DEFAULT NULL, - `account` varchar(30) DEFAULT NULL, - `password` varchar(255) NOT NULL, - `token` varchar(255) DEFAULT NULL, - `private` char(32) DEFAULT NULL, - `createdBy` varchar(30) NOT NULL, - `createdDate` datetime NOT NULL, - `editedBy` varchar(30) NOT NULL, - `editedDate` datetime NOT NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_job`; CREATE TABLE IF NOT EXISTS `zt_job` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, @@ -588,6 +571,23 @@ CREATE TABLE IF NOT EXISTS `zt_oauth` ( KEY `providerType` (`providerType`), KEY `providerID` (`providerID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_pipeline`; +CREATE TABLE IF NOT EXISTS `zt_pipeline` ( + `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT, + `type` char(30) NOT NULL, + `name` varchar(50) NOT NULL, + `url` varchar(255) DEFAULT NULL, + `account` varchar(30) DEFAULT NULL, + `password` varchar(255) NOT NULL, + `token` varchar(255) DEFAULT NULL, + `private` char(32) DEFAULT NULL, + `createdBy` varchar(30) NOT NULL, + `createdDate` datetime NOT NULL, + `editedBy` varchar(30) NOT NULL, + `editedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_planstory`; CREATE TABLE IF NOT EXISTS `zt_planstory` ( `plan` mediumint(8) unsigned NOT NULL, diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 28e33ab405..b2c26de86d 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -139,3 +139,4 @@ $lang->upgrade->fromVersions['15_0_rc3'] = '15.0.rc3'; $lang->upgrade->fromVersions['15_0'] = '15.0'; $lang->upgrade->fromVersions['15_0_1'] = '15.0.1'; $lang->upgrade->fromVersions['15_0_2'] = '15.0.2'; +$lang->upgrade->fromVersions['15_0_3'] = '15.0.3'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 2dee20d4a5..2cae30eef9 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3077,7 +3077,8 @@ class upgradeModel extends model $this->saveLogs($this->dao->get()); $mailQueueTable = '`' . $this->config->db->prefix . 'mailqueue`'; - $stmt = $this->dao->select('*')->from($mailQueueTable)->where('addedDate')->like(date('Y-m-') . '%')->orderBy('id')->query(); + $syncBeginDate = date('Y-m-d', time() - 15 * 24 * 3600); + $stmt = $this->dao->select('*')->from($mailQueueTable)->where('addedDate')->ge($syncBeginDate)->orderBy('id')->query(); while($mailQueue = $stmt->fetch()) { $notify = new stdclass(); @@ -3096,7 +3097,7 @@ class upgradeModel extends model } $webhookDataTable = '`' . $this->config->db->prefix . 'webhookdatas`'; - $stmt = $this->dao->select('*')->from($webhookDataTable)->orderBy('id')->limit($offset, $rows)->query(); + $stmt = $this->dao->select('*')->from($webhookDataTable)->orderBy('id')->limit($offset, $rows)->query(); while($webhookData = $stmt->fetch()) { $notify = new stdclass();