Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [release] update version info.

Browse Source
This commit is contained in:
caoyanyi
2024-11-12 13:22:21 +08:00
committed by 李阳
parent 6462fda0db
commit 64a9ec4718
11 changed files with 4740 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
21.0
21.1
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '21.0'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '21.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
db/standard/zentao21.1.sql
+4464
View File
File diff suppressed because it is too large Load Diff
db/zentao.sql
+251
View File
@@ -16129,3 +16129,254 @@ REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `
('zh-tw', 'custom', 'relationList', '2', '{\"relation\":\"\\u4f9d\\u8cf4\",\"relativeRelation\":\"\\u88ab\\u4f9d\\u8cf4\"}', '0', 'all'),
('zh-tw', 'custom', 'relationList', '3', '{\"relation\":\"\\u91cd\\u8907\",\"relativeRelation\":\"\\u91cd\\u8907\"}', '0', 'all'),
('zh-tw', 'custom', 'relationList', '4', '{\"relation\":\"\\u5f15\\u7528\",\"relativeRelation\":\"\\u88ab\\u5f15\\u7528\"}', '0', 'all');
-- DROP TABLE IF EXISTS `im_chat`;
CREATE TABLE IF NOT EXISTS `im_chat` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`gid` char(40) NOT NULL DEFAULT '',
`name` varchar(60) NOT NULL DEFAULT '',
`type` varchar(20) NOT NULL DEFAULT 'group',
`admins` varchar(255) NOT NULL DEFAULT '',
`committers` varchar(255) NOT NULL DEFAULT '',
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
`public` enum('0', '1') NOT NULL DEFAULT '0',
`createdBy` varchar(30) NOT NULL DEFAULT '',
`createdDate` datetime NULL,
`ownedBy` varchar(30) NOT NULL DEFAULT '',
`editedBy` varchar(30) NOT NULL DEFAULT '',
`editedDate` datetime NULL,
`mergedDate` datetime NULL,
`lastActiveTime` datetime NULL,
`lastMessage` int(11) unsigned NOT NULL DEFAULT 0,
`lastMessageIndex` int(11) unsigned NOT NULL DEFAULT 0,
`dismissDate` datetime NULL,
`pinnedMessages` text NULL,
`mergedChats` text NULL,
`adminInvite` enum('0','1') NOT NULL DEFAULT '0',
`avatar` text NULL,
`archiveDate` datetime NULL,
PRIMARY KEY (`id`),
KEY `gid` (`gid`),
KEY `name` (`name`),
KEY `type` (`type`),
KEY `public` (`public`),
KEY `createdBy` (`createdBy`),
KEY `editedBy` (`editedBy`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_chatuser`;
CREATE TABLE IF NOT EXISTS `im_chatuser` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`cgid` char(40) NOT NULL DEFAULT '',
`user` mediumint(8) NOT NULL DEFAULT 0,
`order` smallint(5) NOT NULL DEFAULT 0,
`star` enum('0', '1') NOT NULL DEFAULT '0',
`hide` enum('0', '1') NOT NULL DEFAULT '0',
`mute` enum('0', '1') NOT NULL DEFAULT '0',
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
`join` datetime NULL,
`quit` datetime NULL,
`category` varchar(40) NOT NULL DEFAULT '',
`lastReadMessage` int(11) unsigned NOT NULL DEFAULT 0,
`lastReadMessageIndex` int(11) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
KEY `cgid` (`cgid`),
KEY `user` (`user`),
KEY `order` (`order`),
KEY `star` (`star`),
KEY `hide` (`hide`),
UNIQUE KEY `chatuser` (`cgid`, `user`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_client`;
CREATE TABLE IF NOT EXISTS `im_client` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`version` char(30) NOT NULL DEFAULT '',
`desc` varchar(100) NOT NULL DEFAULT '',
`changeLog` text NULL,
`strategy` varchar(10) NOT NULL DEFAULT '',
`downloads` text NULL,
`createdDate` datetime NULL,
`createdBy` varchar(30) NOT NULL DEFAULT '',
`editedDate` datetime NULL,
`editedBy` varchar(30) NOT NULL DEFAULT '',
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_message`;
CREATE TABLE IF NOT EXISTS `im_message` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`gid` char(40) NOT NULL DEFAULT '',
`cgid` char(40) NOT NULL DEFAULT '',
`user` varchar(30) NOT NULL DEFAULT '',
`date` datetime NULL,
`index` int(11) unsigned NOT NULL DEFAULT 0,
`type` enum('normal', 'broadcast', 'notify', 'bulletin', 'botcommand') NOT NULL DEFAULT 'normal',
`content` text NULL,
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
`data` text NULL,
`deleted` enum('0','1') NOT NULL DEFAULT '0',
`legacy` tinyint(1) NOT NULL DEFAULT 0,
`uniqueIndex` int(11) GENERATED ALWAYS AS (CASE WHEN `legacy` = 1 THEN NULL WHEN `cgid` = 'notification' THEN NULL ELSE `index` END) STORED,
PRIMARY KEY (`id`),
KEY `mgid` (`gid`),
KEY `mcgid` (`cgid`),
KEY `muser` (`user`),
KEY `mtype` (`type`),
CONSTRAINT `uniqueIndexInChat` UNIQUE (`cgid`, `uniqueIndex`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_message_backup`;
CREATE TABLE IF NOT EXISTS `im_message_backup` (
`id` int(11) unsigned NOT NULL,
`gid` char(40) NOT NULL DEFAULT '',
`cgid` char(40) NOT NULL DEFAULT '',
`user` varchar(30) NOT NULL DEFAULT '',
`date` datetime NULL,
`index` int(11) unsigned NOT NULL DEFAULT 0,
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
`content` text NULL,
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
`data` text NULL,
`deleted` enum('0','1') NOT NULL DEFAULT '0'
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_message_index`;
CREATE TABLE IF NOT EXISTS `im_message_index` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`tableName` char(64) NOT NULL,
`start` int(11) unsigned NOT NULL,
`end` int(11) unsigned NOT NULL,
`startDate` datetime NULL,
`endDate` datetime NULL,
`chats` text NULL,
PRIMARY KEY (`id`),
KEY `tableName` (`tableName`),
KEY `start` (`start`),
KEY `end` (`end`),
KEY `startDate` (`startDate`),
KEY `endDate` (`endDate`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_chat_message_index`;
CREATE TABLE IF NOT EXISTS `im_chat_message_index` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`gid` char(40) NOT NULL,
`tableName` char(64) NOT NULL,
`start` int(11) unsigned NOT NULL,
`end` int(11) unsigned NOT NULL,
`startIndex` int(11) unsigned NOT NULL,
`endIndex` int(11) unsigned NOT NULL,
`startDate` datetime NULL,
`endDate` datetime NULL,
`count` mediumint(8) unsigned NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `chattable` (`gid`,`tableName`),
KEY `start` (`start`),
KEY `end` (`end`),
KEY `startDate` (`startDate`),
KEY `endDate` (`endDate`),
KEY `chatstartindex` (`gid`,`startIndex`),
KEY `chatendindex` (`gid`,`endIndex`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_messagestatus`;
CREATE TABLE IF NOT EXISTS `im_messagestatus` (
`user` mediumint(8) NOT NULL DEFAULT 0,
`message` int(11) unsigned NOT NULL,
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
UNIQUE KEY `user` (`user`,`message`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_queue`;
CREATE TABLE IF NOT EXISTS `im_queue` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`type` char(30) NOT NULL,
`content` text NULL,
`addDate` datetime NULL,
`processDate` datetime NULL,
`result` text NULL,
`status` char(30) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_conference`;
CREATE TABLE IF NOT EXISTS `im_conference` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`rid` char(40) NOT NULL DEFAULT '',
`cgid` char(40) NOT NULL DEFAULT '',
`status` enum ('closed', 'open', 'notStarted', 'canceled') NOT NULL DEFAULT 'closed',
`participants` text NULL,
`subscribers` text NULL,
`invitee` text NULL,
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
`openedDate` datetime NULL,
`topic` text NULL,
`startTime` datetime NULL,
`endTime` datetime NULL,
`password` char(20) NOT NULL DEFAULT '',
`type` enum('default','periodic','scheduled') NOT NULL DEFAULT 'default',
`number` char(20) NOT NULL DEFAULT '',
`note` text NULL,
`sentNotify` tinyint(1) NOT NULL DEFAULT 0,
`reminderTime` int NOT NULL DEFAULT 0,
`moderators` text NULL,
`isPrivate` enum ('0', '1') NOT NULL DEFAULT '0',
`isInner` enum('0', '1') NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
KEY `status` (`status`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_conferenceaction`;
CREATE TABLE IF NOT EXISTS `im_conferenceaction` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`rid` char(40) NOT NULL DEFAULT '',
`type` enum('create','invite','join','leave','close','publish') NOT NULL DEFAULT 'create',
`data` text NULL,
`user` mediumint(8) NOT NULL DEFAULT 0,
`date` datetime NULL,
`device` char(40) NOT NULL DEFAULT 'default',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_conferenceuser`;
CREATE TABLE IF NOT EXISTS `im_conferenceuser` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`conference` mediumint(8) NOT NULL DEFAULT 0,
`user` mediumint(8) NOT NULL DEFAULT 0,
`hide` enum('0', '1') NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `conferenceuser` (`conference`, `user`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_conferenceinvite`;
CREATE TABLE IF NOT EXISTS `im_conferenceinvite` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`conferenceID` mediumint(8) unsigned NOT NULL,
`inviteeID` mediumint(8) unsigned NOT NULL,
`status` enum('pending', 'accepted', 'rejected') NOT NULL DEFAULT 'pending',
`createdDate` datetime NULL,
`updatedDate` datetime NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `conference_user` (`conferenceID`, `inviteeID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `im_userdevice`;
CREATE TABLE IF NOT EXISTS `im_userdevice` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`user` mediumint(8) NOT NULL DEFAULT 0,
`device` char(40) NOT NULL DEFAULT 'default',
`deviceID` char(40) NOT NULL DEFAULT '',
`token` char(64) NOT NULL DEFAULT '',
`validUntil` datetime NULL,
`lastLogin` datetime NULL,
`lastLogout` datetime NULL,
`online` tinyint(1) NOT NULL DEFAULT 0,
`version` char(10) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
KEY `user` (`user`),
KEY `lastLogin` (`lastLogin`),
KEY `lastLogout` (`lastLogout`),
UNIQUE KEY `userdevice` (`user`, `device`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
doc/CHANGELOG
+4
View File
@@ -1,3 +1,7 @@
2024-11-15 21.1
完成的需求
修复的Bug
2024-11-01 21.0
完成的需求
开源版：
module/misc/lang/de.php
+1
View File
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
module/misc/lang/en.php
+1
View File
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
module/misc/lang/fr.php
+1
View File
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
module/misc/lang/zh-cn.php
+2
View File
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
@@ -239,6 +240,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
$lang->misc->feature->all['21.1'][] = array('title' => '', 'desc' => '');
$lang->misc->feature->all['21.0'][] = array('title' => '文档功能优化；产品流程模板、项目流程模板BI设计器优化。', 'desc' => '');
$lang->misc->feature->all['20.8'][] = array('title' => '文档优化：优化任务关系，修复Bug。', 'desc' => '');
$lang->misc->feature->all['20.7.1'][] = array('title' => '修复已知Bug。', 'desc' => '');
module/upgrade/config.php
+6 -3
View File
@@ -58,7 +58,8 @@ $config->upgrade->maxVersion['max5_5'] = '20_6';
$config->upgrade->maxVersion['max5_6'] = '20_7';
$config->upgrade->maxVersion['max5_6_1'] = '20_7_1';
$config->upgrade->maxVersion['max5_7'] = '20_8';
$config->upgrade->maxVersion['max6_0'] = '21_0'; // max insert position.
$config->upgrade->maxVersion['max6_0'] = '21_0';
$config->upgrade->maxVersion['max6_1'] = '21_1'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -155,7 +156,8 @@ $config->upgrade->bizVersion['biz10_5'] = '20_6';
$config->upgrade->bizVersion['biz10_6'] = '20_7';
$config->upgrade->bizVersion['biz10_6_1'] = '20_7_1';
$config->upgrade->bizVersion['biz10_7'] = '20_8';
$config->upgrade->bizVersion['biz11_0'] = '21_0'; // biz insert position.
$config->upgrade->bizVersion['biz11_0'] = '21_0';
$config->upgrade->bizVersion['biz11_1'] = '21_1'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
@@ -289,7 +291,8 @@ $config->upgrade->ipdVersion['ipd2_5'] = '20_6';
$config->upgrade->ipdVersion['ipd2_6'] = '20_7';
$config->upgrade->ipdVersion['ipd2_6_1'] = '20_7_1';
$config->upgrade->ipdVersion['ipd2_7'] = '20_8';
$config->upgrade->ipdVersion['ipd3_0'] = '21_0'; // ipd insert position.
$config->upgrade->ipdVersion['ipd3_0'] = '21_0';
$config->upgrade->ipdVersion['ipd3_1'] = '21_1'; // ipd insert position.
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
module/upgrade/lang/version.php
+8 -4
View File
@@ -203,7 +203,8 @@ $lang->upgrade->fromVersions['20_6'] = '20.6';
$lang->upgrade->fromVersions['20_7'] = '20.7';
$lang->upgrade->fromVersions['20_7_1'] = '20.7.1';
$lang->upgrade->fromVersions['20_8'] = '20.8';
$lang->upgrade->fromVersions['21_0'] = '21.0'; // pms insert position.
$lang->upgrade->fromVersions['21_0'] = '21.0';
$lang->upgrade->fromVersions['21_1'] = '21.1'; // pms insert position.
global $config;
/* Lite. */
@@ -407,7 +408,8 @@ $lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5';
$lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6';
$lang->upgrade->fromVersions['biz10_6_1'] = 'Biz10.6.1';
$lang->upgrade->fromVersions['biz10_7'] = 'Biz10.7';
$lang->upgrade->fromVersions['biz11_0'] = 'Biz11.0'; // biz insert position.
$lang->upgrade->fromVersions['biz11_0'] = 'Biz11.0';
$lang->upgrade->fromVersions['biz11_1'] = 'Biz11.1'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -469,7 +471,8 @@ $lang->upgrade->fromVersions['max5_5'] = 'Max5.5';
$lang->upgrade->fromVersions['max5_6'] = 'Max5.6';
$lang->upgrade->fromVersions['max5_6_1'] = 'Max5.6.1';
$lang->upgrade->fromVersions['max5_7'] = 'Max5.7';
$lang->upgrade->fromVersions['max6_0'] = 'Max6.0'; // max insert position.
$lang->upgrade->fromVersions['max6_0'] = 'Max6.0';
$lang->upgrade->fromVersions['max6_1'] = 'Max6.1'; // max insert position.
/* Ipd */
$lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';
@@ -492,4 +495,5 @@ $lang->upgrade->fromVersions['ipd2_4'] = 'Ipd2.4';
$lang->upgrade->fromVersions['ipd2_5'] = 'Ipd2.5';
$lang->upgrade->fromVersions['ipd2_6'] = 'Ipd2.6';
$lang->upgrade->fromVersions['ipd2_6_1'] = 'Ipd2.6.1';
$lang->upgrade->fromVersions['ipd2_7'] = 'Ipd2.7'; // ipd insert position.
$lang->upgrade->fromVersions['ipd2_7'] = 'Ipd2.7';
$lang->upgrade->fromVersions['ipd3_0'] = 'Ipd3.0'; // ipd insert position.