4.4.2更新方法

upgrade/bootstrap/autoload.php

@@ -13,6 +13,9 @@ require_once PATH_ROOT . DS . 'system/defines.php';
 $config = require PATH_ROOT . DS . 'system' . DS . 'config' . DS . 'config.php';
 $versions = require PATH_UPGRADE . DS . 'config' . DS . 'versions.php';
 
+// 修复开源版4.4.2 以下数据库版本问题
+require PATH_UPGRADE . DS . 'utils' . DS . 'repairOpenVersion.php';
+
 session_start();
 error_reporting(E_ALL | E_STRICT);
 

upgrade/config/versions.php

 <?php
 
 return array(
-    '4.0.0 pro' => '',
-    '4.0.1 pro' => '',
-    '4.1.0 pro' => '',
-    '4.2.0 pro' => '',
-    '4.2.1 pro' => '',
-    '4.2.2 pro' => '',
-    '4.2.3 pro' => '',
-    '4.2.4 pro' => '',
-    '4.3.0 pro' => '',
-    '4.4.0 pro' => '',
-    '4.4.1 pro' => '',
-    '4.4.2 pro' => '',
+    'pro' => array(
+        '4.0.0 pro' => '',
+        '4.0.1 pro' => '',
+        '4.1.0 pro' => '',
+        '4.2.0 pro' => '',
+        '4.2.1 pro' => '',
+        '4.2.2 pro' => '',
+        '4.2.3 pro' => '',
+        '4.2.4 pro' => '',
+        '4.3.0 pro' => '',
+        '4.4.0 pro' => '',
+        '4.4.1 pro' => '',
+        '4.4.2 pro' => '',
+    ),
+    'open' => array(
+        '4.2.2 open' => '',
+        '4.4.2 open' => '',
+    ),
 );

upgrade/db/update4.4.2 open.sql

