wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed dberror

This commit is contained in:
Edward Yang 2022-09-06 22:14:42 +08:00
parent 51651ff787
commit f8eac18cc5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beike/Installer/Controllers/DatabaseController.php
View File

@ -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 = [

9
beike/Installer/Controllers/EnvironmentController.php
View File

@ -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,
],
]),