Commit e1b8ae09c9d914afe333a329abb46fbe861c4697

Authored by xingyu
1 parent 5addfbbb

增加手机号正则验证

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java
... ... @@ -17,16 +17,15 @@ import java.util.regex.Pattern;
17 17 */
18 18 public class ValidationUtils {
19 19  
  20 + private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[189]))\\d{8}$");
  21 +
20 22 private static final Pattern PATTERN_URL = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
21 23  
22 24 private static final Pattern PATTERN_XML_NCNAME = Pattern.compile("[a-zA-Z_][\\-_.0-9_a-zA-Z$]*");
23 25  
24 26 public static boolean isMobile(String mobile) {
25   - if (StrUtil.length(mobile) != 11) {
26   - return false;
27   - }
28   - // TODO 芋艿,后面完善手机校验
29   - return true;
  27 + return StringUtils.hasText(mobile)
  28 + && PATTERN_MOBILE.matcher(mobile).matches();
30 29 }
31 30  
32 31 public static boolean isURL(String url) {
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java
... ... @@ -53,9 +53,8 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
53 53 "lrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZ" +
54 54 "ikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB");
55 55  
56   - // TODO @tina:= 前后要有空格哈
57 56 @InjectMocks
58   - AlipayQrPayClient client=new AlipayQrPayClient(10L,config);
  57 + AlipayQrPayClient client = new AlipayQrPayClient(10L,config);
59 58  
60 59 @Mock
61 60 private DefaultAlipayClient defaultAlipayClient;
... ...