diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index efaa52f5b..3adf70465 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -46,7 +46,8 @@ public class RequestInterceptor extends HandlerInterceptorAdapter { if(url.contains("pvlog") || url.contains("awsFileUpload") || url.contains("cimgUpload") - || url.contains("ueditor/exec")) { + || url.contains("ueditor/exec") + || url.contains("/wxCUserBasicInfo/importTemplate")) { // pvlog不检查幂等 // awsFileUpload不检查幂等 // ueditor 不检查幂等 diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java index 9df810a27..e22fa2e31 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import javax.persistence.Transient; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.Serializable; public class CUserBaseInfoT implements Serializable { @@ -19,6 +20,7 @@ public class CUserBaseInfoT implements Serializable { @Excel(name="手机号",width = 20,orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="微信用户绑定的手机号",name="phone") @NotNull + @Pattern(regexp = "1[34578]\\d{9}", message = "手机号不正确") private String phone; /**用户昵称**/ @Excel(name="微信昵称",width = 20,orderNum = "4") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index acc98d9d7..ab046fef4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -514,12 +514,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { final IdWorker idWorker = IdWorker.get(); ImportParams params = new ImportParams(); - IExcelDataHandler handler = new UserExcelHandler(); - handler.setNeedHandlerFields(new String[]{"姓名", "性别", "手机号", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值"});// 注意这里对应的是excel的列名。也就是对象上指定的列名。 - params.setDataHandler(handler); + //IExcelDataHandler handler = new UserExcelHandler(); + //handler.setNeedHandlerFields(new String[]{"姓名", "性别", "手机号", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值"});// 注意这里对应的是excel的列名。也就是对象上指定的列名。 + //params.setDataHandler(handler); //params.setVerifyHandler(); // 需要验证 - params.setNeedVerfiy(true); + params.setImportFields(new String[]{"姓名", "性别", "手机号", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值"}); + params.setNeedVerify(true); try { diff --git a/pom.xml b/pom.xml index 5f4d3421a..706ac09fd 100644 --- a/pom.xml +++ b/pom.xml @@ -260,14 +260,7 @@ cn.afterturn easypoi-spring-boot-starter - 3.3.0 - - - - - org.apache.poi - poi-ooxml-schemas - 3.15 + 4.0.0