Merge branch 'zhaoyue-dev4' into 'master'

Fix little unbind bug



See merge request !57

@@ -2,7 +2,7 @@ git pull
 git add --all src/main/java/*
 git add --all src/main/java/*
 git add push.sh
 git add push.sh
 git add pom.xml
 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 master
 git push origin zhaoyue-dev4
 git push origin zhaoyue-dev4
 git status
 git status

@@ -88,8 +88,13 @@ public class OpenIdController {
     @ApiImplicitParams({
     @ApiImplicitParams({
             @ApiImplicitParam(name = "authorization", value = "请输入登录返回信息：userId_tokens", required = true, dataType = "string", paramType = "header"),
             @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) {
                                                     @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"))
         if (!(boolean) request.getAttribute("signAspect"))
             return new ResponseEntity<>(ResultModel.error(ResultStatus.SIGN_ERROR), HttpStatus.OK);
             return new ResponseEntity<>(ResultModel.error(ResultStatus.SIGN_ERROR), HttpStatus.OK);