短信验证码bug修改

business/sms-service/src/main/java/com/yihu/jw/sms/dao/BaseSmsDao.java

@@ -18,6 +18,6 @@ public interface BaseSmsDao extends PagingAndSortingRepository<SmsDO, String>, J
    boolean existsByCaptchaAndDeadlineAfter(String captcha, Date now);
    @Query("select a from SmsDO a where a.mobile = ?1 and a.captcha = ?2 and a.type = ?3")
    Page<SmsDO> findByCaptcha(String mobile, String captcha, SmsTemplateDO.Type type, Pageable pageRequest);
    @Query("select a from SmsDO a where a.mobile = ?1  and a.type = ?2")
    Page<SmsDO> findByCaptcha(String mobile, SmsTemplateDO.Type type, Pageable pageRequest);
}

business/sms-service/src/main/java/com/yihu/jw/sms/service/BaseSmsService.java

@@ -46,7 +46,7 @@ public class BaseSmsService extends BaseJpaService<SmsDO, BaseSmsDao>{
        // 分页信息
        PageRequest pageRequest = new PageRequest(0, 1, sort);
        SmsTemplateDO.Type value = SmsTemplateDO.valueOf(type);
        Page<SmsDO> page = baseSmsDao.findByCaptcha(mobile, captcha, value, pageRequest);
        Page<SmsDO> page = baseSmsDao.findByCaptcha(mobile, value, pageRequest);
        SmsDO sms = null;
        for (SmsDO temp : page) {
            if (temp != null) {
@@ -58,8 +58,8 @@ public class BaseSmsService extends BaseJpaService<SmsDO, BaseSmsDao>{
        if (sms == null) {
            // 验证码错误
            return -1;
        } else if (type != sms.getType().ordinal()){
            // 验证码无效，也视为错误
        } else if (!sms.getCaptcha().equalsIgnoreCase(captcha)){
            // 验证码错误
            return -1;
        } else if (sms.getDeadline().before(new Date())) {
            // 验证码过期