...
|
...
|
@@ -111,14 +111,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher |
|
|
try {
|
|
|
clickUnion.info("enter clickUnion with param is {}", request);
|
|
|
//检查输入参数
|
|
|
// if (StringUtils.isEmpty(request.getAppid())) {
|
|
|
// log.warn("clickUnion error because appid is empty with param is {}", request);
|
|
|
// return new UnionResponse(201, "appid is empty");
|
|
|
// }
|
|
|
// if (StringUtils.isEmpty(request.getTd())) {
|
|
|
// log.warn("clickUnion error because td is empty with param is {}", request);
|
|
|
// return new UnionResponse(201, "td is empty");
|
|
|
// }
|
|
|
if (StringUtils.isEmpty(request.getUnion_type())) {
|
|
|
log.warn("clickUnion error because union_type is empty with param is {}", request);
|
|
|
return new UnionResponse(201, "union_type is empty");
|
...
|
...
|
@@ -127,7 +119,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher |
|
|
log.warn("clickUnion error because union_type is error with param is {}", request);
|
|
|
return new UnionResponse(201, "union_type is error");
|
|
|
}
|
|
|
// UnionTypeModel m = UnionConstant.unionTypeMap.get(Integer.parseInt(request.getUnion_type()));
|
|
|
MktMarketingUrl type = redisValueCache.get("yh:union:uniontype:"+request.getUnion_type(),MktMarketingUrl.class);
|
|
|
if(type==null){
|
|
|
type = mktMarketingUrlDAO.selectByPrimaryKey(Long.valueOf(request.getUnion_type()));
|
...
|
...
|
@@ -452,6 +443,7 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher |
|
|
j.put("app_key", request.getAppkey());
|
|
|
j.put("active_type", "90");
|
|
|
j.put("tdid", request.getTdid());
|
|
|
j.put("interfaceType",click.getInterfaceType());
|
|
|
//打印90天的大数据日志
|
|
|
activeDingdang.info(j.toString());
|
|
|
|
...
|
...
|
@@ -477,9 +469,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher |
|
|
log.warn("publish activate event fail! e {}", e);
|
|
|
}
|
|
|
|
|
|
// UnionTypeModel type =
|
|
|
// UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
|
|
|
|
|
|
String url = null;
|
|
|
//取出具体是哪个union_type
|
|
|
//根据不同的url走不同的回调
|
...
|
...
|
@@ -510,12 +499,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher |
|
|
} else {
|
|
|
url += "?identify_id=" + click.getIdentify_id();
|
|
|
}
|
|
|
|
|
|
// if (ClientTypeEnum.IOS.getName().equals(request.getClient_type())) {
|
|
|
// url += "&idfa=" + click.getIdfa();
|
|
|
// } else {
|
|
|
// url += "&imei=" + click.getImei();
|
|
|
// }
|
|
|
activeUnion.info("activateUnion in call url={}", url);
|
|
|
//改成httpclient方式调用
|
|
|
Pair<Integer, String> pair = HttpUtils.httpGet(url);
|
...
|
...
|
|