|
@@ -16,26 +16,22 @@ class ExceptionHandle extends Handle
|
|
|
public function render($request, Throwable $e): Response
|
|
|
{
|
|
|
// 调试模式
|
|
|
- if (env('app_debug')) {
|
|
|
- // Ajax请求返回JSON
|
|
|
- if ($request->isAjax()) {
|
|
|
- if ($e instanceof HttpResponseException) {
|
|
|
- return $e->getResponse();
|
|
|
- } elseif ($e instanceof HttpException) {
|
|
|
+ if ($request->isAjax()) {
|
|
|
+ if ($e instanceof HttpResponseException) {
|
|
|
+ return $e->getResponse();
|
|
|
+ } elseif ($e instanceof HttpException) {
|
|
|
+ if (env('app_debug')) {
|
|
|
return json(['code' => $e->getStatusCode(), 'msg' => $e->getMessage()], $e->getStatusCode());
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (env('app_debug')) {
|
|
|
return json(['code' => 500, 'msg' => $e->getMessage(), 'trace' => $e->getTrace()], 500);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 非Ajax请求默认处理
|
|
|
- return parent::render($request, $e);
|
|
|
- } else {
|
|
|
- if ($request->isAjax()) {
|
|
|
- return json(['code' => 500, 'msg' => '服务器升级中,请稍后重试~~'], 500);
|
|
|
- } else {
|
|
|
- return parent::render($request, $e);
|
|
|
- }
|
|
|
+ return json(['code' => 500, 'msg' => '服务器升级中,请稍后重试~~'], 500);
|
|
|
}
|
|
|
+
|
|
|
+ return parent::render($request, $e);
|
|
|
}
|
|
|
}
|