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
c5e32fc4
Commit
c5e32fc4
authored
Jul 06, 2022
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将获取截屏数据修改为异步
parent
857ea5b6
Pipeline
#18750
passed with stages
in 1 minute 16 seconds
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
17 deletions
+8
-17
MediaController.php
app/Http/Controllers/Api/MediaController.php
+6
-15
MediaModel.php
app/Model/MediaModel.php
+0
-0
api.php
routes/api.php
+2
-2
No files found.
app/Http/Controllers/Api/MediaController.php
View file @
c5e32fc4
...
@@ -326,7 +326,6 @@ class MediaController extends Controller
...
@@ -326,7 +326,6 @@ class MediaController extends Controller
*/
*/
public
function
getMediaListByMediaIds
(
Request
$request
)
public
function
getMediaListByMediaIds
(
Request
$request
)
{
{
$data
=
handler_drive
(
function
()
use
(
$request
)
{
$data
=
handler_drive
(
function
()
use
(
$request
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,
[
SrsHookValidate
::
srsHookCallback
(
$request
,
[
'media_ids'
=>
'required'
,
'media_ids'
=>
'required'
,
...
@@ -336,30 +335,22 @@ class MediaController extends Controller
...
@@ -336,30 +335,22 @@ class MediaController extends Controller
return
success
(
$data
);
return
success
(
$data
);
}
}
/**
/**
* @param Request $request
* @param Request $request
* @
param $i
d
* @
return mixe
d
* @
return \Illuminate\Http\JsonResponse
* @
throws FormException
* @throws \App\Exceptions\ControllerException
* @throws \App\Exceptions\ControllerException
* @throws \App\Exceptions\DatabaseException
*/
*/
public
function
getScreeShotInfo
(
Request
$request
)
public
function
screenShotCallback
(
Request
$request
){
{
$data
=
handler_drive
(
function
()
use
(
$request
)
{
$data
=
handler_drive
(
function
()
use
(
$request
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,
[
SrsHookValidate
::
srsHookCallback
(
$request
,
[
'media_id'
=>
'required'
,
'media_id'
=>
'required'
,
'secret_key'
=>
''
,
'secret_key'
=>
''
,
'media_url'
=>
''
,
'media_url'
=>
'
required
'
,
]);
]);
return
MediaModel
::
UpdateScreenShotInfo
(
$request
);
return
array
(
"media_id"
=>
$request
->
media_id
,
"secret_key"
=>
$request
->
secret_key
,
"media_url"
=>
$request
->
media_url
,
);
//return MediaModel::getScreeShotInfo($request);
});
});
return
success
(
$data
);
return
success
(
$data
);
}
}
...
...
app/Model/MediaModel.php
View file @
c5e32fc4
This diff is collapsed.
Click to expand it.
routes/api.php
View file @
c5e32fc4
...
@@ -53,6 +53,5 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user','middleware' => ['api']],
...
@@ -53,6 +53,5 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user','middleware' => ['api']],
Route
::
post
(
"getMediaListByMediaIds"
,
"MediaController@getMediaListByMediaIds"
);
Route
::
post
(
"getMediaListByMediaIds"
,
"MediaController@getMediaListByMediaIds"
);
//Route::get("media_url_change","MediaController@handleMediaUrl");
//Route::get("media_url_change","MediaController@handleMediaUrl");
Route
::
post
(
"screenShot"
,
"MediaController@getScreeShotInfo"
);
Route
::
post
(
"screenShotCallback"
,
"MediaController@screenShotCallback"
);
Route
::
post
(
"screenShotCallback"
,
"MediaController@updateScreeShotInfo"
);
});
});
\ No newline at end of file
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