Commit 23b74bb0 by java-李谡

修改了登录验证,除了几个测试账号外,其他账号验证全部走首航

parent eedea14a
......@@ -138,19 +138,19 @@ public class UserController {
if (message == null) {
LoginUserEntity userEntity = userService.findUserByLoginName(loginBean);
if(userEntity == null){// 查询不到用户信息
responseBean.setStatus(ErrorCode.STATUS_CODE_4102);
responseBean.setMessage("用户名不存在");
long endTime = System.nanoTime();
long duration = endTime - startTime;
LOG.debug("[UserController login][STATUS_CODE_4102]总共用时:"+Util.getDurationTime(duration));
return responseBean;
} else if (GConstants.NO.equals(userEntity.getLoginFlag())) {// 用户被查封
responseBean.setStatus(ErrorCode.STATUS_CODE_4101);
responseBean.setMessage("该帐号已禁止登录");
long endTime = System.nanoTime();
long duration = endTime - startTime;
LOG.debug("[UserController login][STATUS_CODE_4101]总共用时:"+Util.getDurationTime(duration));
......@@ -158,13 +158,24 @@ public class UserController {
} else if (!"2".equals(userEntity.getUserType()) && !"4".equals(userEntity.getUserType())) { //不是内部联系人 通讯录联系人不允许登陆
responseBean.setStatus(ErrorCode.STATUS_CODE_4101);
responseBean.setMessage("当前用户类型不允许登陆,请联系系统管理员");
long endTime = System.nanoTime();
long duration = endTime - startTime;
LOG.debug("[UserController login][STATUS_CODE_4101]总共用时:"+Util.getDurationTime(duration));
return responseBean;
} else if ( userService.validateServerPassword(loginBean) == false
&& Util.validatePassword(loginBean.getPassword(), userEntity.getPassword()) == false) {// 用户密码不匹配
}
boolean passwordError = false;
//只开放几个测试账号密码验证走数据库,其他的通过首航接口去验证
if((loginBean.getLoginName().equals("dongb") || loginBean.getLoginName().equals("tianyz") || loginBean.getLoginName().equals("wangzl") || loginBean.getLoginName().equals("wtfk1"))){
if(!Util.validatePassword(loginBean.getPassword(), userEntity.getPassword())){
passwordError = true;
}
}else{
if (!userService.validateServerPassword(loginBean)){
passwordError = true;
}
}
if (passwordError){
responseBean.setStatus(ErrorCode.STATUS_CODE_4103);
responseBean.setMessage("用户名密码不匹配!");
......@@ -172,8 +183,7 @@ public class UserController {
long duration = endTime - startTime;
LOG.debug("[UserController login][STATUS_CODE_4103]总共用时:"+Util.getDurationTime(duration));
return responseBean;
}
else {
} else {
if(StringUtils.isNotBlank(loginBean.getVerifyCode())){// 校验码登录
MobileVerifyEntity entity = mobileVerifyService.getVerifyCode(loginBean.getLoginName(), loginBean.getVerifyCode());
if(entity == null){// 校验码不存在
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment