update

Author: jasonencode

README.md

@@ -31,7 +31,7 @@ class Handler extends ExceptionHandler
     use ApiException;
 }
 ```
-> 客户端访问的时候，注意要在头信息中增加 Accept: application/json 或 Accept: application/vnd.api+json，这样返回错误信息的时候才是JSON格式
+
 ## 4.身份认证
 
 修改User模型

src/Api/ApiServiceProvider.php

@@ -21,6 +21,7 @@ class ApiServiceProvider extends ServiceProvider
      * @var array
      */
     protected $routeMiddleware = [
+        'api.accept'   => Middleware\AcceptHeader::class,
         'token.auth'   => Middleware\TokenAuthRefresh::class,
         'token.guess'  => Middleware\TokenGuess::class,
         'client.check' => Middleware\ClientCheck::class,
@@ -42,7 +43,12 @@ public function boot()
         }
 
         if (file_exists($routes = $this->getRouteFile())) {
-            $this->loadRoutesFrom($routes);
+            Route::as(config('api.route.as'))
+                 ->domain(config('api.route.domain'))
+                 ->middleware(config('api.route.middleware'))
+                 ->namespace(config('api.route.namespace'))
+                 ->prefix(config('api.route.prefix'))
+                 ->group($routes);
         }
     }
 

src/Api/Console/stubs/routes.stub

@@ -1,14 +1,18 @@
 <?php
 
 use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Route;
 
 Route::group([
-    'domain'     => config('api.route.domain'),
-    'prefix'     => config('api.route.prefix'),
-    'namespace'  => config('api.route.namespace'),
-    'middleware' => config('api.route.middleware'),
+//    'as'         => '',
+//    'domain'     => '',
+//    'prefix'     => '',
+//    'namespace'  => '',
+//    'middleware' => '',
 ], function (Router $router) {
-
     $router->get('/', 'IndexController@index');
-
 });
+
+// foreach (glob(app_path('Api/Routes') . '/*.php') as $routeFile) {
+//     require $routeFile;
+// }

src/config/api.php

@@ -12,29 +12,33 @@
 
     'route'     => [
         /**
-         * 可配置接口独立域名
+         * API 路由命名前缀
          */
-        'domain'          => env('API_ROUTE_DOMAIN', ''),
+        'as'               => 'api.',
         /**
-         * 不实用独立域名，接口地址前缀
+         * 可配置 API 独立域名
          */
-        'prefix'          => env('API_ROUTE_PREFIX', 'api'),
+        'domain'           => env('API_ROUTE_DOMAIN', ''),
         /**
-         * 接口控制器命名空间
+         * 不使用用独立域名，API 地址前缀
          */
-        'namespace'       => 'App\\Api\\Controllers',
+        'prefix'           => env('API_ROUTE_PREFIX', 'api'),
+        /**
+         * API 控制器命名空间
+         */
+        'namespace'        => 'App\\Api\\Controllers',
         /**
          * 中间件
          */
-        'middleware'      => ['api'],
+        'middleware'       => ['api', 'api.accept'],
         /**
          * 身份认证的中间件
          */
-        'middleware_auth' => ['api', 'token.auth'],
+        'middleware_auth'  => ['api', 'api.accept', 'token.auth'],
         /**
          * 获取token，获取不到也不报错的中间件
          */
-        'middleware_guess' => ['api', 'token.guess'],
+        'middleware_guess' => ['api', 'api.accept', 'token.guess'],
     ],
 
     /**