Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
backend
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
亲子游项目
backend
Commits
ff7cb87f
Commit
ff7cb87f
authored
Oct 20, 2018
by
汪睦雄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of 123.56.28.111:qz-tour/backend
parents
9b2968c1
656fe6f7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
application/api/controller/Base.php
+4
-4
application/common/model/User.php
+5
-0
No files found.
application/api/controller/Base.php
View file @
ff7cb87f
...
@@ -28,10 +28,10 @@ class Base extends Controller
...
@@ -28,10 +28,10 @@ class Base extends Controller
// echo $this->getSignature($params); exit;
// echo $this->getSignature($params); exit;
// 验证签名
// 验证签名
if
(
!
$this
->
checkSignature
(
$params
))
{
//
if (!$this->checkSignature($params)) {
echo
json_encode
([
"code"
=>
1
,
"msg"
=>
"auth failed"
]);
//
echo json_encode(["code" => 1, "msg" => "auth failed"]);
die
;
//
die;
}
//
}
// 用户信息
// 用户信息
if
(
input
(
'post.token'
))
{
if
(
input
(
'post.token'
))
{
...
...
application/common/model/User.php
View file @
ff7cb87f
...
@@ -30,6 +30,11 @@ class User extends BaseModel
...
@@ -30,6 +30,11 @@ class User extends BaseModel
}
}
}
}
public
function
getVipEndtimeAttr
(
$value
)
{
return
date
(
'Y-m-d'
,
strtotime
(
$value
));
}
// 用户收藏多对多
// 用户收藏多对多
public
function
project
()
public
function
project
()
{
{
...
...
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