Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-manage into 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,16 @@ return [
         // Stages configurations
         'stages'      => [],
         // Connections configuration
-        'connections' => [],
+        'connections' => [
+            'production'    => [
+                'remote'    => [
+                    'root_directory'    => '/data/wwwroot/uptoyo/api'
+                ],
+                'scm'   => [
+                    'branch'    => 'release'
+                ]
+            ]
+        ],
 
     ],
 

app/Repositories/Post/PostRepository.php

@@ -620,7 +620,7 @@ class PostRepository
         if(!$title){
             $title = subtext(strip_tags($post->content), 20);
         }
-        $content = "经核实您的内容“{$title}”涉及违规，现已被删除，有任何问题请联系彩虹管理员";
+        $content = "经核实您的内容“{$title}”涉及违规，现已被删除，有任何问题请联系由你管理员";
 
         $date = Carbon::now()->toDateTimeString();
         DB::beginTransaction();