diff --git a/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java b/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java index fbb43f1..1315f18 100644 --- a/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java +++ b/src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import static com.baiyee.adcallback.common.constant.JuliangConstant.IMEI_NULL_TAG; import static com.baiyee.adcallback.common.constant.JuliangConstant.IMEI_TAG; /** @@ -171,12 +172,12 @@ public class MobileMonitorCallbackAPI { */ private boolean preRuleForReq(BaiduMobileMonitorCallbackRequestVO vo) { - String imei = vo.getImeiMd5(); + String imei = vo.getImei(); if (StrUtil.isBlank(imei)) { return Boolean.TRUE; } - if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) { + if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei) && StrUtil.equalsIgnoreCase(IMEI_NULL_TAG,imei)) { return Boolean.TRUE; } return Boolean.FALSE; diff --git a/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java b/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java index 315051f..a3a080f 100644 --- a/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java +++ b/src/main/java/com/baiyee/adcallback/api/vo/BaiduMobileMonitorCallbackRequestVO.java @@ -32,7 +32,7 @@ public class BaiduMobileMonitorCallbackRequestVO extends MobileMonitorCallbackRe private String idfa; - private String imeiMd5; + private String imei; private String oaid; diff --git a/src/main/java/com/baiyee/adcallback/common/constant/JuliangConstant.java b/src/main/java/com/baiyee/adcallback/common/constant/JuliangConstant.java index b505fa7..9b67ca8 100644 --- a/src/main/java/com/baiyee/adcallback/common/constant/JuliangConstant.java +++ b/src/main/java/com/baiyee/adcallback/common/constant/JuliangConstant.java @@ -31,5 +31,7 @@ public class JuliangConstant { public static final String IMEI_TAG = "__IMEI__"; + public static final String IMEI_NULL_TAG = "NULL"; + } diff --git a/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java b/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java index fd1229a..49e9c20 100644 --- a/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java +++ b/src/main/java/com/baiyee/adcallback/config/pojo/BdBackdataDTO.java @@ -24,7 +24,7 @@ public class BdBackdataDTO implements Serializable { private String idfa; - private String imeiMd5; + private String imei; private String oaid;