Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/shop-service into develop

app/Http/Controllers/V1/ShopController.php

@@ -29,7 +29,7 @@ class ShopController extends Controller {
         }
         $res['data']  = Shop::where('shop_id',$data['id'])->first();
         if($res){
-            return $this->jsonSuccess(['data'=>$res]);
+            return $this->jsonSuccess($res);
         }else{
             return $this->jsonError('获取失败');
         }

config/customer.php

@@ -1,5 +1,6 @@
 <?php
 //此文件为apollo配置文件模板，禁止修改移动
 return [
-    'app_secret' => 'aaaaaaaaaaa'
+    'app_secret' => 'aaaaaaaaaaa',
+    'app_service_url' =>'https://api.dev.caihongxingqiu.com'
 ];

routes/api.php

@@ -22,13 +22,14 @@ $api->version('v1', [
     $api->group(['middleware' => 'auth:api'], function ($api) {
 
     });
+    $api->post('view', 'ShopController@getShop');
     //获取商户列表
     $api->post('getShopList', 'ShopController@getShopList');
     //登录+验签
     $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
 
         //获取商户详情
-        $api->post('view', 'ShopController@getShop');
+
     });
     //仅验签
     $api->group(['middleware' => 'chxq_sign'], function ($api) {