heibai2006/webman_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

$this->_debug => $this->debug

Browse Source
This commit is contained in:
walkor 2023-01-28 15:09:38 +08:00 committed by GitHub
parent 17bf447521
commit da879d3c68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugin/admin/app/exception/Handler.php
View File

@ -27,13 +27,14 @@ class Handler extends \support\exception\Handler
public function render(Request $request, Throwable $exception): Response public function render(Request $request, Throwable $exception): Response
{ {
$code = $exception->getCode(); $code = $exception->getCode();
$debug = $this->_debug ?? $this->debug;
if ($request->expectsJson()) { if ($request->expectsJson()) {
$json = ['code' => $code ? $code : 500, 'msg' => $this->_debug ? $exception->getMessage() : 'Server internal error', 'type' => 'failed']; $json = ['code' => $code ?: 500, 'msg' => $debug ? $exception->getMessage() : 'Server internal error', 'type' => 'failed'];
$this->_debug && $json['traces'] = (string)$exception; $debug && $json['traces'] = (string)$exception;
return new Response(200, ['Content-Type' => 'application/json'], return new Response(200, ['Content-Type' => 'application/json'],
\json_encode($json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); \json_encode($json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
} }
$error = $this->_debug ? \nl2br((string)$exception) : 'Server internal error'; $error = $debug ? \nl2br((string)$exception) : 'Server internal error';
return new Response(500, [], $error); return new Response(500, [], $error);
} }
} }