Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
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
hujun
tl_estate
Commits
f7d10912
Commit
f7d10912
authored
Dec 15, 2017
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页返回AuthToken参数,修改注册获取验证码时间条件判断
parent
7920ab68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Banner.php
application/api/controller/Banner.php
+4
-1
Member.php
application/api/controller/Member.php
+2
-2
No files found.
application/api/controller/Banner.php
View file @
f7d10912
...
@@ -13,7 +13,7 @@ namespace app\api\controller;
...
@@ -13,7 +13,7 @@ namespace app\api\controller;
use
app\api\extend\Basic
;
use
app\api\extend\Basic
;
use
app\model\BannerModel
;
use
app\model\BannerModel
;
use
think\Request
;
use
think\Request
;
use
app\api\untils\JwtUntils
;
class
Banner
extends
Basic
class
Banner
extends
Basic
{
{
protected
$bannerModel
;
protected
$bannerModel
;
...
@@ -34,6 +34,9 @@ class Banner extends Basic
...
@@ -34,6 +34,9 @@ class Banner extends Basic
$params
[
'is_show'
]
=
array
(
"eq"
,
0
);
$params
[
'is_show'
]
=
array
(
"eq"
,
0
);
$result
=
$this
->
bannerModel
$result
=
$this
->
bannerModel
->
getBannerList
(
1
,
15
,
"sort desc"
,
$field
,
$params
);
->
getBannerList
(
1
,
15
,
"sort desc"
,
$field
,
$params
);
$jwt
=
new
JwtUntils
();
$data
[
'is_login'
]
=
'0'
;
//0未登录
$result
[
'AuthToken'
]
=
$jwt
->
createToken
(
$data
);
return
$this
->
response
(
"200"
,
"request success"
,
$result
);
return
$this
->
response
(
"200"
,
"request success"
,
$result
);
}
}
...
...
application/api/controller/Member.php
View file @
f7d10912
...
@@ -182,8 +182,8 @@ class Member extends Basic
...
@@ -182,8 +182,8 @@ class Member extends Basic
'code'
=>
$code
,
'code'
=>
$code
,
'is_success'
=>
1
'is_success'
=>
1
])
->
find
();
])
->
find
();
if
(
time
()
-
$note_data
->
send_time
>
18000
)
{
if
(
time
()
-
strtotime
(
$note_data
->
send_time
)
->
send_time
>
18000
)
{
return
$this
->
response
(
101
,
'请重新获取验证码'
);
return
$this
->
response
(
101
,
'请重新获取验证码'
);
}
}
...
...
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