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
e860e8f4
Commit
e860e8f4
authored
Nov 03, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
dd0f9144
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
User.php
application/modules/Client/controllers/User.php
+4
-4
No files found.
application/modules/Client/controllers/User.php
View file @
e860e8f4
...
@@ -59,7 +59,7 @@ class UserController extends \Our\Controller_AbstractIndex {
...
@@ -59,7 +59,7 @@ class UserController extends \Our\Controller_AbstractIndex {
// }
// }
// $userToken=$this->memberService->findMbUserTokenByMemberId($shopKeeperServvice['token']);
// $userToken=$this->memberService->findMbUserTokenByMemberId($shopKeeperServvice['token']);
if
(
$member
){
if
(
$member
){
$this
->
memberService
->
clearKey
(
$this
->
key
);
//
$this->memberService->clearKey($this->key);
$this
->
key
=
Common
::
bulidToken
(
$mobile
,
$password
);
$this
->
key
=
Common
::
bulidToken
(
$mobile
,
$password
);
session_id
(
$this
->
key
);
session_id
(
$this
->
key
);
$this
->
sess
[
'member_id'
]
=
(
int
)
$member
[
'member_id'
];
$this
->
sess
[
'member_id'
]
=
(
int
)
$member
[
'member_id'
];
...
@@ -72,9 +72,9 @@ class UserController extends \Our\Controller_AbstractIndex {
...
@@ -72,9 +72,9 @@ class UserController extends \Our\Controller_AbstractIndex {
$member
[
'seller_id'
]
=
$seller
[
'sellerId'
];
$member
[
'seller_id'
]
=
$seller
[
'sellerId'
];
$member
[
'seller_name'
]
=
$seller
[
'sellerName'
];
$member
[
'seller_name'
]
=
$seller
[
'sellerName'
];
//通知退出
//通知退出
//
$push=\Our\Push::getInstance();
$push
=
\Our\Push
::
getInstance
();
//
$push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>NameConst::logOut,'num'=>0,'params'=>array('c'=>'member','m'=>'logOut')));
$push
->
addOneToClient
(
array
(
'storeId'
=>
$member
[
'store_id'
],
'type'
=>
\Our\ApiConst
::
messageOtherLogin
,
'op'
=>
NameConst
::
logOut
,
'num'
=>
0
,
'params'
=>
array
(
'c'
=>
'member'
,
'm'
=>
'logOut'
)));
//
$push->sendTcpMessage();
$push
->
sendTcpMessage
();
$this
->
memberService
->
saveMember
(
$member
,
'seller'
);
$this
->
memberService
->
saveMember
(
$member
,
'seller'
);
$this
->
success
(
array
(
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberMobile'
=>
$member
[
'member_mobile'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
],
'memberId'
=>
(
int
)
$member
[
'member_id'
],
'storeId'
=>
(
int
)
$seller
[
'storeId'
]));
$this
->
success
(
array
(
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberMobile'
=>
$member
[
'member_mobile'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
],
'memberId'
=>
(
int
)
$member
[
'member_id'
],
'storeId'
=>
(
int
)
$seller
[
'storeId'
]));
}
else
{
}
else
{
...
...
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