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 @@ +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();