Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Exceptions/Handler.php

@@ -47,9 +47,8 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $exception)
     {
-        return parent::render($request, $exception);
         //如果路由中含有“api/”，则说明是一个 api 的接口请求
-        if ($request->is("api/*")) {
+        if ($request->is("api/v*")) {
             //如果错误是 ValidationException的一个实例，说明是一个验证的错误
             if ($exception instanceof ValidationException) {
                 return out(null, 10000, array_values($exception->errors())[0][0]);
@@ -60,8 +59,10 @@ class Handler extends ExceptionHandler
                 $out = json_decode($msg, true);
                 return out($out['data'], $out['status'], $out['message']);
             }
+
+            return out(null, 500, $exception->getMessage());
         }
 
-        return out(null, 500, $exception->getMessage());
+        return parent::render($request, $exception);
     }
 }

app/Http/Controllers/Api/V1/VaccineController.php

@@ -18,7 +18,7 @@ class VaccineController extends AuthController
         $this->validate(request(), [
             'name' => 'max:50',
             'type' => 'in:0,1,2',
-            'sort_type' => 'in:1,2',
+            'sort_type' => 'in:0,1,2',
         ]);
 
         $builder = Vaccine::select(['id', 'type', 'price', 'name', 'remark', 'supplier']);