Merge branch 'test' into 'master'

Test

See merge request !27

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

@@ -15,13 +15,13 @@ class MediaController extends Controller
 {
     private $bucketList = [
         'develop'  => 'dev-offcncloud',
-        'test'     => 'test-offcncloud',
+        'test'     => 'test-offcncloud-test',
         'master'   => 'test-offcncloud',
     ];
 
     protected $domain = [
         'develop'   => 'qcoenfz67.bkt.clouddn.com',
-        'test'      => 'vod-mam.eoffcn.com',
+        'test'      => 'test-vod-mam.offcncloud.com',
         'master'    => 'vod-mam.eoffcn.com'
     ];
 

app/Http/Controllers/Api/MediaController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Exceptions\FormException;
+use App\Model\LogModel;
 use App\Model\MediaModel;
 use App\Model\QiniuModel;
 use App\Tool\Constant;
@@ -250,7 +251,7 @@ class MediaController extends Controller
 
             $request->replace(array_merge($request->all(),$params));
 
-
+            LogModel::addlog(['media_id'=>$media_id,"更新媒资状态"=>json_encode($request->all())]);
             $id = MediaModel::updateMediaStatus($request,$media_id);
 
             return $id;

app/Model/MediaModel.php

@@ -507,7 +507,7 @@ class MediaModel extends Eloquent
 
         try{
 
-            $media = MediaModel::select('media_url','secret_key','duration')->find($media_id);
+            $media = MediaModel::select('media_url','secret_key','duration','media_name','status')->find($media_id);
 
             if (empty($media)){
                 throw new \Exception("媒资不存在");
@@ -661,7 +661,6 @@ class MediaModel extends Eloquent
 
             }
 
-            $data['status'] = $request->status??"";
 
             if ($request->status){
 
@@ -671,9 +670,12 @@ class MediaModel extends Eloquent
                     'duration'      => $request->duration??"0",
                     'access_key'    => $request->access_key??"",
                     'secret_key'    => $request->secret_key??"",
-                    'status'        => $request->status
+                    'status'        => $request->status??''
                 ];
+
                 LogModel::addlog(["原media信息为"=>json_encode($media),"更新为"=>json_encode($data)]);
+            }else{
+                $data['status'] = "0";
             }