Commit 5f075b7e by 杨昕

兼容http

parent f91c4d5d
Pipeline #10085 passed with stages
in 38 seconds
...@@ -136,6 +136,10 @@ class MediaModel extends Eloquent ...@@ -136,6 +136,10 @@ class MediaModel extends Eloquent
throw new \Exception("媒资类别不存在"); throw new \Exception("媒资类别不存在");
} }
$media_url = $request->media_url;
$media_url = str_replace($media_url,"http:","https:".substr($media_url,5));
/** /**
* 处理文件名称,确认是否包含"&"符合 * 处理文件名称,确认是否包含"&"符合
*/ */
...@@ -148,7 +152,7 @@ class MediaModel extends Eloquent ...@@ -148,7 +152,7 @@ class MediaModel extends Eloquent
'media_type' => $mediaCatg['name'], 'media_type' => $mediaCatg['name'],
'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' => $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()),
...@@ -168,7 +172,7 @@ class MediaModel extends Eloquent ...@@ -168,7 +172,7 @@ class MediaModel extends Eloquent
'media_type'=> $mediaCatg['name'], 'media_type'=> $mediaCatg['name'],
'book_num' => '', 'book_num' => '',
'book_name' => $request->media_name, 'book_name' => $request->media_name,
'media_url' => $request->media_url, 'media_url' => $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()),
...@@ -412,7 +416,7 @@ class MediaModel extends Eloquent ...@@ -412,7 +416,7 @@ class MediaModel extends Eloquent
} }
if (isset($request->media_name) && !empty($request->media_name)){ if (isset($request->media_name) && !empty($request->media_name)){
$aggregate[]['$match']['media_url'] = ['$regex' => 'https://qcoenfz67.bkt.clouddn.com' ]; $aggregate[]['$match']['media_url'] = ['$regex' => 'http://qcoenfz67.bkt.clouddn.com' ];
} }
if (isset($request->username) && !empty($request->username)){ if (isset($request->username) && !empty($request->username)){
...@@ -440,6 +444,7 @@ class MediaModel extends Eloquent ...@@ -440,6 +444,7 @@ class MediaModel extends Eloquent
if (!empty($medias)){ if (!empty($medias)){
foreach ($medias as $media){ foreach ($medias as $media){
$data = [ $data = [
'media_url' => "https://vod-mam.eoffcn.com/".$media->_id.'/index.m3u8', 'media_url' => "https://vod-mam.eoffcn.com/".$media->_id.'/index.m3u8',
......
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