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
d28ac2b997c8de3900f226a2e16bed09fc707108
1 parent
8094aba7
Fix little unbind bug
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
push.sh
src/main/java/com/xkl/controller/OpenIdController.java
push.sh
View file @
d28ac2b
...
...
@@ -2,7 +2,7 @@ git pull
git add --all src/main/java/
*
git add push.sh
git add pom.xml
git commit -m
"
Add openid login return token;unbind pwd is necessary
"
git commit -m
"
Fix little unbind bug
"
#git push origin master
git push origin zhaoyue-dev4
git status
...
...
src/main/java/com/xkl/controller/OpenIdController.java
View file @
d28ac2b
...
...
@@ -88,8 +88,13 @@ public class OpenIdController {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"authorization"
,
value
=
"请输入登录返回信息:userId_tokens"
,
required
=
true
,
dataType
=
"string"
,
paramType
=
"header"
),
})
public
ResponseEntity
<
ResultModel
>
openIdUnBind
(
HttpServletRequest
request
,
@CurrentUser
User
user
,
@RequestParam
String
openId
,
@RequestParam
int
openIdType
,
public
ResponseEntity
<
ResultModel
>
openIdUnBind
(
HttpServletRequest
request
,
@CurrentUser
User
user
,
@RequestParam
String
password
,
@RequestParam
String
openId
,
@RequestParam
int
openIdType
,
@RequestParam
String
sign
,
@RequestParam
long
t
,
@RequestParam
int
type
)
{
user
=
loginService
.
check
(
user
.
getLoginAccount
(),
password
);
if
(
user
==
null
)
{
//用户,密码错误
return
new
ResponseEntity
<>(
ResultModel
.
error
(
ResultStatus
.
USERNAME_OR_PASSWORD_ERROR
),
HttpStatus
.
OK
);
}
if
(!(
boolean
)
request
.
getAttribute
(
"signAspect"
))
return
new
ResponseEntity
<>(
ResultModel
.
error
(
ResultStatus
.
SIGN_ERROR
),
HttpStatus
.
OK
);
...
...
Please
register
or
login
to post a comment