Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
0a3fcecc
Commit
0a3fcecc
authored
Oct 23, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
扫码登录用户
parent
3fe5fd96
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
User.php
application/controllers/User.php
+10
-0
MemberService.php
application/models/Business/User/MemberService.php
+2
-2
No files found.
application/controllers/User.php
View file @
0a3fcecc
...
...
@@ -33,6 +33,11 @@ class UserController extends \Our\Controller_AbstractIndex {
$password
=
$data
[
NameConst
::
password
];
if
(
$this
->
memberService
->
checkUserNamePassWord
(
$mobile
,
$password
)){
$member
=
$this
->
memberService
->
getOneByMobileAndPassword
(
$mobile
,
$password
);
//第二步保存扫码会员信息
$result
=
$this
->
memberService
->
saveStoreMembers
(
$member
[
'member_id'
]);
if
(
!
$result
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saveStoreMemberFailed
);
}
/**
* 合并第三方授权信息
*/
...
...
@@ -132,6 +137,11 @@ class UserController extends \Our\Controller_AbstractIndex {
if
(
!
empty
(
$userToken
[
'token'
])){
$this
->
updateOldLoginKey
(
$userToken
[
'token'
]);
}
//第二步保存扫码会员信息
$result
=
$this
->
memberService
->
saveStoreMembers
(
$member
[
'member_id'
]);
if
(
!
$result
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saveStoreMemberFailed
);
}
$this
->
memberService
->
clearKey
(
$this
->
key
);
$this
->
key
=
Common
::
bulidToken
(
''
,
''
,
''
,
\Our\ApiConst
::
wechatDeviceType
);
session_id
(
$this
->
key
);
...
...
application/models/Business/User/MemberService.php
View file @
0a3fcecc
...
...
@@ -85,8 +85,8 @@ class MemberServiceModel extends \Business\AbstractModel
}
public
function
getOneByMobileAndPassword
(
$mobile
,
$password
)
{
//
$password=$this->getPassAddKey($password);
//
$password = Common::format('md5({0})');
// $password=$this->getPassAddKey($password);
// $password = Common::format('md5({0})');
$member
=
$this
->
memberDao
->
getOneByMobileAndPassword
(
$mobile
,
$password
);
return
$member
?
$member
:
false
;
}
...
...
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