From f8eac18cc5a6a32df14f0d4e405d5e29465b8c62 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Tue, 6 Sep 2022 22:14:42 +0800 Subject: [PATCH] fixed dberror --- beike/Installer/Controllers/DatabaseController.php | 7 ++++++- beike/Installer/Controllers/EnvironmentController.php | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php index 67afbff4..ca18cf24 100644 --- a/beike/Installer/Controllers/DatabaseController.php +++ b/beike/Installer/Controllers/DatabaseController.php @@ -39,7 +39,12 @@ class DatabaseController extends Controller } DB::statement("SET FOREIGN_KEY_CHECKS = 1"); - $response = $this->databaseManager->migrateAndSeed(); + try { + $response = $this->databaseManager->migrateAndSeed(); + } catch (\Exception $e) { + $params = request()->all(); + return redirect()->route('installer.environment')->withInput($params)->withErrors(['error' => $e->getMessage()]); + } $email = request('admin_email'); $data = [ diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php index 39d15187..47c1beb1 100644 --- a/beike/Installer/Controllers/EnvironmentController.php +++ b/beike/Installer/Controllers/EnvironmentController.php @@ -64,12 +64,9 @@ class EnvironmentController extends Controller ]); } - $results = $this->EnvironmentManager->saveFileWizard($request); + $this->EnvironmentManager->saveFileWizard($request); - $params = [ - 'admin_email' => $request->get('admin_email'), - 'admin_password' => $request->get('admin_password'), - ]; + $params = $request->all(); return redirect(route('installer.database', $params)); } @@ -122,7 +119,7 @@ class EnvironmentController extends Controller 'database' => $request->input('database_name'), 'username' => $request->input('database_username'), 'password' => $request->input('database_password'), - 'options' => [ + 'options' => [ \PDO::ATTR_TIMEOUT => 1, ], ]),