修复升级过程中的异常

cjbdnet · Mar 19, 2019 · 1f6ba4a · 1f6ba4a
1 parent 111802e
commit 1f6ba4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/application/modules/Install/controllers/Upgrade.php b/application/modules/Install/controllers/Upgrade.php
@@ -114,6 +114,8 @@ public function ajaxAction()
 				if (!$result){
 					$data = array('code' => 1004, 'msg' =>"无法写入安装锁定到".INSTALL_LOCK."文件，请检查是否有写权限");
 				}
+				//20190319，这里添加一个延时，避免sql操作时间过长导致异常
+				sleep(10);
 				//更新配置缓存 
 				$m_config->getConfig(1);
 				$data = array('code' => 1, 'msg' =>"SUCCESS");

diff --git a/install/1.3.9/upgrade.sql b/install/1.3.9/upgrade.sql
@@ -2,7 +2,7 @@ ALTER TABLE `t_config` CHANGE `value` `value` TEXT  CHARACTER SET utf8mb4 COLLAT
 ALTER TABLE `t_config` CHANGE `tag` `tag` TEXT  CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注';
 ALTER TABLE `t_config` CHANGE `name` `name` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '配置名';
 ALTER TABLE `t_config_cat` CHANGE `catname` `catname` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置分类名';
-ALTER TABLE `t_config_cat` CHANGE `key` `key` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置分类KEY';
+ALTER TABLE `t_config_cat` CHANGE `catkey` `catkey` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置分类KEY';
 ALTER TABLE `t_email` CHANGE `mailaddress` `mailaddress` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '邮箱地址';
 ALTER TABLE `t_email` CHANGE `sendmail` `sendmail` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 发件人emal ';
 ALTER TABLE `t_email` CHANGE `sendname` `sendname` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发送人昵称';