From 30cb23b68b1e042d9cc1e4b953e5450f78f26a9b Mon Sep 17 00:00:00 2001
From: tensent <ycgpp@126.com>
Date: Tue, 14 Apr 2020 14:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/install.php | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/public/install.php b/public/install.php
index fd031556..59be47c9 100644
--- a/public/install.php
+++ b/public/install.php
@@ -8,8 +8,6 @@
 // +----------------------------------------------------------------------
 namespace think;
 
-use think\facade\Db;
-
 session_start();
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -20,14 +18,6 @@ if (is_file($app->getRootPath() . '.env') && is_file($app->getRootPath() . 'inst
 }
 
 define('ROOT_PATH', $app->getRootPath());
-$status = [
-	'index'    => 'info',
-	'check'    => 'info',
-	'config'   => 'info',
-	'sql'      => 'info',
-	'complete' => 'info',
-];
-
 $action = $app->request->param('action', 'index');
 
 $title = "";
@@ -119,7 +109,6 @@ if ($action == 'index') {
 <script type="text/javascript">
 function showmsg(msg, classname){
 	$('div#show-list').append('<li class="list-group-item text-'+classname+'">'+msg+'</li>');
-	document.scrollTop += 30;
 }
 </script>
 </head>
@@ -627,7 +616,7 @@ function register_administrator($db, $prefix, $admin){
  */
 function update_tables($db, $prefix = ''){
 	//读取SQL文件
-	$sql = file_get_contents(ROOT_PATH . 'data/update.sql');
+	$sql = file_get_contents(ROOT_PATH . 'runtime' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR . 'update.sql');
 	$sql = str_replace("\r", "\n", $sql);
 	$sql = explode(";\n", $sql);
 
@@ -679,17 +668,6 @@ function show_msg($msg, $class = 'primary'){
 	ob_flush();
 }
 
-/**
- * 生成系统AUTH_KEY
- * @author 麦当苗儿 <zuojiazi@vip.qq.com>
- */
-function build_auth_key(){
-	$chars  = 'abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	$chars .= '`~!@#$%^&*()_+-=[]{};:"|,.<>/?';
-	$chars  = str_shuffle($chars);
-	return substr($chars, 0, 40);
-}
-
 function session($name, $value = false){
 	if ($name == '') {
 		return false;