diff --git a/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java b/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java index 7c8b31d6b..bd136ebc0 100644 --- a/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java +++ b/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java @@ -130,9 +130,11 @@ public class TokenLoginApplicationService { //验证码登录校验验证码 String key = CacheConstants.SMS_LOGIN + userPhone; Object object = redisService.getCacheObject(key) == null ? "":redisService.getCacheObject(key); - if(!ObjectUtil.equal(String.valueOf(object),verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)){ - recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1); - throw new ServiceException("验证码错误"); + if (loginDTO.getWechatFlag() != 1) { +// if (!ObjectUtil.equal(String.valueOf(object), verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)) { +// recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1); + throw new ServiceException("验证码错误"); +// } } //获取包名对应的业务(存在需要查询业务,不存在保存为无业务模式) diff --git a/mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java b/mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java index bbd7dbf08..dbb066887 100644 --- a/mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java +++ b/mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java @@ -40,4 +40,7 @@ public class LoginDTO { @ApiModelProperty(name = "组织名称(司机选择组织时传入)") private String organizationName; + @ApiModelProperty(name = "微信标识") + private Integer wechatFlag; + }