diff --git a/config/zentaopms.php b/config/zentaopms.php index cec363d7b4..824350a759 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -527,7 +527,6 @@ define('TABLE_DEPLOY', '`' . $config->db->prefix . 'deploy`'); define('TABLE_DEPLOYPRODUCT', '`' . $config->db->prefix . 'deployproduct`'); define('TABLE_DEPLOYSTEP', '`' . $config->db->prefix . 'deploystep`'); define('TABLE_DERIVEMEAS', '`' . $config->db->prefix . 'derivemeas`'); -define('TABLE_DOMAIN', '`' . $config->db->prefix . 'domain`'); define('TABLE_DURATIONESTIMATION', '`' . $config->db->prefix . 'durationestimation`'); define('TABLE_FAQ', '`' . $config->db->prefix . 'faq`'); define('TABLE_FEEDBACK', '`' . $config->db->prefix . 'feedback`'); diff --git a/db/zentao.sql b/db/zentao.sql index fe0a443c2a..a5a04da903 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -3050,25 +3050,6 @@ CREATE TABLE IF NOT EXISTS `zt_faq` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_domain`; -CREATE TABLE IF NOT EXISTS `zt_domain`( - `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, - `domain` varchar(255) NOT NULL DEFAULT '', - `adminURI` varchar(255) NOT NULL DEFAULT '', - `resolverURI` varchar(255) NOT NULL DEFAULT '', - `register` varchar(255) NOT NULL DEFAULT '', - `expiredDate` datetime NULL, - `renew` varchar(255) NOT NULL DEFAULT '', - `account` varchar(255) NOT NULL DEFAULT '', - `createdBy` varchar(30) NOT NULL DEFAULT '', - `createdDate` datetime NULL, - `editedBy` varchar(30) NOT NULL DEFAULT '', - `editedDate` datetime NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE INDEX `domain` ON `zt_domain` (`domain`); - UPDATE `zt_user` SET `visions` = 'lite', `feedback` = '0' WHERE `feedback` = '1'; REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES diff --git a/module/upgrade/config.php b/module/upgrade/config.php index a620fea3ec..d278896743 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -1419,6 +1419,9 @@ $config->delete['21_2'][] = 'extension/max/service/'; $config->delete['21_2'][] = 'extension/biz/host/'; $config->delete['21_2'][] = 'extension/max/host/'; $config->delete['21_2'][] = 'extension/ipd/host/'; +$config->delete['21_2'][] = 'extension/biz/domain/'; +$config->delete['21_2'][] = 'extension/max/domain/'; +$config->delete['21_2'][] = 'extension/ipd/domain/'; $config->upgrade->openModules = array('action', 'admin', 'ai', 'bi', 'aiapp', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'cache', 'caselib', 'chart', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dataview', 'dept', 'design', 'dev', 'dimension', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'metric', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'pivot', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'screen', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'transfer', 'zahost', 'zanode', 'editor', 'charter', 'roadmap', 'account', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution', 'demand', 'gitfox', 'epic', 'requirement', 'mark'); $config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs', 'zanode', 'zahost');