Merge remote-tracking branch 'origin/master'

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,9 @@ 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.isBlank(imei) || StrUtil.equalsIgnoreCase(IMEI_TAG, imei) || StrUtil.equalsIgnoreCase(IMEI_NULL_TAG,imei)) {
             return Boolean.TRUE;
         }
         return Boolean.FALSE;

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;
 

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";
+
 
 }

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;
 

src/main/java/com/baiyee/adcallback/service/impl/GenerateServiceImpl.java

@@ -25,7 +25,7 @@ public class GenerateServiceImpl implements GenerateService {
         String JL = "/api/jl/monitor?aid=__AID__&cid=__CID__&ctype=__CTYPE__&csite=__CSITE__&imei=__IMEI__&idfa=__IDFA__&oaid=__OAID__&os=__OS__&mac=__MAC__&mac1=__MAC1__&ip=__IP__&geo=__GEO__&TIMESTAMP=__TS__&callback_url=__CALLBACK_URL__&model=__MODEL__&caid1=__CAID1__&tag=";
         String BD = "/api/bd/monitor?userid=__USER_ID__&aid=__IDEA_ID__&pid=__PLAN_ID__&uid=__UNIT_ID__&callback_url=__CALLBACK_URL__&click_id=__CLICK_ID__&idfa=__IDFA__&imei_md5=__IMEI__&oaid=__OAID__&mac=__MAC__&ip=__IP__&os=__OS__&ts=__TS__&device_info=__DEVICE_INFO__&tag=";
         String UC = "/api/uc/monitor?imei={IMEI_SUM1}&oaid={OAID}&time={TS}&callback={CALLBACK_URL}&androidid={ANDROIDID_SUM1}&mac={MAC_SUM2}&ip={IP}&ua={UA}&acid={ACID}&gid={GID}&aid={AID}&cid={CID}&tag=";
-        String GDT = "/api/gdt/monitor?click_id=__CLICK__ID__&click_time=__CLICK__TIME__&impression_time=__IMPRESSION__TIME__&campaign_id=__CAMPAIGN__ID__&adgroup_id=__ADGROUP__ID__&ad_id=__AD__ID__&ad_platform_type=__AD__PLATFORM__TYPE__&ad_type=__AD__TYPE__&account_id=__ACCOUNT__ID__&agency_id=__AGENCY__ID__&click_sku_id=__CLICK__SKU__ID__&billing_event=__BILLING__EVENT__&deeplink_url=__DEEPLINK__URL__&universal_link=__UNIVERSAL__LINK__&page_url=__PAGE__URL__&device_os_type=__DEVICE__OS__TYPE__&process_time=__PROCESS__TIME__&promoted_object_id=__PROMOTED__OBJECT__ID__&promoted_object_type=__PROMOTED__OBJECT__TYPE__&real_cost=__REAL__COST__&request_id=__REQUEST__ID__&impression_id=__IMPRESSION__ID__&muid=__MUID__&hash_android_id=__HASH__ANDROID__ID__&ip=__IP__&user_agent=__USER__AGENT__&callback=__CALLBACK__&encrypted_position_id=__ENCRYPTED__POSITION__ID__&hash_oaid=__HASH__OAID__&caid=__CAID__&adgroup_name=__ADGROUP__NAME__&site_set_name=__SITE__SET__NAME__&campaign_name=__CAMPAIGN__NAME__&ad_name=__AD__NAME__&model=__MODEL__&tag=";
+        String GDT = "/api/gdt/monitor?click_id=__CLICK_ID__&click_time=__CLICK_TIME__&campaign_id=_CAMPAIGN_ID__&adgroup_id=__ADGROUP_ID__&ad_id=__AD_ID__&muid=__MUID__&hash_android_id=__HASH_ANDROID_ID__&hash_mac=__HASH_MAC__&oaid=__OAID__&hash_oaid=__HASH_OAID__&ip=__IP__&user_agent=__USER_AGENT__&account_id=__ACCOUNT_ID__&promoted_object_type=__PROMOTED_OBJECT_TYPE__&device_os_type=__DEVICE_OS_TYPE__&callback=__CALLBACK__&tag=";
         String KS = "/api/ks/monitor?&accountid=__ACCOUNTID__&aid=__AID__&cid=__CID__&did=__DID__&dname=__DNAME__&imeiMD5=__IMEI2__&oaid=__OAID__&mac=__MAC2__&androidid=__ANDROIDID2__&os=__OS__&ts=__TS__&ip=__IP__&ua=__UA__&csite=__CSITE__&model=__MODEL__&ac_creative=__AC_CREATIVE__&tag=";
         String VIVO = "/api/vivo/monitor?os=__OS__&ip=__IP__&oaid=__OAID__&oaidplain=__OAIDPLAIN__&ua=__UA__&androidid=__ANDROIDID__&location=__LOCATION__&requestid=__REQUESTID__&requesttime=__REQUESTTIME__&advertiserid=__ADVERTISERID__&adname=__ADNAME__&creativeid=__CREATIVEID__&osversion=__OSVERSION__&model=__MODEL__&lang=__LANG__&resolution=__RESOLUTION__&nettype=__NETTYPE__&ts=__TS__&tag=";
         String generateDmp;

src/test/java/com/baiyee/adcallback/AdCallbackApplicationTests.java

@@ -1,13 +1,38 @@
 package com.baiyee.adcallback;
 
-import org.junit.jupiter.api.Test;
+import cn.hutool.json.JSONUtil;
-import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+public class AdCallbackApplicationTests {
-class AdCallbackApplicationTests {
+    static class User{
+        private String name;
+        private Integer age;
 
-    @Test
+        public String getName() {
-    void contextLoads() {
+            return name;
         }
 
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+    }
+
+    public static void main(String[] args) {
+
+        User user = new User();
+        user.setName("123");
+        user.setAge(0);
+
+
+        System.out.println(JSONUtil.toJsonStr(user));
+    }
+
+
 }