Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
5f075b7e
Commit
5f075b7e
authored
Jul 27, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兼容http
parent
f91c4d5d
Pipeline
#10085
passed with stages
in 38 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
MediaModel.php
app/Model/MediaModel.php
+8
-3
No files found.
app/Model/MediaModel.php
View file @
5f075b7e
...
...
@@ -136,6 +136,10 @@ class MediaModel extends Eloquent
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
'media_type'
=>
$mediaCatg
[
'name'
],
'book_num'
=>
$media_info
[
0
],
'book_name'
=>
$media_info
[
1
],
'media_url'
=>
$
request
->
media_url
,
'media_url'
=>
$media_url
,
'access_key'
=>
$request
->
access_key
,
'secret_key'
=>
$request
->
secret_key
,
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
...
...
@@ -168,7 +172,7 @@ class MediaModel extends Eloquent
'media_type'
=>
$mediaCatg
[
'name'
],
'book_num'
=>
''
,
'book_name'
=>
$request
->
media_name
,
'media_url'
=>
$
request
->
media_url
,
'media_url'
=>
$media_url
,
'access_key'
=>
$request
->
access_key
,
'secret_key'
=>
$request
->
secret_key
,
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
...
...
@@ -412,7 +416,7 @@ class MediaModel extends Eloquent
}
if
(
isset
(
$request
->
media_name
)
&&
!
empty
(
$request
->
media_name
)){
$aggregate
[][
'$match'
][
'media_url'
]
=
[
'$regex'
=>
'http
s
://qcoenfz67.bkt.clouddn.com'
];
$aggregate
[][
'$match'
][
'media_url'
]
=
[
'$regex'
=>
'http://qcoenfz67.bkt.clouddn.com'
];
}
if
(
isset
(
$request
->
username
)
&&
!
empty
(
$request
->
username
)){
...
...
@@ -440,6 +444,7 @@ class MediaModel extends Eloquent
if
(
!
empty
(
$medias
)){
foreach
(
$medias
as
$media
){
$data
=
[
'media_url'
=>
"https://vod-mam.eoffcn.com/"
.
$media
->
_id
.
'/index.m3u8'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment