diff --git a/beike/Installer/Controllers/FinalController.php b/beike/Installer/Controllers/FinalController.php index 34d6adb1..654a6778 100644 --- a/beike/Installer/Controllers/FinalController.php +++ b/beike/Installer/Controllers/FinalController.php @@ -3,7 +3,6 @@ namespace Beike\Installer\Controllers; use Illuminate\Routing\Controller; -use RachidLaasri\LaravelInstaller\Events\LaravelInstallerFinished; use Beike\Installer\Helpers\EnvironmentManager; use Beike\Installer\Helpers\FinalInstallManager; use Beike\Installer\Helpers\InstalledFileManager; @@ -24,8 +23,6 @@ class FinalController extends Controller $finalStatusMessage = $fileManager->update(); $finalEnvFile = $environment->getEnvContent(); - event(new LaravelInstallerFinished); - $steps = 5; return view('installer::finished', compact('finalMessages', 'finalStatusMessage', 'finalEnvFile', 'steps')); diff --git a/beike/Installer/Providers/InstallerServiceProvider.php b/beike/Installer/Providers/InstallerServiceProvider.php index 781204d6..050f77fb 100644 --- a/beike/Installer/Providers/InstallerServiceProvider.php +++ b/beike/Installer/Providers/InstallerServiceProvider.php @@ -2,6 +2,7 @@ namespace Beike\Installer\Providers; +use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Str; @@ -20,6 +21,8 @@ class InstallerServiceProvider extends ServiceProvider return; } + Schema::defaultStringLength(191); + $this->mergeConfigFrom(__DIR__ . '/../config.php', 'installer'); $this->loadViewsFrom(__DIR__ . '/../Views', 'installer'); diff --git a/beike/Installer/config.php b/beike/Installer/config.php index 5ab7f3f5..ac8cd06d 100644 --- a/beike/Installer/config.php +++ b/beike/Installer/config.php @@ -67,12 +67,6 @@ return [ 'database_name' => 'required|string|max:50', 'database_username' => 'required|string|max:50', 'database_password' => 'nullable|string|max:50', - 'mail_driver' => 'required|string|max:50', - 'mail_host' => 'required|string|max:50', - 'mail_port' => 'required|string|max:50', - 'mail_username' => 'required|string|max:50', - 'mail_password' => 'required|string|max:50', - 'mail_encryption' => 'required|string|max:50', ], ], ],