Merge branch 'develop'

.rocketeer/config.php

@@ -30,14 +30,14 @@ return [
     ////////////////////////////////////////////////////////////////////
 
     // The default remote connection(s) to execute tasks on
-    'default'          => ['production'],
+    'default'          => ['beta'],
 
     // The various connections you defined
     // You can leave all of this empty or remove it entirely if you don't want
     // to track files with credentials : Rocketeer will prompt you for your credentials
     // and store them locally
     'connections'      => [
-        'production' => [
+        'beta' => [
             'host'      => '47.92.174.125:2345',
             'username'  => 'root',
             'password'  => '',
@@ -46,6 +46,15 @@ return [
             'agent'     => '',
             'db_role'   => true,
         ],
+        'production'    => [
+            'host'      => '47.92.30.243:2345',
+            'username'  => 'root',
+            'password'  => '',
+            'key'       => '/root/.ssh/id_rsa',
+            'keyphrase' => '',
+            'agent'     => '',
+            
+        ],
     ],
 
     /*
@@ -63,9 +72,9 @@ return [
     // to the stage or connection currently in use.
     // Per example :
     // 'stages' => array(
-    // 	'staging' => array(
-    // 		'scm' => array('branch' => 'staging'),
-    // 	),
+    //  'staging' => array(
+    //      'scm' => array('branch' => 'staging'),
+    //  ),
     //  'production' => array(
     //    'scm' => array('branch' => 'master'),
     //  ),
@@ -77,7 +86,16 @@ return [
         // Stages configurations
         'stages'      => [],
         // Connections configuration
-        'connections' => [],
+        'connections' => [
+            'production'    => [
+                'remote'    => [
+                    'root_directory'    => '/data/wwwroot/uptoyo/api'
+                ],
+                'scm'   => [
+                    'branch'    => 'release'
+                ]
+            ]
+        ],
 
     ],
 

routes/api.php

@@ -31,11 +31,12 @@ $api->version('v1', [
 
     });
     $api->group(['middleware' => 'chxq_jwt_auth'], function ($api) {
-        //兑换商城首页
-        $api->get('/template/exchange', 'CmsContentTemplateSetController@exchangeMall');
-        //获取左一右二/上一下三专题下的商品
-        $api->get('/subject/products', 'CmsContentTemplateSetController@getProducts');
+
     });
+    //兑换商城首页
+    $api->get('/template/exchange', 'CmsContentTemplateSetController@exchangeMall');
+    //获取左一右二/上一下三专题下的商品
+    $api->get('/subject/products', 'CmsContentTemplateSetController@getProducts');
 });
 
 $api->version('v1', [