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
933e34ab
Commit
933e34ab
authored
Jul 07, 2022
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
bd223f54
Pipeline
#18786
passed with stages
in 2 minutes 20 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
MediaController.php
app/Http/Controllers/Api/MediaController.php
+4
-3
MediaModel.php
app/Model/MediaModel.php
+9
-3
No files found.
app/Http/Controllers/Api/MediaController.php
View file @
933e34ab
...
...
@@ -347,9 +347,10 @@ class MediaController extends Controller
$data
=
handler_drive
(
function
()
use
(
$request
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,
[
'media_id'
=>
'required'
,
'screenshot'
=>
'required'
,
'width'
=>
'required'
,
'height'
=>
'required'
,
'screenshot'
=>
''
,
'width'
=>
''
,
'height'
=>
''
,
'type'
=>
'required'
,
]);
return
MediaModel
::
UpdateScreenShotInfo
(
$request
);
});
...
...
app/Model/MediaModel.php
View file @
933e34ab
...
...
@@ -1111,13 +1111,19 @@ class MediaModel extends Eloquent
/**
* @param $request
* @return
array
* @return
void
* @throws DatabaseException
*/
public
static
function
UpdateScreenShotInfo
(
$request
)
{
LogModel
::
addlog
([
"接收到更新 screenshot 数据回调 "
=>
$request
->
all
()]);
$media_id
=
$request
->
media_id
;
if
(
$request
->
type
==
'audio'
){
$data
[
"media_audio"
]
=
'audio'
;
MediaModel
::
where
(
"_id"
,
$media_id
)
->
update
(
$data
);
return
;
}
try
{
MediaModel
::
select
(
"_id"
,
"media_name"
,
"duration"
,
"secret_key"
,
"media_url"
)
->
where
(
'_id'
,
$media_id
)
->
first
();
}
catch
(
\Exception
$exception
)
{
...
...
@@ -1143,7 +1149,8 @@ class MediaModel extends Eloquent
try
{
$match
=
[
'status'
=>
"1"
,
"screen_shot"
=>
null
"screen_shot"
=>
null
,
"media_audio"
=>
[
"
\$
ne"
=>
'audio'
]
];
if
(
isset
(
$request
->
media_id
)
&&
!
empty
(
$request
->
media_id
))
{
...
...
@@ -1162,7 +1169,6 @@ class MediaModel extends Eloquent
$media
=
MediaModel
::
where
(
$match
)
->
first
();
self
::
getScreeShotInfo
(
$media
[
"_id"
]);
//sleep(10);
}
catch
(
\Exception
$exception
)
{
throw
new
DatabaseException
(
$exception
->
getMessage
());
...
...
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