Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fangyeqing
/
xkl-interface
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
zhaoyue
8 years ago
Commit
8094aba73c62ff26df1d52225860af9bf4db2407
1 parent
53a78ea4
Add openid login return token;unbind pwd is necessary
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
src/main/java/com/xkl/authorization/model/TokenModel.java
src/main/java/com/xkl/controller/OpenIdController.java
src/main/java/com/xkl/controller/TokenController.java
src/main/java/com/xkl/authorization/model/TokenModel.java
View file @
8094aba
...
...
@@ -17,7 +17,7 @@ public class TokenModel {
private
String
token
;
//使用openId 登录时,会返回该用户openid对应的account。
private
String
account
;
private
String
username
;
public
TokenModel
(
String
userId
,
String
token
)
{
this
.
userId
=
userId
;
...
...
@@ -40,11 +40,11 @@ public class TokenModel {
this
.
token
=
token
;
}
public
String
getAccount
()
{
return
account
;
public
String
getUsername
()
{
return
username
;
}
public
void
setAccount
(
String
account
)
{
this
.
account
=
account
;
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
}
...
...
src/main/java/com/xkl/controller/OpenIdController.java
View file @
8094aba
...
...
@@ -122,7 +122,7 @@ public class OpenIdController {
TokenModel
model
=
tokenManager
.
createToken
(
String
.
valueOf
(
accountId
));
User
user
=
userRepository
.
findOne
(
accountId
);
if
(
user
.
isStatus
()
==
true
)
{
model
.
set
Account
(
user
.
getLoginAccount
());
model
.
set
Username
(
user
.
getLoginAccount
());
return
new
ResponseEntity
<>(
ResultModel
.
ok
(
model
),
HttpStatus
.
OK
);
}
else
{
return
new
ResponseEntity
<>(
ResultModel
.
error
(
ResultStatus
.
USER_NOT_FOUND
),
HttpStatus
.
OK
);
...
...
src/main/java/com/xkl/controller/TokenController.java
View file @
8094aba
...
...
@@ -54,7 +54,7 @@ public class TokenController {
}
//生成一个token,保存用户登录状态
TokenModel
model
=
tokenManager
.
createToken
(
String
.
valueOf
(
user
.
getId
()));
model
.
set
Account
(
user
.
getLoginAccount
());
model
.
set
Username
(
user
.
getLoginAccount
());
return
new
ResponseEntity
<>(
ResultModel
.
ok
(
model
),
HttpStatus
.
OK
);
}
...
...
Please
register
or
login
to post a comment