Authored by mingdan.ge

Merge branch 'test6.9.7'

@@ -103,6 +103,7 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic @@ -103,6 +103,7 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic
103 String dateStr = DateUtil.getToday( "MMdd"); 103 String dateStr = DateUtil.getToday( "MMdd");
104 String okey = CL_KEY + dateStr+ "_" + clickBO.getUdid(); 104 String okey = CL_KEY + dateStr+ "_" + clickBO.getUdid();
105 redisValueCache.set(okey,JSON.toJSONString(clickBO), 2*24, TimeUnit.HOURS); 105 redisValueCache.set(okey,JSON.toJSONString(clickBO), 2*24, TimeUnit.HOURS);
  106 + activeUnion.info("GDT2019ServiceImpl visitCallbackUrl end,set redis key is {},clickBO is {}.",okey,clickBO);
106 return result; 107 return result;
107 /*try { 108 /*try {
108 if (StringUtils.isBlank(url)) { 109 if (StringUtils.isBlank(url)) {
@@ -138,21 +139,22 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic @@ -138,21 +139,22 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic
138 } 139 }
139 url = filterToken(url,clickBO); 140 url = filterToken(url,clickBO);
140 if (StringUtils.isBlank(url)) { 141 if (StringUtils.isBlank(url)) {
141 - activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {}.",clickBO,url); 142 + activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},type is {}.",clickBO,url,type);
142 return Pair.of(301, "GDT2019ServiceImpl Callback error"); 143 return Pair.of(301, "GDT2019ServiceImpl Callback error");
143 } 144 }
144 JSONObject params = getParamsJson(clickBO,type); 145 JSONObject params = getParamsJson(clickBO,type);
145 - activeUnion.info("activateUnion call GDT2019ServiceImpl url={}, and params={}", url,params.toString()); 146 + activeUnion.info("activateUnion call GDT2019ServiceImpl url={}, and params={},type={}", url,params.toString(),type);
146 Pair<Integer, String> resp= HttpUtils.httpPostJson(url, params); 147 Pair<Integer, String> resp= HttpUtils.httpPostJson(url, params);
147 JSONObject data = JSONObject.parseObject(resp.getRight()); 148 JSONObject data = JSONObject.parseObject(resp.getRight());
148 if (resp.getLeft() == 200 && data.getInteger("code") != 0) { 149 if (resp.getLeft() == 200 && data.getInteger("code") != 0) {
149 - activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},params is {},resp is {}.",clickBO,url,params,resp); 150 + activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},params is {},resp is {},type is {}.",clickBO,url,params,resp,type);
150 return Pair.of(303, "GDT2019ServiceImpl Callback error"); 151 return Pair.of(303, "GDT2019ServiceImpl Callback error");
151 } else if (resp.getLeft() == 200 && data.getInteger("code") == 0) { 152 } else if (resp.getLeft() == 200 && data.getInteger("code") == 0) {
152 - activeUnion.info("GDT2019ServiceImpl Callback success,clickBO is {},url is {},params is {},resp is {}.",clickBO,url,params,resp); 153 + activeUnion.info("GDT2019ServiceImpl Callback success,clickBO is {},url is {},params is {},resp is {},type is {}.",clickBO,url,params,resp,type);
153 } 154 }
154 return resp; 155 return resp;
155 } catch (Exception e) { 156 } catch (Exception e) {
  157 + activeUnion.warn("GDT2019ServiceImpl Callback error,clickBO is {},url is {},type is {}.",clickBO,url,type);
156 return Pair.of(500, "GDT2019ServiceImpl Callback post调用url异常"); 158 return Pair.of(500, "GDT2019ServiceImpl Callback post调用url异常");
157 } 159 }
158 160
@@ -322,7 +322,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService, @@ -322,7 +322,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService,
322 if (uniteService != null) { 322 if (uniteService != null) {
323 pair = uniteService.visitCallbackUrl(null,oclick,1); 323 pair = uniteService.visitCallbackUrl(null,oclick,1);
324 } else { 324 } else {
325 - activeUnion.info("activateUnion call union error,uniteService is null, oclick={}.", oclick); 325 + activeUnion.warn("activateUnion call union error,uniteService is null, oclick={}.", oclick);
326 return; 326 return;
327 } 327 }
328 if (pair.getLeft() != 200) { 328 if (pair.getLeft() != 200) {