+DROP TABLE IF EXISTS `{{template}}`;
+CREATE TABLE `{{template}}` (
+  `tid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `tname` varchar(255) NOT NULL COMMENT '汇报模板名称',
+  `autonumber` varchar(255) DEFAULT NULL COMMENT '自动文号',
+  `pictureurl` text NOT NULL COMMENT '模板图标url',
+  `cateid` int(10) unsigned NOT NULL COMMENT '模板分类id',
+  `description` text,
+  `addtime` int(10) unsigned NOT NULL COMMENT '创建模板或者添加模板的时间',
+  `deptid` text COMMENT '可用部门',
+  `positionid` text COMMENT '可用职位',
+  `roleid` text COMMENT '可用角色',
+  `uid` text COMMENT '可用用户',
+  `uptype` text COMMENT '主管类型，1表示一级主管，2表示二级主管，3表示三级主管，4表示四级主管，5表示五级主管',
+  `upuid` text COMMENT '主管uid',
+  `adduser` int(10) unsigned DEFAULT NULL COMMENT '添加系统模板和新建模板的用户id',
+  `isnew` int(10) unsigned NOT NULL COMMENT '是不是最新的模板，1表示是，0表示不是',
+  PRIMARY KEY (`tid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='汇报模板表';
+
+INSERT INTO `{{template}}` VALUES ('1', '周报', '', 'default', '2', '用于写周报', '1481088096', 'alldept', '', '', '', '', '', null, '1');
+INSERT INTO `{{template}}` VALUES ('2', '月报', '', 'default', '2', '用于写周报', '1481088096', 'alldept', '', '', '', '', '', null, '1');
+INSERT INTO `{{template}}` VALUES ('3', '季报', '', 'default', '2', '用于写季报', '1481088096', 'alldept', '', '', '', '', '', null, '1');
+INSERT INTO `{{template}}` VALUES ('4', '年报', '', 'default', '2', '用于写年报', '1481088096', 'alldept', '', '', '', '', '', null, '1');
+
+DROP TABLE IF EXISTS `{{template_field}}`;
+CREATE TABLE `{{template_field}}` (
+  `fid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '字段自增id',
+  `tid` int(10) unsigned NOT NULL COMMENT '模板id',
+  `fieldname` varchar(255) NOT NULL COMMENT '字段名称',
+  `iswrite` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '是否必填，0表示不需要，1表示需要',
+  `fieldtype` int(10) unsigned NOT NULL COMMENT '字段类型，1表示长文本，2表示短文本，3表示数字，4表示日期与时间，5表示时间，6表示日期，7表示下拉，8表示富文本',
+  `fieldvalue` text COMMENT '字段值',
+  `fieldsort` int(10) unsigned NOT NULL COMMENT '字段排序序号',
+  PRIMARY KEY (`fid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='汇报模板字段表';
+
+INSERT INTO `{{template_field}}` VALUES ('1', '1', '原计划', '1', '1', '', '1');
+INSERT INTO `{{template_field}}` VALUES ('2', '1', '计划外', '0', '1', '', '2');
+INSERT INTO `{{template_field}}` VALUES ('3', '1', '工作总结', '1', '8', '', '3');
+INSERT INTO `{{template_field}}` VALUES ('4', '1', '下次计划', '1', '1', '', '4');
+INSERT INTO `{{template_field}}` VALUES ('5', '2', '原计划', '1', '1', '', '1');
+INSERT INTO `{{template_field}}` VALUES ('6', '2', '计划外', '0', '1', '', '2');
+INSERT INTO `{{template_field}}` VALUES ('7', '2', '工作总结', '1', '8', '', '3');
+INSERT INTO `{{template_field}}` VALUES ('8', '2', '下次计划', '1', '1', '', '4');
+INSERT INTO `{{template_field}}` VALUES ('9', '3', '原计划', '1', '1', '', '1');
+INSERT INTO `{{template_field}}` VALUES ('10', '3', '计划外', '0', '1', '', '2');
+INSERT INTO `{{template_field}}` VALUES ('11', '3', '工作总结', '1', '8', '', '3');
+INSERT INTO `{{template_field}}` VALUES ('12', '3', '下次计划', '1', '1', '', '4');
+INSERT INTO `{{template_field}}` VALUES ('13', '4', '原计划', '1', '1', '', '1');
+INSERT INTO `{{template_field}}` VALUES ('14', '4', '计划外', '0', '1', '', '2');
+INSERT INTO `{{template_field}}` VALUES ('15', '4', '工作总结', '1', '8', '', '3');
+INSERT INTO `{{template_field}}` VALUES ('16', '4', '下次计划', '1', '1', '', '4');
+
+DROP TABLE IF EXISTS `{{template_add}}`;
+CREATE TABLE `{{template_add}}` (
+  `aid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `shoptid` int(10) unsigned NOT NULL COMMENT '模板商城模板id',
+  `tid` int(10) unsigned NOT NULL COMMENT '添加模板id',
+  `uid` int(10) unsigned NOT NULL COMMENT '添加这id',
+  `addtime` int(10) unsigned NOT NULL COMMENT '添加时间',
+  PRIMARY KEY (`aid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='汇报模板字段表';
+
+DROP TABLE IF EXISTS `{{template_category}}`;
+CREATE TABLE `{{template_category}}` (
+  `cateid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '分类自增id',
+  `categoryname` varchar(255) NOT NULL COMMENT '分类名',
+  `addtime` int(10) unsigned NOT NULL COMMENT '添加时间',
+  PRIMARY KEY (`cateid`)
+) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='汇报模板分类表';
+
+INSERT INTO `{{template_category}}` VALUES ('1', '个人模板', '1480489635');
+INSERT INTO `{{template_category}}` VALUES ('2', '官方模板', '1480489636');
+INSERT INTO `{{template_category}}` VALUES ('3', '服务业', '1480489637');
+INSERT INTO `{{template_category}}` VALUES ('4', '餐饮业', '1480489638');
+INSERT INTO `{{template_category}}` VALUES ('5', '建筑业', '1480489639');
+
+DROP TABLE IF EXISTS `{{template_sort}}`;
+CREATE TABLE `{{template_sort}}` (
+  `sid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `uid` int(10) unsigned NOT NULL COMMENT '用户uid',
+  `tid` int(10) unsigned NOT NULL COMMENT '模板id',
+  `sort` int(10) unsigned NOT NULL DEFAULT '1' COMMENT '排序序号',
+  PRIMARY KEY (`sid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='汇报模板排序表';
+
+DROP TABLE IF EXISTS `{{module_reader}}`;
+CREATE TABLE `{{module_reader}}` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `module` varchar(255) NOT NULL COMMENT '关联模型',
+  `relateid` int(11) NOT NULL COMMENT '关联id',
+  `uid` int(11) NOT NULL COMMENT '读者id',
+  `addtime` int(11) NOT NULL COMMENT '添加时间',
+  `readername` varchar(255) DEFAULT NULL COMMENT '读者真实名',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `{{notify_alarm}}`;
+CREATE TABLE `{{notify_alarm}}` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `uid` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT '用户ID',
+  `node` varchar(50) NOT NULL COMMENT '事件节点',
+  `module` char(30) NOT NULL COMMENT '模块名称',
+  `title` varchar(250) NOT NULL COMMENT '标题',
+  `body` text NOT NULL COMMENT '内容',
+  `ctime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
+  `url` varchar(200) NOT NULL DEFAULT '' COMMENT '链接地址',
+  `receiveuids` text NOT NULL COMMENT '接收提醒的用户ID,逗号隔开',
+  `stime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '自定义发送时间',
+  `alarmtype` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '提醒类型：0为自定义时间，1为关联事件时间',
+  `issend` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态：0未发送，1已发送',
+  `diffetime` int(10) NOT NULL DEFAULT '0' COMMENT '差异量:分钟数,负数代表提前，正数代表增加',
+  `eventid` varchar(60) NOT NULL DEFAULT '0' COMMENT '事件ID',
+  `tablename` varchar(50) NOT NULL COMMENT '关联事件表名',
+  `fieldname` varchar(50) NOT NULL COMMENT '关联事件时间字段名',
+  `uptime` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '修改时间',
+  `idname` varchar(50) NOT NULL COMMENT '关联事件时间id名',
+  `timenode` varchar(50) NOT NULL COMMENT '事件时间节点',
+  PRIMARY KEY (`id`),
+  KEY `notify_state` (`issend`) USING BTREE,
+  KEY `notify_uid` (`uid`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=775 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
\ No newline at end of file

upgrade/utils/functions.php

@@ -205,7 +205,10 @@ function execute($version)
             upgradeTo20170609();
             break;
         case '4.4.2 pro':
+            upgradeTo20171128();
+            break;
         case '4.4.2 open':
+            upgradeTo20170511();
             upgradeTo20171128();
             break;
         default:
@@ -840,9 +843,12 @@ function upgradeTo20170609()
 function getCross($fromVersion)
 {
     global $versions;
+    $fromVersionArr = explode(' ', $fromVersion);
+    $versionType = !empty($fromVersionArr[1]) && !empty($versions[$fromVersionArr[1]])? $fromVersionArr[1] : 'pro';
+    $typeVersions = $versions[$versionType];
     $counter = 0;
     $gotcha = false;
-    foreach ($versions as $key => $ver) {
+    foreach ($typeVersions as $key => $ver) {
         if ($key == $fromVersion) {
             $gotcha = true;
             break;
@@ -850,7 +856,7 @@ function getCross($fromVersion)
         $counter++;
     }
     if ($gotcha) {
-        $crossVersions = array_slice($versions, $counter+1);
+        $crossVersions = array_slice($typeVersions, $counter+1);
         return array_keys($crossVersions);
     } else {
         return array();

upgrade/utils/repairOpenVersion.php

+<?php
+function repairOpenVersion()
+{
+    updateVersion("4.2.2 open");
+}
+
+$version = strtolower(VERSION . " " .VERSION_TYPE);
+
+if ($version == "4.4.2 open") {
+    repairOpenVersion();
+}
\ No newline at end of file