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
9cb45572
Commit
9cb45572
authored
Aug 07, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码
parent
b9674722
Pipeline
#10494
passed with stages
in 46 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
28 deletions
+28
-28
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+0
-22
MediaController.php
app/Http/Controllers/Api/MediaController.php
+22
-0
MediaController.php
app/Http/Controllers/Web/MediaController.php
+1
-0
MediaModel.php
app/Model/MediaModel.php
+3
-5
api.php
routes/api.php
+2
-1
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
9cb45572
...
...
@@ -182,27 +182,5 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public
function
handleMediaUrl
(
Request
$request
){
$res
=
handler_drive
(
function
()
use
(
$request
){
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
''
,
'username'
=>
''
,
'page'
=>
'integer'
,
'media_id'
=>
''
,
'description'
=>
''
,
'sort'
=>
''
,
'page_size'
=>
'integer'
,
]);
return
MediaModel
::
handleMediaUrl
(
$request
);
});
return
success
(
$res
);
}
}
app/Http/Controllers/Api/MediaController.php
View file @
9cb45572
...
...
@@ -78,6 +78,28 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public
function
handleMediaUrl
(
Request
$request
){
$res
=
handler_drive
(
function
()
use
(
$request
){
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
''
,
'username'
=>
''
,
'page'
=>
'integer'
,
'media_id'
=>
''
,
'description'
=>
''
,
'sort'
=>
''
,
'page_size'
=>
'integer'
,
]);
return
MediaModel
::
handleMediaUrl
(
$request
);
});
return
success
(
$res
);
}
...
...
app/Http/Controllers/Web/MediaController.php
View file @
9cb45572
...
...
@@ -18,6 +18,7 @@ class MediaController extends Controller
* @throws \App\Exceptions\FormException
*/
public
function
index
(
Request
$request
){
// php 特殊字符转义,实现字符串安全存入数据库,
SrsHookValidate
::
srsHookCallback
(
$request
,[
...
...
app/Model/MediaModel.php
View file @
9cb45572
...
...
@@ -451,9 +451,7 @@ class MediaModel extends Eloquent
$aggregate
[][
'$match'
][
'_id'
]
=
$request
->
media_id
;
}
if
(
isset
(
$request
->
media_name
)
&&
!
empty
(
$request
->
media_name
)){
$aggregate
[][
'$match'
][
'media_url'
]
=
[
'$regex'
=>
'http://qcoenfz67.bkt.clouddn.com'
];
}
$aggregate
[][
'$match'
][
'media_url'
]
=
[
'$regex'
=>
'qcoenfz67.bkt.clouddn.com'
];
if
(
isset
(
$request
->
username
)
&&
!
empty
(
$request
->
username
)){
$aggregate
[][
'$match'
][
'username'
]
=
$request
->
username
;
...
...
@@ -475,8 +473,7 @@ class MediaModel extends Eloquent
}
else
{
$count
=
0
;
}
//
//$count = sizeof($collection->aggregate($aggregate)->toArray());
...
...
@@ -495,6 +492,7 @@ class MediaModel extends Eloquent
});
if
(
!
empty
(
$medias
)){
...
...
routes/api.php
View file @
9cb45572
...
...
@@ -49,7 +49,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user'], function () {
// Route::get("media_url_change","Client\
MediaController@handleMediaUrl");
Route
::
get
(
"media_url_change"
,
"
MediaController@handleMediaUrl"
);
});
\ 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