Authored by mingdan.ge

Merge branch 'test6.9.7'

... ... @@ -103,6 +103,7 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic
String dateStr = DateUtil.getToday( "MMdd");
String okey = CL_KEY + dateStr+ "_" + clickBO.getUdid();
redisValueCache.set(okey,JSON.toJSONString(clickBO), 2*24, TimeUnit.HOURS);
activeUnion.info("GDT2019ServiceImpl visitCallbackUrl end,set redis key is {},clickBO is {}.",okey,clickBO);
return result;
/*try {
if (StringUtils.isBlank(url)) {
... ... @@ -138,21 +139,22 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic
}
url = filterToken(url,clickBO);
if (StringUtils.isBlank(url)) {
activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {}.",clickBO,url);
activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},type is {}.",clickBO,url,type);
return Pair.of(301, "GDT2019ServiceImpl Callback error");
}
JSONObject params = getParamsJson(clickBO,type);
activeUnion.info("activateUnion call GDT2019ServiceImpl url={}, and params={}", url,params.toString());
activeUnion.info("activateUnion call GDT2019ServiceImpl url={}, and params={},type={}", url,params.toString(),type);
Pair<Integer, String> resp= HttpUtils.httpPostJson(url, params);
JSONObject data = JSONObject.parseObject(resp.getRight());
if (resp.getLeft() == 200 && data.getInteger("code") != 0) {
activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},params is {},resp is {}.",clickBO,url,params,resp);
activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},params is {},resp is {},type is {}.",clickBO,url,params,resp,type);
return Pair.of(303, "GDT2019ServiceImpl Callback error");
} else if (resp.getLeft() == 200 && data.getInteger("code") == 0) {
activeUnion.info("GDT2019ServiceImpl Callback success,clickBO is {},url is {},params is {},resp is {}.",clickBO,url,params,resp);
activeUnion.info("GDT2019ServiceImpl Callback success,clickBO is {},url is {},params is {},resp is {},type is {}.",clickBO,url,params,resp,type);
}
return resp;
} catch (Exception e) {
activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},type is {}.",clickBO,url,type);
return Pair.of(500, "GDT2019ServiceImpl Callback post调用url异常");
}
... ...
... ... @@ -322,7 +322,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService,
if (uniteService != null) {
pair = uniteService.visitCallbackUrl(null,oclick,1);
} else {
activeUnion.info("activateUnion call union error,uniteService is null, oclick={}.", oclick);
activeUnion.warn("activateUnion call union error,uniteService is null, oclick={}.", oclick);
return;
}
if (pair.getLeft() != 200) {
... ...