BY-Team
/
ad-callback
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[新增功能](master): 修复一个BUG

Browse Source 
1. imei判断的bug
master
土豆兄弟 3 years ago
parent c342609bce
commit f03daeed2b
5 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File

29
src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackAPI.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.baiyee.adcallback.api.callback;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baiyee.adcallback.api.common.CommonResponse; import com.baiyee.adcallback.api.common.CommonResponse;
import com.baiyee.adcallback.api.common.ResponseCode; import com.baiyee.adcallback.api.common.ResponseCode;
import com.baiyee.adcallback.api.vo.*; import com.baiyee.adcallback.api.vo.*;
@ -83,11 +84,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [not right imei data ,{} ] =================================", vo); log.error("================================= [not right imei data ,vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, julaingMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, julaingMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
JlBackdataDTO jlBackdataDTO = new JlBackdataDTO(); JlBackdataDTO jlBackdataDTO = new JlBackdataDTO();
JlBackdataConvert.voCovertToDTO(vo, jlBackdataDTO); JlBackdataConvert.voCovertToDTO(vo, jlBackdataDTO);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave(); adOriginalityManageService.handleMonitorUrlCallbackDataThenSave();
@ -151,11 +152,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [not right imei data ,{} ] =================================", vo); log.error("================================= [not right imei data ,vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, baiduMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, baiduMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
BdBackdataDTO bdBackdataDTO = new BdBackdataDTO(); BdBackdataDTO bdBackdataDTO = new BdBackdataDTO();
BdBackdataConvert.voCovertToDTO(vo, bdBackdataDTO); BdBackdataConvert.voCovertToDTO(vo, bdBackdataDTO);
@ -214,11 +215,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [not right imei data ,{} ] =================================", vo); log.error("================================= [not right imei data ,vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, ucMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, ucMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
UcBackdataDTO ucBackdataDTO = new UcBackdataDTO(); UcBackdataDTO ucBackdataDTO = new UcBackdataDTO();
UcBackdataConvert.voCovertToDTO(vo, ucBackdataDTO); UcBackdataConvert.voCovertToDTO(vo, ucBackdataDTO);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave2(); adOriginalityManageService.handleMonitorUrlCallbackDataThenSave2();
@ -279,11 +280,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [not right imei data ,{} ] =================================", vo); log.error("================================= [not right imei data ,vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
KuaiShouBackdataDTO kuaiShouBackdataDTO = new KuaiShouBackdataDTO(); KuaiShouBackdataDTO kuaiShouBackdataDTO = new KuaiShouBackdataDTO();
KuaiShouBackdataConvert.voCovertToDTO(vo, kuaiShouBackdataDTO); KuaiShouBackdataConvert.voCovertToDTO(vo, kuaiShouBackdataDTO);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave3(); adOriginalityManageService.handleMonitorUrlCallbackDataThenSave3();
@ -347,11 +348,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [not right imei data ,{} ] =================================", vo); log.error("================================= [not right imei data , vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, vivoMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
VivoBackdataDTO vivoBackdataDTO = new VivoBackdataDTO(); VivoBackdataDTO vivoBackdataDTO = new VivoBackdataDTO();
VivoBackdataConvert.voCovertToDTO(vo, vivoBackdataDTO); VivoBackdataConvert.voCovertToDTO(vo, vivoBackdataDTO);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave4(); adOriginalityManageService.handleMonitorUrlCallbackDataThenSave4();
@ -451,11 +452,11 @@ public class MobileMonitorCallbackAPI {
} }
// 请求过滤规则,过滤掉不用的数据 // 请求过滤规则,过滤掉不用的数据
if (preRuleForReq(vo)) { if (preRuleForReq(vo)) {
log.error("================================= [gdtMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, not right imei data ,{} ] =================================", vo); log.error("================================= [gdtMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, not right imei data ,{} ] =================================", JSONUtil.toJsonStr(vo));
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
setTag(tag, vo); setTag(tag, vo);
log.info("================================= [one request comming, gdtMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo is {} ] =================================", vo); log.info("================================= [one request comming, gdtMonitorUrlCallbackReqUrl|MobileMonitorCallbackAPI, vo json is {} ] =================================", JSONUtil.toJsonStr(vo));
GdtBackdataDTO dto = new GdtBackdataDTO(); GdtBackdataDTO dto = new GdtBackdataDTO();
GdtBackdataConvert.voCovertToDTO(vo, dto); GdtBackdataConvert.voCovertToDTO(vo, dto);
adOriginalityManageService.handleMonitorUrlCallbackDataThenSave5(); adOriginalityManageService.handleMonitorUrlCallbackDataThenSave5();
@ -470,12 +471,12 @@ public class MobileMonitorCallbackAPI {
*/ */
private boolean preRuleForReq(GdtMobileMonitorCallbackRequestVO vo) { private boolean preRuleForReq(GdtMobileMonitorCallbackRequestVO vo) {
String imei = vo.getImei(); String imei = vo.getMuid();
if (StrUtil.isBlank(imei)) { if (StrUtil.isBlank(imei)) {
return Boolean.TRUE; return Boolean.TRUE;
} }
if (StrUtil.isNotBlank(imei) && StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) { if (StrUtil.isNotBlank(imei) || StrUtil.equalsIgnoreCase(IMEI_TAG, imei)) {
return Boolean.TRUE; return Boolean.TRUE;
} }
return Boolean.FALSE; return Boolean.FALSE;

2
src/main/java/com/baiyee/adcallback/api/vo/VivoMobileMonitorCallbackRequestVO.java
Unescape Escape View File

@ -56,5 +56,5 @@ public class VivoMobileMonitorCallbackRequestVO extends MobileMonitorCallbackReq
private String netType; private String netType;
private Long ts; private Long ts;
} }

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -6,7 +6,7 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://118.178.137.129:3306/db_ad?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true url: jdbc:mysql://localhost/db_ad?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true
username: root username: root
password: root password: root
# 初始连接数 # 初始连接数

4
src/main/resources/logback.xml
Unescape Escape View File

@ -77,7 +77,7 @@
<root level="INFO"> <root level="INFO">
<!-- TODO prod 环境去掉std --> <!-- TODO prod 环境去掉std -->
<!-- <appender-ref ref="stdAppender"/>--> <appender-ref ref="stdAppender"/>
<appender-ref ref="fileAppender"/> <!-- <appender-ref ref="fileAppender"/>-->
</root> </root>
</configuration> </configuration>

42
src/test/java/com/baiyee/adcallback/AdCallbackApplicationTests.java
Unescape Escape View File

@ -1,9 +1,17 @@
package com.baiyee.adcallback; package com.baiyee.adcallback;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class AdCallbackApplicationTests { public class AdCallbackApplicationTests {
static class User{ static class User {
private String name; private String name;
private Integer age; private Integer age;
@ -35,4 +43,36 @@ public class AdCallbackApplicationTests {
} }
@Test
public void test1() {
String str1 = "__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__&qz_gdt=__QZ_GDT__&tag=jl-wxtm-cfyldy-001";
String str2 = "__RTA_EXP_ID__,__HASH_OAID__,__BOOST_EXP_INFO__,__PAGE_URL__,__USER_AGENT__,__REQUEST_ID__,__RTA_USER_WEIGHT_FACTOR__,__CLICK_TIME__,__RTA_DSP_TAG__,__AD_PLATFORM_TYPE__,__RTA_VALID_FEATURES__,__RTA_OUT_TARGET_ID__,__AD_ID__,__IPV6__,__CALLBACK__,__RTA_CPC_BID__,__ENCRYPTED_POSITION_ID__,__CLICK_ID__,__RTA_CPA_PRICE__,__ADGROUP_NAME__,__ADGROUP_ID__,__QAID_CAA__,__PROMOTED_OBJECT_TYPE__,__PKAM_EXP_IDS__,__HASH_ANDROID_ID__,__ONLY_VALUABLE_CLICK__,__DEVICE_OS_TYPE__,__SITE_SET_NAME__,__AGENCY_ID__,__PROCESS_TIME__,__SITE_SET__,__REAL_COST__,__ACCOUNT_ID__,__CLICK_SKU_ID__,__IP__,__MEDIUM_INDUSTRY__,__RTA_TRACE_ID__,__BILLING_EVENT__,__OAID__,__RTA_USER_WEIGHT__,__CREATIVE_TEMPLATE_ID__,__CAMPAIGN_ID__,__RTA_TARGET_ID__,__AD_TYPE__,__IMPRESSION_ID__,__MUID__,__QZ_GDT__,__BOOST_MODEL_ID__";
List<String> split1 = StrUtil.split(str1, "&");
List<String> pre = new ArrayList<>();
for (String one : split1) {
pre.add(StrUtil.subAfter(one, "=", true));
}
for (String s : pre) {
if (!StrUtil.contains(str2, s)){
System.out.println(s);
}
}
// for (String one : split) {
// if (!StrUtil.contains(str1, one)){
// System.out.println(one);
// }
// }
}
} }

Write Preview
Loading…
Cancel
Save