From 5a06a7511e435162e41ecac0fd7c8f4f652952bb Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Mon, 15 Aug 2022 16:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Providers/AdminServiceProvider.php | 4 ++--
 beike/Helpers.php                              | 5 +++++
 beike/Shop/Providers/PluginServiceProvider.php | 3 +--
 beike/Shop/Providers/ShopServiceProvider.php   | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php
index 94ecb57c..2df645de 100644
--- a/beike/Admin/Providers/AdminServiceProvider.php
+++ b/beike/Admin/Providers/AdminServiceProvider.php
@@ -26,10 +26,10 @@ class AdminServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $uri = request()->getRequestUri();
-        if (Str::startsWith($uri, "/installer")) {
+        if(!installed()) {
             return;
         }
+        $uri = request()->getRequestUri();
         load_settings();
         $this->loadRoutesFrom(__DIR__ . '/../Routes/admin.php');
 
diff --git a/beike/Helpers.php b/beike/Helpers.php
index 525b9ff4..545fcdd0 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -564,3 +564,8 @@ function add_action($hook, $callback, int $priority = 20, int $arguments = 1)
 {
     Eventy::addAction($hook, $callback, $priority, $arguments);
 }
+
+function installed()
+{
+    return file_exists(storage_path('installed'));
+}
diff --git a/beike/Shop/Providers/PluginServiceProvider.php b/beike/Shop/Providers/PluginServiceProvider.php
index 8dc17ed9..77ad4fe0 100644
--- a/beike/Shop/Providers/PluginServiceProvider.php
+++ b/beike/Shop/Providers/PluginServiceProvider.php
@@ -39,8 +39,7 @@ class PluginServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $uri = request()->getRequestUri();
-        if (Str::startsWith($uri, "/installer")) {
+        if(!installed()) {
             return;
         }
         $manager = app('plugin');
diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index 88e4480a..2c4317da 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -34,10 +34,10 @@ class ShopServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $uri = request()->getRequestUri();
-        if (Str::startsWith($uri, "/installer")) {
+        if(!installed()) {
             return;
         }
+        $uri = request()->getRequestUri();
         $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php');
 
         load_settings();