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
c3ebb633
Commit
c3ebb633
authored
Jul 14, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
2245b168
Pipeline
#9891
passed with stages
in 33 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
MediaController.php
app/Http/Controllers/Web/MediaController.php
+18
-5
MediaModel.php
app/Model/MediaModel.php
+2
-2
No files found.
app/Http/Controllers/Web/MediaController.php
View file @
c3ebb633
...
@@ -10,16 +10,29 @@ use App\Http\Controllers\Controller;
...
@@ -10,16 +10,29 @@ use App\Http\Controllers\Controller;
class
MediaController
extends
Controller
class
MediaController
extends
Controller
{
{
/**
* 媒资列表
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \App\Exceptions\DatabaseException
* @throws \App\Exceptions\FormException
*/
public
function
index
(
Request
$request
){
public
function
index
(
Request
$request
){
// var_dump(\config('app.client_request_parameters'));die;
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
''
,
'username'
=>
''
,
'page'
=>
'integer'
,
'media_id'
=>
''
,
'description'
=>
''
,
'sort'
=>
''
,
'page_size'
=>
'integer'
,
'start_time'
=>
'date'
,
'end_time'
=>
'date'
,
]);
$medias
=
MediaModel
::
mediaList
(
$request
);
$medias
=
MediaModel
::
mediaList
(
$request
);
// return success($medias);
return
view
(
'admin.media.media_list'
,
[
return
view
(
'admin.media.media_list'
,
[
'medias'
=>
$medias
,
'medias'
=>
$medias
,
'start_time'
=>
substr
(
$request
->
start_time
,
0
,
10
),
'start_time'
=>
substr
(
$request
->
start_time
,
0
,
10
),
...
...
app/Model/MediaModel.php
View file @
c3ebb633
...
@@ -52,11 +52,11 @@ class MediaModel extends Eloquent
...
@@ -52,11 +52,11 @@ class MediaModel extends Eloquent
$sort
=
1
;
$sort
=
1
;
}
}
if
(
isset
(
$request
->
media_id
)
&&
empty
(
$request
->
media_id
)){
if
(
isset
(
$request
->
media_id
)
&&
!
empty
(
$request
->
media_id
)){
$aggregate
[][
'$match'
][
'_id'
]
=
$request
->
media_id
;
$aggregate
[][
'$match'
][
'_id'
]
=
$request
->
media_id
;
}
}
if
(
isset
(
$request
->
media_name
)
&&
empty
(
$request
->
media_name
)){
if
(
isset
(
$request
->
media_name
)
&&
!
empty
(
$request
->
media_name
)){
$aggregate
[][
'$match'
][
'media_name'
]
=
[
'$regex'
=>
$request
->
media_name
];
$aggregate
[][
'$match'
][
'media_name'
]
=
[
'$regex'
=>
$request
->
media_name
];
}
}
...
...
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