Merge branch 'develop'

app/middleware/BasicData.php

@@ -12,9 +12,9 @@ class BasicData implements MiddlewareInterface
     public function process(Request $request, callable $handler): Response
     {
         $controller = new ReflectionClass($request->controller);
-        $noNeedHeader = $controller->getDefaultProperties()['noNeedHeader'] ?? [];
+        $noNeedHeaderData = $controller->getDefaultProperties()['noNeedHeaderData'] ?? [];
 
-        if (in_array($request->action, $noNeedHeader) || in_array($request->path(), config('whitelist.basi_cdata'))) {
+        if (in_array($request->action, $noNeedHeaderData)) {
             // 白名单
             return $handler($request);
         } else {
@@ -35,7 +35,13 @@ class BasicData implements MiddlewareInterface
                 }
                 return $handler($request);
             } catch (\Throwable $th) {
-                throw $th;
+                $body = [
+                    'status'  => 'fail',
+                    'code'    => 403,
+                    'message' => $th->getMessage(),
+                    'data'    => [],
+                ];
+                return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
             }
         }
     }