From 806528af1ca3d09930c1bb4fa0579415fd982b4e Mon Sep 17 00:00:00 2001 From: limqhz Date: Sun, 6 Jun 2021 23:15:27 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LoginRegisterServiceImpl.java | 7 ++--- .../com/common/utils/VenueValidateUtils.java | 26 +++++++++++++++++++ oms/oms-h5/src/views/venue/lesson/index.vue | 15 ++++++++--- .../com/sv/service/api/MemberService.java | 5 ++-- .../com/sv/service/common/SmsService.java | 9 ++++--- .../com/sv/service/oms/MemberService.java | 5 ++-- 6 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 entity/src/main/java/com/common/utils/VenueValidateUtils.java diff --git a/api/src/main/java/com/sv/api/service/impl/LoginRegisterServiceImpl.java b/api/src/main/java/com/sv/api/service/impl/LoginRegisterServiceImpl.java index cce99fb..2790ae8 100644 --- a/api/src/main/java/com/sv/api/service/impl/LoginRegisterServiceImpl.java +++ b/api/src/main/java/com/sv/api/service/impl/LoginRegisterServiceImpl.java @@ -1,5 +1,6 @@ package com.sv.api.service.impl; +import com.common.utils.VenueValidateUtils; import com.enums.MemberAuthTypeEnum; import com.enums.MemberStatusEnum; import com.sv.api.context.PlatformContext; @@ -66,7 +67,7 @@ public class LoginRegisterServiceImpl extends BaseServiceImpl { @Transactional public MemberTokenDTO registerByMobile(String mobile,String captcha,String name,Integer sex,Integer age,String address){ ValidationUtils.assertNotBlank(mobile, "请输入手机号码"); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); ValidationUtils.assertNotNull(captcha); // 校验验证码是否正确 @@ -102,7 +103,7 @@ public class LoginRegisterServiceImpl extends BaseServiceImpl { public MemberTokenDTO loginByMobile(String mobile, String captcha){ // 参数校验 ValidationUtils.assertNotBlank(mobile, "请输入手机号码"); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); ValidationUtils.assertNotBlank(captcha, "请输入验证码"); // 校验验证码是否正确 captchaCacheService.assertCaptcha(mobile, ApiConstants.LOGIN_SMS_CAPTCHA_PREFIX, captcha); @@ -218,7 +219,7 @@ public class LoginRegisterServiceImpl extends BaseServiceImpl { public MemberTokenDTO bildMobile(BindMobileDTO bindMobileDTO){ // 参数校验 ValidationUtils.assertNotBlank(bindMobileDTO.getMobile(), "请输入手机号码"); - ValidationUtils.assertMobile(bindMobileDTO.getMobile()); + VenueValidateUtils.assertMobile(bindMobileDTO.getMobile()); ValidationUtils.assertNotNull(bindMobileDTO.getNickname()); ValidationUtils.assertNotNull(bindMobileDTO.getAvatar()); ValidationUtils.assertNotNull(bindMobileDTO.getOpenId()); diff --git a/entity/src/main/java/com/common/utils/VenueValidateUtils.java b/entity/src/main/java/com/common/utils/VenueValidateUtils.java new file mode 100644 index 0000000..81d1928 --- /dev/null +++ b/entity/src/main/java/com/common/utils/VenueValidateUtils.java @@ -0,0 +1,26 @@ +package com.common.utils; + +import com.ydd.framework.core.exception.ExceptionCodeTemplate; +import com.ydd.framework.core.exception.ServiceException; +import org.apache.commons.lang3.StringUtils; + +import java.util.regex.Pattern; + +/** + * replace jar Validate + */ +public class VenueValidateUtils { + public static boolean isMobile(String mobile) { + if (StringUtils.isNotBlank(mobile)) { + Pattern pattern = Pattern.compile("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$"); + return pattern.matcher(mobile).matches(); + } else { + return false; + } + } + public static void assertMobile(String mobile) { + if (!StringUtils.isBlank(mobile) && !isMobile(mobile)) { + throw new ServiceException(ExceptionCodeTemplate.INVALID_MOBILE); + } + } +} diff --git a/oms/oms-h5/src/views/venue/lesson/index.vue b/oms/oms-h5/src/views/venue/lesson/index.vue index 7f938fb..e0176d6 100644 --- a/oms/oms-h5/src/views/venue/lesson/index.vue +++ b/oms/oms-h5/src/views/venue/lesson/index.vue @@ -129,7 +129,9 @@
选择复制起期： @@ -137,7 +139,9 @@
选择复制止期： @@ -274,7 +278,7 @@ export default { return { disabledDate(time) { if (self.copyParam.rightDate && time.getTime() > Date.now()) { - return new Date(self.form.rightDate).getTime() < time.getTime() + return new Date(self.copyParam.rightDate).getTime() < new Date(time).getTime() } else { return time.getTime() < Date.now() } @@ -286,7 +290,10 @@ export default { return { disabledDate(time) { if (self.copyParam.leftDate) { - return new Date(self.copyParam.leftDate).getTime() > time.getTime() + if (new Date(self.copyParam.leftDate).getDate() === new Date(time).getDate()) { + return false + } + return new Date(self.copyParam.leftDate).getTime() > new Date(time).getTime() } else { return time.getTime() < Date.now() } diff --git a/service/src/main/java/com/sv/service/api/MemberService.java b/service/src/main/java/com/sv/service/api/MemberService.java index ca7ac8d..2833d5d 100644 --- a/service/src/main/java/com/sv/service/api/MemberService.java +++ b/service/src/main/java/com/sv/service/api/MemberService.java @@ -1,5 +1,6 @@ package com.sv.service.api; +import com.common.utils.VenueValidateUtils; import com.enums.MemberStatusEnum; import com.enums.MoneyLogEnum; import com.enums.PayTypeEnum; @@ -214,7 +215,7 @@ public class MemberService extends BaseServiceImpl { public Member createByMobile(String mobile, String name, Integer sex, Integer age, String address, Integer platformId) { // 参数校验 ValidationUtils.assertNotNull(mobile); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); // 验证手机号码是否存在 assertMobileNotUsed(mobile, null); @@ -433,7 +434,7 @@ public class MemberService extends BaseServiceImpl { } if (informationDTO.getMobile() != null) { - ValidationUtils.assertMobile(informationDTO.getMobile()); // 校验手机号码格式 + VenueValidateUtils.assertMobile(informationDTO.getMobile()); // 校验手机号码格式 ValidationUtils.assertNotNull(informationDTO.getCaptcha()); // 验证码不能为空 // 校验验证码是否正确 captchaCacheService.assertCaptcha(informationDTO.getMobile(), ApiConstants.UPDATE_PHONE_SMS_CAPTCHA_PREFIX, informationDTO.getCaptcha()); diff --git a/service/src/main/java/com/sv/service/common/SmsService.java b/service/src/main/java/com/sv/service/common/SmsService.java index 6fdbb9d..ab104be 100644 --- a/service/src/main/java/com/sv/service/common/SmsService.java +++ b/service/src/main/java/com/sv/service/common/SmsService.java @@ -1,6 +1,7 @@ package com.sv.service.common; import com.common.Sms; +import com.common.utils.VenueValidateUtils; import com.enums.SmsEnum; import com.github.pagehelper.PageHelper; import com.sv.exception.api.ExceptionCodeTemplate; @@ -69,7 +70,7 @@ public class SmsService extends BaseServiceImpl { @Transactional public void sendRegisterCaptcha(String mobile, Integer type) { ValidationUtils.assertNotBlank(mobile, "请输入手机号码"); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); // 验证码手机号码是否存在 String prefix = ApiConstants.REGISTER_SMS_CAPTCHA_PREFIX; @@ -105,7 +106,7 @@ public class SmsService extends BaseServiceImpl { @Transactional public void sendLoginCaptcha(String mobile) { ValidationUtils.assertNotBlank(mobile, "请输入手机号码"); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); if (!memberService.isMobileExists(mobile, null)) { // 手机号码不存在 @@ -130,7 +131,7 @@ public class SmsService extends BaseServiceImpl { @Transactional public void sendUpdatePhoneCaptcha(String mobile) { ValidationUtils.assertNotBlank(mobile, "请输入手机号码"); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); if (memberService.isMobileExists(mobile, null)) { // 手机号码已存在 @@ -267,7 +268,7 @@ public class SmsService extends BaseServiceImpl { @Transactional public void record(String mobile, String content, SmsTypeEnum type, SmsStatusEnum status, SmsEnum platform) { ValidationUtils.assertNotNull(mobile, content, type, status, platform); - ValidationUtils.assertMobile(mobile); + VenueValidateUtils.assertMobile(mobile); // 保存短信内容 Sms sms = new Sms(); diff --git a/service/src/main/java/com/sv/service/oms/MemberService.java b/service/src/main/java/com/sv/service/oms/MemberService.java index c880684..a96b6a1 100644 --- a/service/src/main/java/com/sv/service/oms/MemberService.java +++ b/service/src/main/java/com/sv/service/oms/MemberService.java @@ -1,4 +1,5 @@ package com.sv.service.oms; +import com.common.utils.VenueValidateUtils; import com.github.pagehelper.PageHelper; import com.sv.dto.api.MemberTokenDTO; import com.sv.entity.MemberAuth; @@ -154,7 +155,7 @@ public class MemberService extends MemberCardCommonService { */ public void saveMember(Member member){ ValidationUtils.assertNotBlank(member.getMobile(), "请输入手机号码"); - ValidationUtils.assertMobile(member.getMobile()); + VenueValidateUtils.assertMobile(member.getMobile()); synchronized (member.getMobile()){ // 根据手机号码创建新用户 @@ -171,7 +172,7 @@ public class MemberService extends MemberCardCommonService { public Member createByMobile(Member member) { // 参数校验 ValidationUtils.assertNotNull(member.getMobile()); - ValidationUtils.assertMobile(member.getMobile()); + VenueValidateUtils.assertMobile(member.getMobile()); // 创建用户 String regEx = "[ _`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]|\n|\r|\t";