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
e8a53c30
Commit
e8a53c30
authored
Mar 09, 2021
by
yf60144
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
bc25225c
Pipeline
#13846
passed with stages
in 40 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
MediaController.php
app/Http/Controllers/Api/MediaController.php
+3
-3
MediaModel.php
app/Model/MediaModel.php
+4
-3
No files found.
app/Http/Controllers/Api/MediaController.php
View file @
e8a53c30
...
...
@@ -297,10 +297,10 @@ class MediaController extends Controller
}
public
function
getMediaForeverM3u8
(
Request
$request
,
$media_id
){
public
function
getMediaForeverM3u8
(
Request
$request
){
$data
=
handler_drive
(
function
()
use
(
$request
,
$media_id
)
{
return
MediaModel
::
getMediaForeverM3u8
(
$request
,
$media_id
);
$data
=
handler_drive
(
function
()
use
(
$request
)
{
return
MediaModel
::
getMediaForeverM3u8
(
$request
);
});
return
success
(
$data
);
...
...
app/Model/MediaModel.php
View file @
e8a53c30
...
...
@@ -907,13 +907,14 @@ class MediaModel extends Eloquent
* @return mixed
* @throws DatabaseException
*/
public
static
function
getMediaForeverM3u8
(
$request
,
$media_id
){
public
static
function
getMediaForeverM3u8
(
$request
){
try
{
$media_id
=
$request
->
media_id
;
/**
* 判断媒资ID是否存在
*/
$media
=
MediaModel
::
where
(
"
media_num"
,
$request
->
media_num
)
->
first
();
$media
=
MediaModel
::
where
(
"
_id"
,
$media_id
)
->
first
();
if
(
empty
(
$media
)){
throw
new
\Exception
(
"媒资信息不存在"
);
}
...
...
@@ -925,7 +926,7 @@ class MediaModel extends Eloquent
}
$url
=
getRbac
(
$request
,
'video/info?mediaId='
.
$media_id
,
''
,
$type
=
'play_m3u8'
);
$res
=
http_request_code
(
$url
,
null
,
'
POST'
,[
'mediaId'
=>
$media_id
]
);
$res
=
http_request_code
(
$url
,
null
,
'
GET'
);
$result
=
json_decode
(
$res
,
true
);
...
...
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