diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 53155a48..94ecb57c 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -26,10 +26,13 @@ class AdminServiceProvider extends ServiceProvider */ public function boot() { + $uri = request()->getRequestUri(); + if (Str::startsWith($uri, "/installer")) { + return; + } load_settings(); $this->loadRoutesFrom(__DIR__ . '/../Routes/admin.php'); - $uri = request()->getRequestUri(); $adminName = admin_name(); if (!Str::startsWith($uri, "/{$adminName}")) { return; diff --git a/beike/Shop/Providers/PluginServiceProvider.php b/beike/Shop/Providers/PluginServiceProvider.php index 063044c5..8dc17ed9 100644 --- a/beike/Shop/Providers/PluginServiceProvider.php +++ b/beike/Shop/Providers/PluginServiceProvider.php @@ -15,6 +15,7 @@ use Beike\Plugin\Manager; use Beike\Models\AdminUser; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Str; class PluginServiceProvider extends ServiceProvider { @@ -38,6 +39,10 @@ class PluginServiceProvider extends ServiceProvider */ public function boot() { + $uri = request()->getRequestUri(); + if (Str::startsWith($uri, "/installer")) { + return; + } $manager = app('plugin'); $plugins = $manager->getEnabledPlugins(); $this->pluginBasePath = base_path('plugins'); diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php index aeec445f..88e4480a 100644 --- a/beike/Shop/Providers/ShopServiceProvider.php +++ b/beike/Shop/Providers/ShopServiceProvider.php @@ -34,9 +34,12 @@ class ShopServiceProvider extends ServiceProvider */ public function boot() { + $uri = request()->getRequestUri(); + if (Str::startsWith($uri, "/installer")) { + return; + } $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php'); - $uri = request()->getRequestUri(); load_settings(); if (Str::startsWith($uri, '/admin')) {