添加电话校验

framework/src/main/java/cn/lili/common/validation/Phone.java

@@ -1,6 +1,6 @@
 package cn.lili.common.validation;
 
-import cn.lili.common.validation.impl.MobileValidator;
+import cn.lili.common.validation.impl.PhoneValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -19,8 +19,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER})
 @Retention(RUNTIME)
 @Documented
-@Constraint(validatedBy = {MobileValidator.class})
-public @interface Mobile {
+@Constraint(validatedBy = {PhoneValidator.class})
+public @interface Phone {
 
     String regexp() default "1[3|4|5|7|8]\\d{9}";
 

framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java

@@ -1,6 +1,6 @@
 package cn.lili.common.validation.impl;
 
-import cn.lili.common.validation.Mobile;
+import cn.lili.common.validation.Phone;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -8,7 +8,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-public class MobileValidator implements ConstraintValidator<Mobile, String> {
+public class PhoneValidator implements ConstraintValidator<Phone, String> {
 
     private static Pattern pattern = Pattern.compile("^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$");
 
@@ -19,7 +19,7 @@ public class MobileValidator implements ConstraintValidator<Mobile, String> {
     }
 
     @Override
-    public void initialize(Mobile constraintAnnotation) {
+    public void initialize(Phone constraintAnnotation) {
 
     }
 }

framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java

@@ -201,7 +201,7 @@ public class WechatLivePlayerUtil {
         log.info("微信小程序请求结果：" + content);
         //获取请求内容，如果token过期则重新获取，如果出错则抛出错误
         JSONObject jsonObject = new JSONObject(content);
-        if (jsonObject.get("errcode").equals("0")) {
+        if (jsonObject.get("errcode").toString().equals("0")) {
             return jsonObject;
         } else if (jsonObject.get("errcode").equals("40001")) {
             wechatAccessTokenUtil.removeAccessToken(ClientTypeEnum.WECHAT_MP);

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.member.entity.dos;
 
 import cn.lili.base.BaseEntity;
-import cn.lili.common.validation.Mobile;
+import cn.lili.common.validation.Phone;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +34,7 @@ public class MemberAddress extends BaseEntity {
     @ApiModelProperty(value = "收货人姓名")
     private String name;
 
-    @Mobile
+    @Phone
     @ApiModelProperty(value = "手机号码")
     private String mobile;
 

framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dto;
 
-import cn.lili.common.validation.Mobile;
+import cn.lili.common.validation.Phone;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,7 +20,7 @@ public class MemberAddressDTO {
     @ApiModelProperty(value = "收货人姓名")
     private String consigneeName;
 
-    @Mobile
+    @Phone
     @ApiModelProperty(value = "手机号码")
     private String consigneeMobile;
 

framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java

@@ -4,6 +4,7 @@ package cn.lili.modules.store.entity.dos;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.lili.common.validation.Mobile;
+import cn.lili.common.validation.Phone;
 import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -93,7 +94,7 @@ public class StoreDetail {
     private String linkName;
 
     @NotBlank(message = "手机号不能为空")
-    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
+    @Phone
     @ApiModelProperty(value = "联系人电话")
     private String linkPhone;
 

framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.store.entity.dto;
 
+import cn.lili.common.validation.Mobile;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,6 +58,7 @@ public class AdminStoreApplyDTO {
     @ApiModelProperty(value = "公司名称")
     private String companyName;
 
+    @Mobile
     @ApiModelProperty(value = "公司电话")
     private String companyPhone;