From c1e4297659359ea8f4a8bf930c01b035276251ab Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 21 Apr 2022 13:27:20 +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=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               |  7 ++--
 crmeb/public/install/templates/step2.php | 44 +++++++++++++-----------
 crmeb/runtime/index.html                 |  0
 3 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 crmeb/runtime/index.html

diff --git a/.gitignore b/.gitignore
index 6c72645ef..f12c9200c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,14 @@
 /.git
 /.idea
 /crmeb/.constant
-/crmeb/runtime
+/crmeb/runtime/cache
+/crmeb/runtime/log
+/crmeb/runtime/session
+/crmeb/runtime/temp
 /crmeb/public/uploads
 *.log
 /crmeb/public/install/install.lock
-/crmeb/.env
+#/crmeb/.env
 /crmeb/timer.pid
 /crmeb/workerman.pid
 /docker-compose/mysql/data/
diff --git a/crmeb/public/install/templates/step2.php b/crmeb/public/install/templates/step2.php
index 7ce0aa009..e0dc8fa7b 100644
--- a/crmeb/public/install/templates/step2.php
+++ b/crmeb/public/install/templates/step2.php
@@ -147,28 +147,32 @@
                 foreach ($file as $dir) {
                     $Testdir = APP_DIR . $dir;
                      @unlink($Testdir);
-                }
-                $file_env = APP_DIR . ".env";
-                @fopen($file_env, "w");
-                if (testwrite($file_env)) {
-                    $w = '<span class="correct_span">&radic;</span>可写 ';
-                } else {
-                    $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
-                    $err++;
-                }
-                if (is_readable($file_env)) {
-                    $r = '<span class="correct_span">&radic;</span>可读';
-                } else {
-                    $r = '<span class="correct_span error_span">&radic;</span>不可读';
-                    $err++;
+                    $file_env = APP_DIR . ".env";
+                    @fopen($file_env, "w");
+                    if (testwrite($file_env)) {
+                        $w = '<span class="correct_span">&radic;</span>可写 ';
+                    } else {
+                        $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
+                        $err++;
+                    }
+                    if (is_readable($file_env)) {
+                        $r = '<span class="correct_span">&radic;</span>可读';
+                    } else {
+                        $r = '<span class="correct_span error_span">&radic;</span>不可读';
+                        $err++;
+                    }
+                    ?>
+
+                    <tr>
+                        <td><?php echo $dir; ?></td>
+                        <td>读写</td>
+                        <td><?php echo $w; ?></td>
+                        <td><?php echo $r; ?></td>
+                    </tr>
+                <?php
                 }
                 ?>
-                <tr>
-                    <td>/</td>
-                    <td>读写</td>
-                    <td><?php echo $w; ?></td>
-                    <td><?php echo $r; ?></td>
-                </tr>
+
 
             </table>
             <table width="100%">
diff --git a/crmeb/runtime/index.html b/crmeb/runtime/index.html
new file mode 100644
index 000000000..e69de29bb