Skip to content

M
media-resource
Commit 9302d19e by 杨昕
Options

code format

parent 1b238972
Pipeline #11377 passed with stages
in 43 seconds
Showing with 10 additions and 7 deletions
app/Model/MediaModel.php
...@@ -216,7 +216,7 @@ class MediaModel extends Eloquent ...@@ -216,7 +216,7 @@ class MediaModel extends Eloquent
* 构造开始时间，结束时间 * 构造开始时间，结束时间
*/ */
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000); $start_time = new UTCDateTime(strtotime($request->start_time) * 1000);
$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;
...@@ -313,6 +313,9 @@ class MediaModel extends Eloquent ...@@ -313,6 +313,9 @@ class MediaModel extends Eloquent
throw new \Exception("媒资类别不存在"); throw new \Exception("媒资类别不存在");
} }
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000);
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);
/** /**
* 处理文件名称，确认是否包含"&"符合 * 处理文件名称，确认是否包含"&"符合
*/ */
...@@ -327,11 +330,11 @@ class MediaModel extends Eloquent ...@@ -327,11 +330,11 @@ class MediaModel extends Eloquent
'book_name' => $media_info[1], 'book_name' => $media_info[1],
'media_url' => $request->media_url?$request->media_url:$media_info['media_url'], 'media_url' => $request->media_url?$request->media_url:$media_info['media_url'],
// 'access_key' => $request->access_key, // 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key?$request->secret_key:$media_info['secret_key'],
// 'create_time' => $media['create_time'], // 'create_time' => $media['create_time'],
'description' => $request->description, 'description' => $request->description,
// 'start_time' => $request->start_time??'', 'start_time' => $request->start_time?$start_time:$media['start_time'],
// 'end_time' => $request->end_time??'', 'end_time' => $request->end_time?$end_time:$media['start_time'],
]; ];
}else{ }else{
...@@ -344,11 +347,11 @@ class MediaModel extends Eloquent ...@@ -344,11 +347,11 @@ class MediaModel extends Eloquent
'book_name' => $request->media_name, 'book_name' => $request->media_name,
'media_url' => $request->media_url?$request->media_url:$media_info['media_url'], 'media_url' => $request->media_url?$request->media_url:$media_info['media_url'],
// 'access_key' => $request->access_key, // 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key?$request->secret_key:$media_info['secret_key'],
// 'create_time' => date('Y-m-d H:i:s',time()), // 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description, 'description' => $request->description,
// 'start_time' => $request->start_time??'', 'start_time' => $request->start_time?$start_time:$media['start_time'],
// 'end_time' => $request->end_time??'', 'end_time' => $request->end_time?$end_time:$media['start_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