Merge branch 'test' into 'master'

Test

See merge request !21

app/Exceptions/Handler.php

@@ -56,10 +56,6 @@ class Handler extends ExceptionHandler
 
         $path = $request->path();
 
-//        var_dump($exception->getMessage());
-//        var_dump($exception->getFile());
-//        var_dump($exception->getLine());
-
 
         #检测当前请求是否是api路由
         if (stripos($path,'api/') === 0

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

@@ -90,6 +90,7 @@ class MediaController extends Controller
                 'description' => '',
                 'start_time'  => 'required|date',
                 'end_time'    => 'required|date|after_or_equal:start_time',
+                'duration'    => '',
             ],config('app.client_request_parameters')),null,[
                 'start_time.date'    => '开始时间格式错误',
                 'start_time.required'=> '开始时间不能为空',

app/Http/Controllers/Api/MediaController.php

@@ -113,12 +113,6 @@ class MediaController extends Controller
      */
     public function hookRestoreMedia(Request $request){
 
-
-
-
-
-
-
         $id = handler_drive(function () use ($request) {
 
             SrsHookValidate::srsHookCallback($request,array_merge([
@@ -126,6 +120,7 @@ class MediaController extends Controller
                 'secret_key'  => '',
                 'media_url'   => 'required',
                 'description' => '',
+                'duration'    => '',
             ]));
 
             $data_time = Carbon::now();
@@ -138,7 +133,6 @@ class MediaController extends Controller
                 'end_time'  => $data_time,
                 'access_key'=> '',
                 'description'=>'网校',
-                'create_time'=> $data_time,
             );
 
             $request->replace(array_merge($request->all(),$params));

app/Model/MediaModel.php

@@ -62,6 +62,8 @@ class MediaModel extends Eloquent
                     $aggregate[]['$match']['_id'] = $request->media_id;
                 }
 
+//                $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
+
                 if (isset($request->media_name) && !empty($request->media_name)){
                     $aggregate[]['$match']['media_name'] = ['$regex' => addslashes($request->media_name) ];
                 }
@@ -112,18 +114,19 @@ class MediaModel extends Eloquent
                 /**
                  * 将mongoDate 转化为普通时间
                  */
-//                foreach ($tmp_arr as $media){
-//                    if (is_object($media['start_time'])){
-//                        $media['start_time'] = Carbon::parse(strtotime($media['start_time']))->toDateTimeString();
-//                    }
-//
-//                    if (is_object($media['end_time'])){
-//                        $media['end_time'] = Carbon::parse(strtotime($media['end_time']))->toDateTimeString();
-//                    }
-//                    if (is_object($media['create_time'])){
-//                        $media['create_time'] = Carbon::parse(strtotime($media['create_time']))->toDateTimeString();
-//                    }
-//                }
+                foreach ($tmp_arr as $media){
+
+                    if (is_object($media['start_time'])){
+                        $media['start_time'] = $media['start_time']->toDateTime()->format('Y-m-d H:i:s');
+                    }
+
+                    if (is_object($media['end_time'])){
+                        $media['end_time'] = $media['end_time']->toDateTime()->format('Y-m-d H:i:s');
+                    }
+                    if (is_object($media['create_time'])){
+                        $media['create_time'] = $media['create_time']->toDateTime()->format('Y-m-d H:i:s');
+                    }
+                }
 
 
                 return new LengthAwarePaginator($tmp_arr, $count, $limit, $page,[
@@ -138,6 +141,7 @@ class MediaModel extends Eloquent
             throw new DatabaseException($exception->getMessage());
         }
 
+
         return $medias;
     }
 
@@ -187,9 +191,9 @@ class MediaModel extends Eloquent
             $end_time =  new UTCDateTime(strtotime($request->end_time) * 1000);;
             $create_time = new UTCDateTime(time() * 1000);;
 
-            $start_time = $request->start_time;
-            $end_time = $request->end_time;
-            $create_time = date('Y-m-d H:i:s',time());
+//            $start_time = $request->start_time;
+//            $end_time = $request->end_time;
+//            $create_time = date('Y-m-d H:i:s',time());
 
 
             /**
@@ -455,7 +459,7 @@ class MediaModel extends Eloquent
 
         try{
 
-            $media = MediaModel::select('media_url','secret_key')->find($media_id);
+            $media = MediaModel::select('media_url','secret_key','duration')->find($media_id);
 
             if (empty($media)){
                 throw new \Exception("媒资不存在");

routes/api.php

@@ -45,6 +45,9 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user'], function () {
     Route::post('hook_restore', 'MediaController@hookRestoreMedia');
 
     Route::post('update_status/{id}', 'MediaController@updateMediaStatus');
+    Route::get('update_datetime', 'MediaController@updateDatetime');
+
+
 
     //Route::get("media_url_change","MediaController@handleMediaUrl");