From 0a8bfe6bf13870f1de2e40089a0c6fb520e49fa2 Mon Sep 17 00:00:00 2001 From: Wisp X Date: Sat, 5 Mar 2022 23:41:47 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=B9=E8=BF=9B=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Controller.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b52850e7..ebe0ca82 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -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, '
', ob_get_clean()); + if (! $exitCode) { + throw new \Exception(str_replace(PHP_EOL, '
', 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(); }