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
9fa35eec
Commit
9fa35eec
authored
Sep 28, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
f4eb0608
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
User.php
application/controllers/User.php
+2
-2
No files found.
application/controllers/User.php
View file @
9fa35eec
...
@@ -118,7 +118,7 @@ class UserController extends \Our\Controller_AbstractIndex {
...
@@ -118,7 +118,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$this
->
sess
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$this
->
sess
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$this
->
memberService
->
saveMember
(
$member
);
$this
->
memberService
->
saveMember
(
$member
);
$this
->
success
(
array
(
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
]));
$this
->
success
(
array
(
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
]
,
'member_id'
));
}
}
ErrorModel
::
throwException
(
CodeConfigModel
::
registerMemberFailed
);
ErrorModel
::
throwException
(
CodeConfigModel
::
registerMemberFailed
);
}
}
...
@@ -141,7 +141,7 @@ class UserController extends \Our\Controller_AbstractIndex {
...
@@ -141,7 +141,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$member
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
'login_time'
]
=
TIMESTAMP
;
$member
[
'login_time'
]
=
TIMESTAMP
;
$this
->
memberService
->
saveMember
(
$member
);
$this
->
memberService
->
saveMember
(
$member
);
$this
->
success
(
array
(
'userFlag'
=>
\Our\ApiConst
::
one
,
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
],
'memberId'
=>
$member
[
'memberI
d'
]));
$this
->
success
(
array
(
'userFlag'
=>
\Our\ApiConst
::
one
,
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
],
'memberId'
=>
(
int
)
$member
[
'member_i
d'
]));
}
else
{
}
else
{
$this
->
success
(
array
(
'userFlag'
=>
\Our\ApiConst
::
zero
));
$this
->
success
(
array
(
'userFlag'
=>
\Our\ApiConst
::
zero
));
}
}
...
...
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