diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 3ca4b345..90337928 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,8 +2,9 @@ namespace App\Exceptions; -use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Throwable; +use Illuminate\Foundation\Exceptions\RegisterErrorViewPaths; +use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; class Handler extends ExceptionHandler { @@ -38,4 +39,17 @@ class Handler extends ExceptionHandler // }); } + + + /** + * 自定义错误信息页面, 前台与后台不同 需要分开定义 + */ + protected function registerErrorViewPaths() + { + if (is_admin()) { + (new RegisterAdminErrorViewPaths())(); + } else { + (new RegisterErrorViewPaths())(); + } + } } diff --git a/app/Exceptions/RegisterAdminErrorViewPaths.php b/app/Exceptions/RegisterAdminErrorViewPaths.php new file mode 100644 index 00000000..3cfa6d56 --- /dev/null +++ b/app/Exceptions/RegisterAdminErrorViewPaths.php @@ -0,0 +1,23 @@ +map(function ($path) { + return "{$path}/errors"; + })->all()); + } + } +} diff --git a/resources/beike/admin/views/errors/401.blade.php b/resources/beike/admin/views/errors/401.blade.php new file mode 100644 index 00000000..5c586db9 --- /dev/null +++ b/resources/beike/admin/views/errors/401.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Unauthorized')) +@section('code', '401') +@section('message', __('Unauthorized')) diff --git a/resources/beike/admin/views/errors/403.blade.php b/resources/beike/admin/views/errors/403.blade.php new file mode 100644 index 00000000..f9b5be36 --- /dev/null +++ b/resources/beike/admin/views/errors/403.blade.php @@ -0,0 +1,6 @@ +@extends('errors::minimal') + +@section('title', __('Forbidden')) +@section('code', '403') +@section('message', __($exception->getMessage() ?: 'Forbidden')) +/resources/beike/admin/views/errors/403 diff --git a/resources/beike/admin/views/errors/404.blade.php b/resources/beike/admin/views/errors/404.blade.php new file mode 100644 index 00000000..7549540d --- /dev/null +++ b/resources/beike/admin/views/errors/404.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Not Found')) +@section('code', '404') +@section('message', __('Not Found')) diff --git a/resources/beike/admin/views/errors/419.blade.php b/resources/beike/admin/views/errors/419.blade.php new file mode 100644 index 00000000..c09216e2 --- /dev/null +++ b/resources/beike/admin/views/errors/419.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Page Expired')) +@section('code', '419') +@section('message', __('Page Expired')) diff --git a/resources/beike/admin/views/errors/429.blade.php b/resources/beike/admin/views/errors/429.blade.php new file mode 100644 index 00000000..f01b07b8 --- /dev/null +++ b/resources/beike/admin/views/errors/429.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Too Many Requests')) +@section('code', '429') +@section('message', __('Too Many Requests')) diff --git a/resources/beike/admin/views/errors/500.blade.php b/resources/beike/admin/views/errors/500.blade.php new file mode 100644 index 00000000..d9e95d9b --- /dev/null +++ b/resources/beike/admin/views/errors/500.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Server Error')) +@section('code', '500') +@section('message', __('Server Error')) diff --git a/resources/beike/admin/views/errors/503.blade.php b/resources/beike/admin/views/errors/503.blade.php new file mode 100644 index 00000000..c5a9dde1 --- /dev/null +++ b/resources/beike/admin/views/errors/503.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Service Unavailable')) +@section('code', '503') +@section('message', __('Service Unavailable')) diff --git a/resources/beike/admin/views/errors/layout.blade.php b/resources/beike/admin/views/errors/layout.blade.php new file mode 100644 index 00000000..019c2cde --- /dev/null +++ b/resources/beike/admin/views/errors/layout.blade.php @@ -0,0 +1,53 @@ + + + + + + + @yield('title') + + + + + +
+
+
+ @yield('message') +
+
+
+ + diff --git a/resources/beike/admin/views/errors/minimal.blade.php b/resources/beike/admin/views/errors/minimal.blade.php new file mode 100644 index 00000000..db69f254 --- /dev/null +++ b/resources/beike/admin/views/errors/minimal.blade.php @@ -0,0 +1,34 @@ + + + + + + + @yield('title') + + + + + + +
+
+
+
+ @yield('code') +
+ +
+ @yield('message') +
+
+
+
+ + diff --git a/themes/default/errors/401.blade.php b/themes/default/errors/401.blade.php new file mode 100644 index 00000000..5c586db9 --- /dev/null +++ b/themes/default/errors/401.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Unauthorized')) +@section('code', '401') +@section('message', __('Unauthorized')) diff --git a/themes/default/errors/403.blade.php b/themes/default/errors/403.blade.php new file mode 100644 index 00000000..a5506f01 --- /dev/null +++ b/themes/default/errors/403.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Forbidden')) +@section('code', '403') +@section('message', __($exception->getMessage() ?: 'Forbidden')) diff --git a/themes/default/errors/404.blade.php b/themes/default/errors/404.blade.php new file mode 100644 index 00000000..7549540d --- /dev/null +++ b/themes/default/errors/404.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Not Found')) +@section('code', '404') +@section('message', __('Not Found')) diff --git a/themes/default/errors/419.blade.php b/themes/default/errors/419.blade.php new file mode 100644 index 00000000..c09216e2 --- /dev/null +++ b/themes/default/errors/419.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Page Expired')) +@section('code', '419') +@section('message', __('Page Expired')) diff --git a/themes/default/errors/429.blade.php b/themes/default/errors/429.blade.php new file mode 100644 index 00000000..f01b07b8 --- /dev/null +++ b/themes/default/errors/429.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Too Many Requests')) +@section('code', '429') +@section('message', __('Too Many Requests')) diff --git a/themes/default/errors/500.blade.php b/themes/default/errors/500.blade.php new file mode 100644 index 00000000..cf679821 --- /dev/null +++ b/themes/default/errors/500.blade.php @@ -0,0 +1,6 @@ +@extends('errors::minimal') + +@section('title', __('Server Error')) +@section('code', '500') +@section('message', __('Server Error')) +/themes/default/errors/500 diff --git a/themes/default/errors/503.blade.php b/themes/default/errors/503.blade.php new file mode 100644 index 00000000..c5a9dde1 --- /dev/null +++ b/themes/default/errors/503.blade.php @@ -0,0 +1,5 @@ +@extends('errors::minimal') + +@section('title', __('Service Unavailable')) +@section('code', '503') +@section('message', __('Service Unavailable')) diff --git a/themes/default/errors/layout.blade.php b/themes/default/errors/layout.blade.php new file mode 100644 index 00000000..019c2cde --- /dev/null +++ b/themes/default/errors/layout.blade.php @@ -0,0 +1,53 @@ + + + + + + + @yield('title') + + + + + +
+
+
+ @yield('message') +
+
+
+ + diff --git a/themes/default/errors/minimal.blade.php b/themes/default/errors/minimal.blade.php new file mode 100644 index 00000000..db69f254 --- /dev/null +++ b/themes/default/errors/minimal.blade.php @@ -0,0 +1,34 @@ + + + + + + + @yield('title') + + + + + + +
+
+
+
+ @yield('code') +
+ +
+ @yield('message') +
+
+
+
+ +