ajax请求显示详细信息

Author: edenleung

composer.json

@@ -30,7 +30,7 @@
                 "think\\Whoops\\WhoopsService"
             ],
             "config": {
-                "whoops": "src/Config/config.php"
+                "whoops": "config/config.php"
             }
         }
     }

src/Config/config.php config/config.phpsrc/Config/config.php renamed to config/config.php

@@ -4,48 +4,65 @@
 
 namespace think\Whoops\Hander;
 
-use think\App;
-use think\exception\Handle;
-use think\exception\HttpResponseException;
 use think\Response;
-use think\Whoops\Runner;
+use think\exception\Handle;
 use Throwable;
-use Whoops\Handler\JsonResponseHandler;
 use Whoops\Handler\PrettyPageHandler;
+use think\exception\HttpResponseException;
 
 class Whoops extends Handle
 {
-    private $runner;
-
-    public function __construct(App $app, Runner $runner)
-    {
-        parent::__construct($app);
-        $this->runner = $runner;
-    }
-
     public function render($request, Throwable $e): Response
     {
         // Whoops 接管请求异常
-        if (config('whoops.enable') && $this->app->isDebug()) {
+        if (config('whoops.enable')) {
             if ($e instanceof HttpResponseException) {
                 return $e->getResponse();
             }
 
-            $this->runner->pushHandler(new PrettyPageHandler());
-
             // 兼容 Cors Postman 请求
-            if ($request->isAjax() ||
-                false !== strpos($_SERVER['HTTP_USER_AGENT'], 'Postman') ||
-                (isset($_SERVER['HTTP_SEC_FETCH_MODE']) && $_SERVER['HTTP_SEC_FETCH_MODE'] === 'cors')) {
-                $this->runner->pushHandler(new JsonResponseHandler());
+            if ($request->isAjax() || false !== strpos($_SERVER['HTTP_USER_AGENT'], 'Postman') || (isset($_SERVER['HTTP_SEC_FETCH_MODE']) && $_SERVER['HTTP_SEC_FETCH_MODE'] === 'cors')) {
+                return $this->handleAjaxException($e);
+            } else {
+                $this->app->whoops->pushHandler(new PrettyPageHandler());
+                $this->app->whoops->register();
+                $this->app->whoops->handleException($e);
             }
-
-            $this->runner->register();
-
-            $this->runner->handleException($e);
         }
 
         // 其他错误交给系统处理
         return parent::render($request, $e);
     }
+
+    /**
+     * 接管Ajax异常
+     *
+     * @param Throwable $e
+     * @return void
+     */
+    protected function handleAjaxException(Throwable $e)
+    {
+        $data = [
+            'name'    => get_class($e),
+            'file'    => $e->getFile(),
+            'line'    => $e->getLine(),
+            'message' => $this->getMessage($e),
+            'trace'   => $e->getTrace(),
+            'code'    => $this->getCode($e),
+            'source'  => $this->getSourceCode($e),
+            'datas'   => $this->getExtendData($e),
+            'tables'  => [
+                'GET Data'              => $this->app->request->get(),
+                'POST Data'             => $this->app->request->post(),
+                'Files'                 => $this->app->request->file(),
+                'Cookies'               => $this->app->request->cookie(),
+                'Session'               => $this->app->session->all(),
+                'Server/Request Data'   => $this->app->request->server(),
+                'Environment Variables' => $this->app->request->env(),
+                'ThinkPHP Constants'    => $this->getConst(),
+            ],
+        ];
+
+        return Response::create($data, 'json', $e->getCode());
+    }
 }

src/Hander/Whoops.php

@@ -11,6 +11,7 @@ class WhoopsService extends Service
 {
     public function register()
     {
+        $this->app->bind('whoops', Runner::class);
         $this->app->bind('think\exception\Handle', Whoops::class);
     }
 }