From c0acb4fb4dec8af628fd13ffb03918528f8ad64c Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Mon, 15 Aug 2022 17:54:49 +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

---
 app/Http/Kernel.php                           |  2 ++
 app/Http/Middleware/CheckInstalled.php        | 24 +++++++++++++++++++
 .../Admin/Providers/AdminServiceProvider.php  |  5 ++--
 beike/Shop/Providers/ShopServiceProvider.php  |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app/Http/Middleware/CheckInstalled.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 3bf4ab8c..09b2a11a 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,6 +29,7 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'shop' => [
+            \App\Http\Middleware\CheckInstalled::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
@@ -40,6 +41,7 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
         'admin' => [
+            \App\Http\Middleware\CheckInstalled::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
diff --git a/app/Http/Middleware/CheckInstalled.php b/app/Http/Middleware/CheckInstalled.php
new file mode 100644
index 00000000..fbf95a6c
--- /dev/null
+++ b/app/Http/Middleware/CheckInstalled.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class CheckInstalled
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if(!installed()) {
+            return redirect(route('installer.welcome'));
+        }
+        return $next($request);
+    }
+}
diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php
index 2df645de..55fc0e95 100644
--- a/beike/Admin/Providers/AdminServiceProvider.php
+++ b/beike/Admin/Providers/AdminServiceProvider.php
@@ -26,10 +26,11 @@ class AdminServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if(!installed()) {
+        $uri = request()->getRequestUri();
+        if (Str::startsWith($uri, "/installer")) {
             return;
         }
-        $uri = request()->getRequestUri();
+
         load_settings();
         $this->loadRoutesFrom(__DIR__ . '/../Routes/admin.php');
 
diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index 2c4317da..88e4480a 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -34,10 +34,10 @@ class ShopServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if(!installed()) {
+        $uri = request()->getRequestUri();
+        if (Str::startsWith($uri, "/installer")) {
             return;
         }
-        $uri = request()->getRequestUri();
         $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php');
 
         load_settings();