改进安装程序

This commit is contained in:
Wisp X
2022-03-05 23:41:47 +08:00
parent a2daf5a404
commit 0a8bfe6bf1
+3 -4
View File
@@ -80,7 +80,9 @@ class Controller extends BaseController
$data = collect($request->except('account'))->transform(fn($item, $key) => ['--'.$key => $item])->collapse();
$stream = fopen('php://output', 'w');
$exitCode = Artisan::call('lsky:install', $data->toArray(), new StreamOutput($stream));
$response = str_replace(PHP_EOL, '<br/>', ob_get_clean());
if (! $exitCode) {
throw new \Exception(str_replace(PHP_EOL, '<br/>', ob_get_clean()));
}
$user = new User([
'name' => '超级管理员',
'email' => $request->input('account.email'),
@@ -104,9 +106,6 @@ class Controller extends BaseController
]);
return $this->error($e->getMessage());
}
if (! $exitCode) {
return $this->error('安装失败', compact('response'));
}
return $this->success();
}