From d0e41d1d6251c4152540f7aaeece81b67497a92a Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 21 Apr 2022 13:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E5=AE=89=E8=A3=85=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=B0public=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/public/index.php         | 2 +-
 crmeb/public/install/index.php | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/crmeb/public/index.php b/crmeb/public/index.php
index 1e41581d1..cc3331638 100755
--- a/crmeb/public/index.php
+++ b/crmeb/public/index.php
@@ -15,7 +15,7 @@ namespace think;
 define('DS', DIRECTORY_SEPARATOR);
 
 //检测是否已安装CRMEB系统
-if(file_exists("./install/") && !file_exists("./install/install.lock")){
+if(file_exists("./install/") && !file_exists("./install.lock")){
     if($_SERVER['PHP_SELF'] != '/index.php'){
         header("Content-type: text/html; charset=utf-8");
         exit("请在域名根目录下安装,如:<br/> www.xxx.com/index.php 正确 <br/>  www.xxx.com/www/index.php 错误,域名后面不能圈套目录, 但项目没有根目录存放限制,可以放在任意目录,apache虚拟主机配置一下即可");
diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php
index 24f6fa1ad..bd54485f8 100644
--- a/crmeb/public/install/index.php
+++ b/crmeb/public/install/index.php
@@ -1,5 +1,4 @@
 <?php
-
 //最低php版本要求
 define('PHP_EDITION','7.1.0');
 //服务环境检测
@@ -9,7 +8,7 @@ if (function_exists('saeAutoLoader') || isset($_SERVER['HTTP_BAE_ENV_APPID']))
 define('APP_DIR', _dir_path(substr(dirname(__FILE__), 0, -15)));//项目目录
 define('SITE_DIR', _dir_path(substr(dirname(__FILE__), 0, -8)));//入口文件目录
 
-if (file_exists('./install.lock')) {
+if (file_exists('../install.lock')) {
     showHtml('你已经安装过该系统，如果想重新安装，请先删除install目录下的 install.lock 文件，然后再安装。');
 }
 @set_time_limit(1000);
@@ -138,7 +137,7 @@ switch ($step) {
 
 
         $folder = array(
-            'public/install',
+            'public',
             'public/uploads',
             'runtime',
         );
@@ -476,7 +475,7 @@ switch ($step) {
         $version = trim($curent_version['version']);
         installlog();
         include_once("./templates/step5.php");
-        @touch('./install.lock');
+        @touch('../install.lock');
         exit();
 }
 //读取版本号