From dc16ece325dab820eba39bf448fef295bb863d68 Mon Sep 17 00:00:00 2001 From: TL Date: Fri, 26 Aug 2022 14:37:43 +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=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Installer/Controllers/DatabaseController.php | 11 +++++++++++ beike/Installer/Controllers/EnvironmentController.php | 2 +- beike/Installer/config.php | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php index 022b9b11..5ada26ba 100644 --- a/beike/Installer/Controllers/DatabaseController.php +++ b/beike/Installer/Controllers/DatabaseController.php @@ -2,6 +2,7 @@ namespace Beike\Installer\Controllers; +use Beike\Admin\Repositories\AdminUserRepo; use Illuminate\Routing\Controller; use Beike\Installer\Helpers\DatabaseManager; @@ -29,6 +30,16 @@ class DatabaseController extends Controller { $response = $this->databaseManager->migrateAndSeed(); + $email = request('admin_email'); + $data = [ + 'name' => substr($email, 0, strpos($email, '@')), + 'email' => $email, + 'password' => request('admin_password'), + 'locale' => 'en', + 'active' => true, + ]; + AdminUserRepo::createAdminUser($data); + return redirect()->route('installer.final') ->with(['message' => $response]); } diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php index 62ce287d..b104bf81 100644 --- a/beike/Installer/Controllers/EnvironmentController.php +++ b/beike/Installer/Controllers/EnvironmentController.php @@ -65,7 +65,7 @@ class EnvironmentController extends Controller $results = $this->EnvironmentManager->saveFileWizard($request); - return $redirect->route('installer.database') + return $redirect->route('installer.database')->withInput($request->only('admin_email', 'admin_password')) ->with(['results' => $results]); } diff --git a/beike/Installer/config.php b/beike/Installer/config.php index ac8cd06d..354255d8 100644 --- a/beike/Installer/config.php +++ b/beike/Installer/config.php @@ -67,6 +67,8 @@ return [ 'database_name' => 'required|string|max:50', 'database_username' => 'required|string|max:50', 'database_password' => 'nullable|string|max:50', + 'admin_email' => 'required|email:rfc,dns', + 'admin_password' => 'required|string|max:50', ], ], ],