Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
ic_server_welfare
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
50a4767c
authored
Sep 27, 2019
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改时间以及修复好友助力列表data问题
parent
229158d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
app/Http/Controllers/AssistsController.php
app/Jobs/Timer/ResetExchangeSettingsCronJob.php
app/Http/Controllers/AssistsController.php
View file @
50a4767c
...
...
@@ -30,7 +30,7 @@ class AssistsController extends Controller
$pageSize
=
$request
->
get
(
'page_size'
,
self
::
DEFAULT_PAGE_SIZE
);
if
(
$request
->
has
(
'is_api'
)
&&
$request
->
is_api
)
{
$exchangeId
=
$request
->
get
(
'exchange_id'
);
$result
=
$assist
->
getAssistListForApi
(
$exchangeId
)
;
$result
=
[
'data'
=>
$assist
->
getAssistListForApi
(
$exchangeId
)]
;
}
else
{
$result
=
$assist
->
getAssistList
(
$page
,
$pageSize
,
$filter
);
}
...
...
app/Jobs/Timer/ResetExchangeSettingsCronJob.php
View file @
50a4767c
...
...
@@ -29,7 +29,7 @@ class ResetExchangeSettingsCronJob extends CronJob
public
function
run
()
{
//判断是否是10点,如果是10点就进行重置任务
$time
=
Carbon
::
create
(
null
,
null
,
null
,
1
5
,
3
0
);
$time
=
Carbon
::
create
(
null
,
null
,
null
,
10
);
$time
=
$time
->
timestamp
;
$now
=
Carbon
::
now
()
->
timestamp
;
if
(
$time
===
$now
)
{
...
...
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