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
efa4ae88
Commit
efa4ae88
authored
Aug 11, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面显示时间
parent
08015594
Pipeline
#10611
passed with stages
in 42 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
26 deletions
+19
-26
Handler.php
app/Exceptions/Handler.php
+0
-4
MediaController.php
app/Http/Controllers/Api/MediaController.php
+0
-7
MediaModel.php
app/Model/MediaModel.php
+19
-15
No files found.
app/Exceptions/Handler.php
View file @
efa4ae88
...
...
@@ -56,10 +56,6 @@ class Handler extends ExceptionHandler
$path
=
$request
->
path
();
// var_dump($exception->getMessage());
// var_dump($exception->getFile());
// var_dump($exception->getLine());
#检测当前请求是否是api路由
if
(
stripos
(
$path
,
'api/'
)
===
0
...
...
app/Http/Controllers/Api/MediaController.php
View file @
efa4ae88
...
...
@@ -113,12 +113,6 @@ class MediaController extends Controller
*/
public
function
hookRestoreMedia
(
Request
$request
){
$id
=
handler_drive
(
function
()
use
(
$request
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,
array_merge
([
...
...
@@ -138,7 +132,6 @@ class MediaController extends Controller
'end_time'
=>
$data_time
,
'access_key'
=>
''
,
'description'
=>
'网校'
,
'create_time'
=>
$data_time
,
);
$request
->
replace
(
array_merge
(
$request
->
all
(),
$params
));
...
...
app/Model/MediaModel.php
View file @
efa4ae88
...
...
@@ -62,6 +62,8 @@ class MediaModel extends Eloquent
$aggregate
[][
'$match'
][
'_id'
]
=
$request
->
media_id
;
}
// $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
if
(
isset
(
$request
->
media_name
)
&&
!
empty
(
$request
->
media_name
)){
$aggregate
[][
'$match'
][
'media_name'
]
=
[
'$regex'
=>
addslashes
(
$request
->
media_name
)
];
}
...
...
@@ -112,18 +114,19 @@ class MediaModel extends Eloquent
/**
* 将mongoDate 转化为普通时间
*/
// foreach ($tmp_arr as $media){
// if (is_object($media['start_time'])){
// $media['start_time'] = Carbon::parse(strtotime($media['start_time']))->toDateTimeString();
// }
//
// if (is_object($media['end_time'])){
// $media['end_time'] = Carbon::parse(strtotime($media['end_time']))->toDateTimeString();
// }
// if (is_object($media['create_time'])){
// $media['create_time'] = Carbon::parse(strtotime($media['create_time']))->toDateTimeString();
// }
// }
foreach
(
$tmp_arr
as
$media
){
if
(
is_object
(
$media
[
'start_time'
])){
$media
[
'start_time'
]
=
$media
[
'start_time'
]
->
toDateTime
()
->
format
(
'Y-m-d H:i:s'
);
}
if
(
is_object
(
$media
[
'end_time'
])){
$media
[
'end_time'
]
=
$media
[
'end_time'
]
->
toDateTime
()
->
format
(
'Y-m-d H:i:s'
);
}
if
(
is_object
(
$media
[
'create_time'
])){
$media
[
'create_time'
]
=
$media
[
'create_time'
]
->
toDateTime
()
->
format
(
'Y-m-d H:i:s'
);
}
}
return
new
LengthAwarePaginator
(
$tmp_arr
,
$count
,
$limit
,
$page
,[
...
...
@@ -138,6 +141,7 @@ class MediaModel extends Eloquent
throw
new
DatabaseException
(
$exception
->
getMessage
());
}
return
$medias
;
}
...
...
@@ -187,9 +191,9 @@ class MediaModel extends Eloquent
$end_time
=
new
UTCDateTime
(
strtotime
(
$request
->
end_time
)
*
1000
);;
$create_time
=
new
UTCDateTime
(
time
()
*
1000
);;
$start_time
=
$request
->
start_time
;
$end_time
=
$request
->
end_time
;
$create_time
=
date
(
'Y-m-d H:i:s'
,
time
());
//
$start_time = $request->start_time;
//
$end_time = $request->end_time;
//
$create_time = date('Y-m-d H:i:s',time());
/**
...
...
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