Merge branch 'master' into 'test'

# Conflicts:
#   app/Http/Controllers/Api/Client/MediaController.php

app/Http/Controllers/Api/Client/MediaController.php

@@ -21,7 +21,7 @@ class MediaController extends Controller
 
     protected $domain = [
         'develop'   => 'qcoenfz67.bkt.clouddn.com',
-        'test'      => 'test-vod-mam.eoffcn.com',
+        'test'      => 'vod-mam.eoffcn.com',
         'master'    => 'vod-mam.eoffcn.com'
     ];
 

config/database.php

@@ -85,11 +85,11 @@ return [
 
         'mongodb' => [
             'driver'   => 'mongodb',
-            'host'     => 'mongo.eoffcn.com',
-            'port'     => '28017',
+            'host'     => 'dds-2ze351589aaaf6841.mongodb.rds.aliyuncs.com',
+            'port'     => '3717',
             'database' => 'video_media',
             'username' => 'root',
-            'password' => 'FHHTH98AWAPoyweEasdfadfaaf',
+            'password' => 'wR*Mn^mLnh!eg^N*e0KDwLp0UrkD$K%Q',
             'options'  => [
                 'database' => 'admin', // sets the authentication database required by mongo 3
             ]