Skip to content

M
media-resource
Commit 4d45aba4 by 杨昕
Options

媒资更新

parent 8b8994b7
Pipeline #10102 passed with stages
in 38 seconds
Showing with 15 additions and 21 deletions
app/Http/Controllers/Api/Client/MediaController.php
...@@ -121,19 +121,13 @@ class MediaController extends Controller ...@@ -121,19 +121,13 @@ class MediaController extends Controller
SrsHookValidate::srsHookCallback($request,[ SrsHookValidate::srsHookCallback($request,[
'media_name' => 'required', 'media_name' => 'required',
'media_type' => 'required', 'media_type' => 'required',
'media_id' => 'required', // 'media_id' => 'required',
'access_key' => '', 'access_key' => '',
'secret_key' => '', 'secret_key' => '',
'media_url' => 'required', 'media_url' => 'required',
'description' => '', 'description' => '',
'start_time' => 'required|date', // 'start_time' => 'required|date',
'end_time' => 'required|date|after_or_equal:start_time', // 'end_time' => 'required|date|after_or_equal:start_time',
],null,[
'start_time.date' => '开始时间格式错误',
'start_time.required'=> '开始时间不能为空',
'end_time.required' => '结束时间不能为空',
'end_time.date' => '结束时间格式错误',
'end_time.after_or_equal' => '结束时间不能小于开始时间'
]); ]);
MediaModel::updatehookMedia($request,$id); MediaModel::updatehookMedia($request,$id);
......
app/Model/MediaModel.php
...@@ -225,36 +225,36 @@ class MediaModel extends Eloquent ...@@ -225,36 +225,36 @@ class MediaModel extends Eloquent
if (count($media_info)>=2){ if (count($media_info)>=2){
$data = [ $data = [
'_id' => $id, // '_id' => $id,
'media_name' => $request->media_name, 'media_name' => $request->media_name,
'media_type' => $mediaCatg['name'], 'media_type' => $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'], 'media_type_id' => $mediaCatg['_id'],
'book_num' => $media_info[0], 'book_num' => $media_info[0],
'book_name' => $media_info[1], 'book_name' => $media_info[1],
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, // 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, // 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()), // 'create_time' => $media['create_time'],
'description' => $request->description, 'description' => $request->description,
'start_time' => $request->start_time??'', // 'start_time' => $request->start_time??'',
'end_time' => $request->end_time??'', // 'end_time' => $request->end_time??'',
]; ];
}else{ }else{
$data = [ $data = [
'_id' => $id, // '_id' => $id,
'media_name' => $request->media_name, 'media_name' => $request->media_name,
'media_type' => $mediaCatg['name'], 'media_type' => $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'], 'media_type_id' => $mediaCatg['_id'],
'book_num' => '', 'book_num' => '',
'book_name' => $request->media_name, 'book_name' => $request->media_name,
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, // 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, // 'secret_key' => $request->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??'',
'end_time' => $request->end_time??'', // 'end_time' => $request->end_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