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.121.231:2345',
+            'username'  => 'root',
+            'password'  => '',
+            'key'       => '/root/.ssh/id_rsa',
+            'keyphrase' => '',
+            'agent'     => '',
+            'db_role'   => true,
+        ],
     ],
 
     /*
@@ -77,7 +86,13 @@ return [
         // Stages configurations
         'stages'      => [],
         // Connections configuration
-        'connections' => [],
+        'connections' => [
+            'production'    => [
+                'remote'    => [
+                    'root_directory'    => '/data/wwwroot/uptoyo/api'
+                ]
+            ]
+        ],
 
     ],
 

config/menu.php

@@ -2,7 +2,7 @@
 /**
  * Created by PhpStorm.
  * User: Administrator
- * Date: 2019-05-16
+ * Date: 2019-07-10
  * Time: 11:22
  */
 return [
@@ -24,6 +24,14 @@ return [
                 'name' => 'product',
                 'title' => '商品',
                 'children' => [
+                    [
+                        'name' =>'product-exchangeProduct',
+                        'title' => '兑换商品',
+                    ],
+                    [
+                        'name' =>'product-exchangeCode',
+                        'title' => '兑换码',
+                    ],
                     [
                         'name' => 'product-product',
                         'title' => '商品管理',