Commit efa4ae88 by 杨昕

修改页面显示时间

parent 08015594
Pipeline #10611 passed with stages
in 42 seconds
...@@ -56,10 +56,6 @@ class Handler extends ExceptionHandler ...@@ -56,10 +56,6 @@ class Handler extends ExceptionHandler
$path = $request->path(); $path = $request->path();
// var_dump($exception->getMessage());
// var_dump($exception->getFile());
// var_dump($exception->getLine());
#检测当前请求是否是api路由 #检测当前请求是否是api路由
if (stripos($path,'api/') === 0 if (stripos($path,'api/') === 0
......
...@@ -113,12 +113,6 @@ class MediaController extends Controller ...@@ -113,12 +113,6 @@ class MediaController extends Controller
*/ */
public function hookRestoreMedia(Request $request){ public function hookRestoreMedia(Request $request){
$id = handler_drive(function () use ($request) { $id = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,array_merge([ SrsHookValidate::srsHookCallback($request,array_merge([
...@@ -138,7 +132,6 @@ class MediaController extends Controller ...@@ -138,7 +132,6 @@ class MediaController extends Controller
'end_time' => $data_time, 'end_time' => $data_time,
'access_key'=> '', 'access_key'=> '',
'description'=>'网校', 'description'=>'网校',
'create_time'=> $data_time,
); );
$request->replace(array_merge($request->all(),$params)); $request->replace(array_merge($request->all(),$params));
......
...@@ -62,6 +62,8 @@ class MediaModel extends Eloquent ...@@ -62,6 +62,8 @@ class MediaModel extends Eloquent
$aggregate[]['$match']['_id'] = $request->media_id; $aggregate[]['$match']['_id'] = $request->media_id;
} }
// $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
if (isset($request->media_name) && !empty($request->media_name)){ if (isset($request->media_name) && !empty($request->media_name)){
$aggregate[]['$match']['media_name'] = ['$regex' => addslashes($request->media_name) ]; $aggregate[]['$match']['media_name'] = ['$regex' => addslashes($request->media_name) ];
} }
...@@ -112,18 +114,19 @@ class MediaModel extends Eloquent ...@@ -112,18 +114,19 @@ class MediaModel extends Eloquent
/** /**
* 将mongoDate 转化为普通时间 * 将mongoDate 转化为普通时间
*/ */
// foreach ($tmp_arr as $media){ 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['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'] = Carbon::parse(strtotime($media['end_time']))->toDateTimeString(); 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'] = Carbon::parse(strtotime($media['create_time']))->toDateTimeString(); 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,[ return new LengthAwarePaginator($tmp_arr, $count, $limit, $page,[
...@@ -138,6 +141,7 @@ class MediaModel extends Eloquent ...@@ -138,6 +141,7 @@ class MediaModel extends Eloquent
throw new DatabaseException($exception->getMessage()); throw new DatabaseException($exception->getMessage());
} }
return $medias; return $medias;
} }
...@@ -187,9 +191,9 @@ class MediaModel extends Eloquent ...@@ -187,9 +191,9 @@ class MediaModel extends Eloquent
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);; $end_time = new UTCDateTime(strtotime($request->end_time) * 1000);;
$create_time = new UTCDateTime(time() * 1000);; $create_time = new UTCDateTime(time() * 1000);;
$start_time = $request->start_time; // $start_time = $request->start_time;
$end_time = $request->end_time; // $end_time = $request->end_time;
$create_time = date('Y-m-d H:i:s',time()); // $create_time = date('Y-m-d H:i:s',time());
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment