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
b933e8d5
Commit
b933e8d5
authored
Dec 13, 2017
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加邀请记录列表 和 注册、登录、邀请注册修改
parent
73a04365
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
41 deletions
+93
-41
Member.php
application/api/controller/Member.php
+88
-36
Users.php
application/api/validate/Users.php
+4
-5
route.php
application/route.php
+1
-0
No files found.
application/api/controller/Member.php
View file @
b933e8d5
...
@@ -106,7 +106,7 @@ class Member extends Basic
...
@@ -106,7 +106,7 @@ class Member extends Basic
$message
=
new
MessageUntils
();
$message
=
new
MessageUntils
();
$_code
=
mt_rand
(
1000
,
9999
)
.
''
;
$_code
=
mt_rand
(
1000
,
9999
)
.
''
;
$result
=
$message
->
sendCCPSMS
(
$phone
,
array
(
$_code
,
'5分钟'
),
214759
);
//
$result = $message->sendCCPSMS($phone, array($_code, '5分钟'), 214759);
$noteLog
->
phone
=
$phone
;
$noteLog
->
phone
=
$phone
;
$noteLog
->
template_msg
=
'【同联商业】您的验证码为'
.
$_code
.
',请于5分钟内正确输入,如非本人操作,请忽略此短信。'
;
$noteLog
->
template_msg
=
'【同联商业】您的验证码为'
.
$_code
.
',请于5分钟内正确输入,如非本人操作,请忽略此短信。'
;
...
@@ -131,6 +131,11 @@ class Member extends Basic
...
@@ -131,6 +131,11 @@ class Member extends Basic
return
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
[
'data'
]);
return
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
[
'data'
]);
}
}
/**
* 用户注册、编辑、邀请注册
*
* @return type
*/
public
function
register
()
{
public
function
register
()
{
$result
=
0
;
$result
=
0
;
...
@@ -151,66 +156,113 @@ class Member extends Basic
...
@@ -151,66 +156,113 @@ class Member extends Basic
$result
=
$this
->
validate
([
$result
=
$this
->
validate
([
'user_phone'
=>
$this
->
request
->
param
(
'phone'
),
'user_phone'
=>
$this
->
request
->
param
(
'phone'
),
'user_pswd'
=>
$this
->
request
->
param
(
'pwd'
),
'user_pswd'
=>
$this
->
request
->
param
(
'pwd'
),
'user_pswd2'
=>
$this
->
request
->
param
(
'pwd2'
),
'referrer_id'
=>
$this
->
request
->
param
(
'referrer_id'
),
'referrer_id'
=>
$this
->
request
->
param
(
'referrer_id'
),
'referrer_source'
=>
$this
->
request
->
param
(
'referrer_source'
),
'referrer_source'
=>
$this
->
request
->
param
(
'referrer_source'
),
'code'
=>
$this
->
request
->
param
(
'code'
),
'code'
=>
$this
->
request
->
param
(
'code'
),
'user_nick'
=>
$this
->
request
->
param
(
'user_nick'
)
'user_nick'
=>
$this
->
request
->
param
(
'user_nick'
)
],
$check
);
],
$check
);
}
}
$data
[
'status'
]
=
101
;
$data
[
'status'
]
=
101
;
$data
[
'data'
]
=
''
;
$data
[
'data'
]
=
''
;
if
(
true
===
$result
){
if
(
true
===
$result
){
$user_data
=
$this
->
user
->
get
([
'user_phone'
=>
$this
->
params
[
'phone'
]]);
$user_data
=
$this
->
user
->
get
([
'user_phone'
=>
$this
->
params
[
'phone'
]]);
$date
=
date
(
'Y-m-d H:i:s'
);
$date
=
date
(
'Y-m-d H:i:s'
);
if
(
empty
(
$user_data
->
id
))
{
if
(
empty
(
$user_data
->
id
))
{
$insert_data
[
'referrer_id'
]
=
$this
->
request
->
param
(
'referrer_id'
);
$insert_data
[
'referrer_source'
]
=
$this
->
request
->
param
(
'referrer_source'
);
$insert_data
[
'status'
]
=
0
;
$insert_data
[
'create_time'
]
=
$date
;
$insert_data
[
'update_time'
]
=
$date
;
$insert_data
[
'last_login_time'
]
=
$date
;
$insert_data
[
'last_login_ip'
]
=
ip2long
(
$this
->
request
->
ip
());
$insert_data
[
'user_phone'
]
=
$this
->
request
->
param
(
'phone'
);
//不是邀请注册
if
(
$type
!=
'invite'
)
{
$insert_data
[
'user_nick'
]
=
$this
->
request
->
param
(
'user_nick'
);
$insert_data
[
'user_pswd'
]
=
md5
(
md5
(
$this
->
request
->
param
(
'pwd'
))
.
'+123'
);
$insert_data
[
'user_pic'
]
=
$this
->
request
->
param
(
'user_pic'
);
$this
->
user
->
save
(
$insert_data
);
//注册用户
$data
[
'data'
]
=
[
'id'
=>
$this
->
user
->
id
];
$data
[
'msg'
]
=
'注册成功'
;
$data
[
'status'
]
=
200
;
}
$code
=
Session
::
get
(
'_code'
);
$code
=
Session
::
get
(
'_code'
);
if
(
$this
->
request
->
param
(
'code'
)
==
$code
)
{
$this
->
user
->
save
(
$insert_data
);
//邀请注册用户
if
(
$this
->
request
->
param
(
'code'
)
==
$code
&&
$code
!=
''
)
{
Session
::
delete
(
'_code'
);
$data
[
'data'
]
=
[
'id'
=>
$this
->
user
->
id
];
$insert_data
[
'referrer_id'
]
=
$this
->
request
->
param
(
'referrer_id'
);
$data
[
'msg'
]
=
'注册成功'
;
$insert_data
[
'referrer_source'
]
=
$this
->
request
->
param
(
'referrer_source'
);
$data
[
'status'
]
=
200
;
$insert_data
[
'status'
]
=
0
;
$insert_data
[
'create_time'
]
=
$date
;
$insert_data
[
'update_time'
]
=
$date
;
$insert_data
[
'last_login_time'
]
=
$date
;
$insert_data
[
'last_login_ip'
]
=
ip2long
(
$this
->
request
->
ip
());
$insert_data
[
'user_phone'
]
=
$this
->
request
->
param
(
'phone'
);
$insert_data
[
'user_pswd'
]
=
md5
(
md5
(
$this
->
request
->
param
(
'pwd'
))
.
'+123'
);
$insert_data
[
'user_nick'
]
=
$this
->
request
->
param
(
'user_nick'
);
$insert_data
[
'user_pic'
]
=
$this
->
request
->
param
(
'user_pic'
);
$this
->
user
->
save
(
$insert_data
);
//注册用户
if
(
$this
->
user
->
id
)
{
$jwt_data
[
'id'
]
=
$this
->
user
->
id
;
$jwt_data
[
'user_nick'
]
=
$insert_data
[
'user_nick'
];
$jwt_data
[
'user_phone'
]
=
$insert_data
[
'user_phone'
];
$jwt
=
new
JwtUntils
();
$insert_data
[
'authToken'
]
=
$jwt
->
createToken
(
$jwt_data
);
$insert_data
[
'id'
]
=
$this
->
user
->
id
;
Session
::
set
(
'u_user'
,
$insert_data
[
'data'
]);
//登录
Session
::
delete
(
'_code'
);
//销毁验证码
$data
[
'data'
]
=
$insert_data
;
$data
[
'msg'
]
=
'注册成功'
;
$data
[
'status'
]
=
200
;
}
else
{
$data
[
'status'
]
=
101
;
$data
[
'msg'
]
=
'注册失败'
;
}
}
else
{
}
else
{
$data
[
'msg'
]
=
'验证码错误'
;
$data
[
'msg'
]
=
'验证码错误'
;
}
}
}
else
{
}
else
{
$user_data
->
user_nick
=
$this
->
request
->
param
(
'user_nick'
)
?
$this
->
request
->
param
(
'user_nick'
)
:
$user_data
->
user_nick
;
$user_data
->
user_nick
=
$this
->
request
->
param
(
'user_nick'
)
?
$this
->
request
->
param
(
'user_nick'
)
:
$user_data
->
user_nick
;
$user_data
->
user_phone
=
$this
->
request
->
param
(
'phone'
)
?
$this
->
request
->
param
(
'phone'
)
:
$user_data
->
user_phone
;
$user_data
->
user_phone
=
$this
->
request
->
param
(
'phone'
)
?
$this
->
request
->
param
(
'phone'
)
:
$user_data
->
user_phone
;
$user_data
->
user_pswd
=
$this
->
request
->
param
(
'pwd'
)
?
$this
->
request
->
param
(
'pwd'
)
:
$user_data
->
user_pswd
;
$user_data
->
user_pic
=
$this
->
request
->
param
(
'user_pic'
)
?
$this
->
request
->
param
(
'user_pic'
)
:
$user_data
->
user_pic
;
$user_data
->
user_pic
=
$this
->
request
->
param
(
'user_pic'
)
?
$this
->
request
->
param
(
'user_pic'
)
:
$user_data
->
user_pic
;
$user_data
->
referrer_id
=
$this
->
request
->
param
(
'referrer_id'
)
?
$this
->
request
->
param
(
'referrer_id'
)
:
$user_data
->
referrer_id
;
$user_data
->
referrer_source
=
$this
->
request
->
param
(
'referrer_source'
)
?
$this
->
request
->
param
(
'referrer_source'
)
:
$user_data
->
referrer_source
;
$user_data
->
status
=
$this
->
request
->
param
(
'status'
)
?
$this
->
request
->
param
(
'status'
)
:
$user_data
->
status
;
$user_data
->
update_time
=
$date
;
$user_data
->
update_time
=
$date
;
$user_data
->
last_login_ip
=
$this
->
request
->
param
(
'last_login_ip'
)
?
$this
->
params
[
'last_login_ip'
]
:
$user_data
->
last_login_ip
;
$user_data
->
last_login_ip
=
$this
->
request
->
param
(
'last_login_ip'
)
?
$this
->
params
[
'last_login_ip'
]
:
$user_data
->
last_login_ip
;
//修改密码
if
(
$this
->
request
->
param
(
'pwd'
)
==
$user_data
->
user_pswd
)
{
$user_data
->
user_pswd
=
md5
(
md5
(
$this
->
request
->
param
(
'pwd'
))
.
'+123'
);
}
$user_data
->
save
();
$user_data
->
save
();
$data
[
'data'
]
=
[
'id'
=>
$user_data
->
id
];
$data
[
'data'
]
=
[
'id'
=>
$user_data
->
id
];
$data
[
'status'
]
=
200
;
$data
[
'msg'
]
=
'修改成功'
;
}
}
}
else
{
}
else
{
$data
[
'msg'
]
=
$result
?
$result
:
'type参数为空'
;
$data
[
'msg'
]
=
$result
?
$result
:
'type参数为空'
;
}
}
return
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
[
'data'
]);
return
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
[
'data'
]);
}
}
/**
* 邀请记录
*
* @return type
*/
public
function
inviteList
()
{
$id
=
$this
->
params
[
'id'
];
$data
[
'status'
]
=
101
;
$data
[
'data'
]
=
''
;
$data
[
'msg'
]
=
''
;
if
(
$id
)
{
$restult
=
$this
->
user
->
field
(
'user_nick,user_phone,create_time'
)
->
where
(
'referrer_id'
,
$id
)
->
where
(
'status'
,
0
)
->
select
();
foreach
(
$restult
as
$k
=>
$v
)
{
$arr
=
$v
->
getData
();
$data_arr
[
$k
][
'user_nick'
]
=
$arr
[
'user_nick'
];
$data_arr
[
$k
][
'user_phone'
]
=
$arr
[
'user_phone'
];
$data_arr
[
$k
][
'create_time'
]
=
date
(
'Y-m-d'
,
strtotime
(
$arr
[
'create_time'
]));
}
$data
[
'data'
]
=
$data_arr
;
$data
[
'status'
]
=
200
;
}
else
{
$data
[
'msg'
]
=
'id is null'
;
}
return
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
[
'data'
]);
}
}
}
application/api/validate/Users.php
View file @
b933e8d5
...
@@ -21,7 +21,6 @@ class Users extends Validate {
...
@@ -21,7 +21,6 @@ class Users extends Validate {
'code'
=>
'require|number'
,
'code'
=>
'require|number'
,
'user_nick'
=>
'require'
,
'user_nick'
=>
'require'
,
'user_pswd'
=>
'require|min:6'
,
'user_pswd'
=>
'require|min:6'
,
'user_pswd2'
=>
'require|confirm:user_pswd'
,
];
];
protected
$message
=
[
protected
$message
=
[
'user_phone'
=>
'手机号码错误'
,
'user_phone'
=>
'手机号码错误'
,
...
@@ -32,16 +31,15 @@ class Users extends Validate {
...
@@ -32,16 +31,15 @@ class Users extends Validate {
'referrer_source.number'
=>
'referrer_source must be numbers'
,
'referrer_source.number'
=>
'referrer_source must be numbers'
,
'code.require'
=>
'code is null'
,
'code.require'
=>
'code is null'
,
'code.number'
=>
'code is null'
,
'code.number'
=>
'code is null'
,
'user_nick.require'
=>
'用户名为空'
,
'user_nick.require'
=>
'用户名为空'
,
'user_pswd.require'
=>
'密码为空'
,
'user_pswd.require'
=>
'密码为空'
,
'user_pswd.min'
=>
'密码小于6位'
,
'user_pswd.min'
=>
'密码小于6位'
,
'user_pswd2.require'
=>
'重复输入密码为空'
,
'user_pswd2.confirm'
=>
'重复输入密码不一致'
,
];
];
protected
$scene
=
[
protected
$scene
=
[
'invite'
=>
'user_phone,referrer_id,referrer_source'
,
'invite'
=>
'user_phone,referrer_id,referrer_source'
,
'cPost'
=>
'user_phone,referrer_id,referrer_source,code'
,
'cPost'
=>
'user_phone,referrer_id,referrer_source,code'
,
'register'
=>
'user_phone,user_pswd,user_pswd2'
'register'
=>
'user_phone,user_pswd'
,
'edit'
=>
''
];
];
}
}
\ No newline at end of file
application/route.php
View file @
b933e8d5
...
@@ -63,6 +63,7 @@ Route::group('api',[
...
@@ -63,6 +63,7 @@ Route::group('api',[
//get member
//get member
'logout'
=>
[
'api/member/logout'
,[
'method'
=>
'get'
]],
'logout'
=>
[
'api/member/logout'
,[
'method'
=>
'get'
]],
'inviteList/:id'
=>
[
'api/member/inviteList'
,
[
'method'
=>
'get'
]],
//邀请记录
//post member
//post member
'login'
=>
[
'api/member/login'
,[
'method'
=>
'post'
]],
//c端登陆
'login'
=>
[
'api/member/login'
,[
'method'
=>
'post'
]],
//c端登陆
'register'
=>
[
'api/member/register'
,[
'method'
=>
'post'
]],
//注册|邀请注册|编辑
'register'
=>
[
'api/member/register'
,[
'method'
=>
'post'
]],
//注册|邀请注册|编辑
...
...
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