Merge branch 'stabble' of wd:wangdu/wangdu_public_api into stabble

app/Http/Routes/Common/CommonRoute.php

@@ -3,7 +3,7 @@
 /**
  * 公共接口路由
  */
-Route::group(['domain' => env('WECHAT_DOMAIN'), 'namespace' => 'App\Http\Controllers\Common'], function () {
+Route::group(['domain' => env('WECHAT_PUB_DOMAIN'), 'namespace' => 'App\Http\Controllers\Common'], function () {
     Route::group(['middleware' => 'ChargeFeedbackCheckSign'], function () {
         Route::any('chargeFeedback', 'ChargeFeedbackController@notify');
         Route::any('userBind', 'ChargeFeedbackController@userBind');

app/Providers/RouteServiceProvider.php

@@ -37,18 +37,18 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map(Router $router)
     {
-//         $this->mapFinanceRoutes($router);
-//         $this->mapBookRoutes($router);
-//         $this->mapUserRoutes($router);
-//         $this->mapSendOrderRoutes($router);
-//         $this->mapBadInfoRoutes($router);//敏感词
-//         $this->mapTradeRoutes($router);
+        //         $this->mapFinanceRoutes($router);
+        //         $this->mapBookRoutes($router);
+        //         $this->mapUserRoutes($router);
+        //         $this->mapSendOrderRoutes($router);
+        //         $this->mapBadInfoRoutes($router);//敏感词
+        //         $this->mapTradeRoutes($router);
         $this->mapOfficialAccountRoutes($router);
 
-//         $this->mapChannelOfficialAccountRoutes($router);
-//         $this->mapUserAndUserOrderRoutes($router);
-//         $this->mapWebRoutes($router);
-
+        //         $this->mapChannelOfficialAccountRoutes($router);
+        //         $this->mapUserAndUserOrderRoutes($router);
+        //         $this->mapWebRoutes($router);
+        $this->mapCommonRoutes($router);
     }
 
 
@@ -113,12 +113,12 @@ class RouteServiceProvider extends ServiceProvider
 
     protected function mapOfficialAccountRoutes(Router $router)
     {
-//         $router->group([
-//             'middleware' => 'web',
-//         ], function ($router) {
-//             require app_path('Http/Routes/Wap/OfficialAccountRoutes.php');
-//             require app_path('Http/Routes/Manage/OfficialAccountRoutes.php');
-//         });
+        //         $router->group([
+        //             'middleware' => 'web',
+        //         ], function ($router) {
+        //             require app_path('Http/Routes/Wap/OfficialAccountRoutes.php');
+        //             require app_path('Http/Routes/Manage/OfficialAccountRoutes.php');
+        //         });
         $router->group([
             'middleware' => 'wap',
         ], function ($router) {
@@ -171,18 +171,17 @@ class RouteServiceProvider extends ServiceProvider
 
             require app_path('Http/Routes/Channel/UserRoutes.php');
             require app_path('Http/Routes/Channel/OrderRoutes.php');
-
         });
     }
 
     //分销支付宝路由
     public function mapAliRoutes(Router $router)
     {
-    	$router->group([
-    			'middleware' => 'web',
-    			], function ($router) {
-    		require app_path('Http/Routes/Channel/AliRoutes.php');
-    	});
+        $router->group([
+            'middleware' => 'web',
+        ], function ($router) {
+            require app_path('Http/Routes/Channel/AliRoutes.php');
+        });
     }
     //分销小程序路由
     public function mapXcxRoutes(Router $router)
@@ -224,7 +223,16 @@ class RouteServiceProvider extends ServiceProvider
             require app_path('Http/Routes/Taowj/TaowjRoutes.php');
         });
     }
-
-
-
+    /**
+     * 公共接口
+     */
+    public function mapCommonRoutes(Router $router)
+    {
+        $router->group([
+            'middleware' => 'api',
+            'prefix' => 'api',
+        ], function ($router) {
+            require app_path('Http/Routes/Common/CommonRoute.php');
+        });
+    }
 }

config/error.php

@@ -2,6 +2,7 @@
 
 return [
 
+        'SIGN_ERROR'=>['code'=>10005,'msg'=>'签名有误'],
 
         'NOT_EXIST'=>['code'=>1001,'msg'=>'记录不存在'],
         'PARAM_EMPTY'=>['code'=>1002,'msg'=>'参数不能为空'],