diff --git a/app/ExceptionHandle.php b/app/ExceptionHandle.php
index e826589..ba360b2 100644
--- a/app/ExceptionHandle.php
+++ b/app/ExceptionHandle.php
@@ -2,6 +2,9 @@
namespace app;
use catcher\CatchResponse;
+use catcher\exceptions\FailedException;
+use catcher\exceptions\LoginFailedException;
+use catcher\exceptions\PermissionForbiddenException;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\Handle;
@@ -28,6 +31,12 @@ class ExceptionHandle extends Handle
ValidateException::class,
];
+ protected $catchExceptions = [
+ FailedException::class,
+ LoginFailedException::class,
+ ValidateException::class,
+ PermissionForbiddenException::class,
+ ];
/**
* 记录异常信息（包括日志或者其它方式记录）
*
@@ -45,16 +54,17 @@ class ExceptionHandle extends Handle
* Render an exception into an HTTP response.
*
* @access public
- * @param \think\Request $request
+ * @param \think\Request $request
* @param Throwable $e
* @return Response
+ * @throws \Exception
*/
public function render($request, Throwable $e): Response
{
- // 添加自定义异常处理机制
- if ($request->isAjax()) {
+ if (in_array(get_class($e), $this->catchExceptions)) {
return CatchResponse::fail($e->getMessage(), $e->getCode());
}
+
// 其他错误交给系统处理
return parent::render($request, $e);
}
diff --git a/app/Request.php b/app/Request.php
index df3670d..097ac2d 100644
--- a/app/Request.php
+++ b/app/Request.php
@@ -3,7 +3,12 @@ namespace app;
// 应用请求对象类
+use catchAdmin\user\Auth;
+
class Request extends \think\Request
{
-
+ public function user()
+ {
+ return Auth::user();
+ }
}
diff --git a/catchAdmin/index/view/dashboard.html b/catchAdmin/index/view/dashboard.html
new file mode 100644
index 0000000..566549b
--- /dev/null
+++ b/catchAdmin/index/view/dashboard.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Title
+
+
+
+
+
\ No newline at end of file
diff --git a/catchAdmin/index/view/error.html b/catchAdmin/index/view/error.html
new file mode 100644
index 0000000..7a7a87d
--- /dev/null
+++ b/catchAdmin/index/view/error.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+ 403
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
403
+
抱歉，你无权访问此页面
+
+
+
+
+