|
@@ -155,7 +155,8 @@ public class TrackController {
|
|
params.put("partnerId", "tab3huichuangapkhuichuang");
|
|
params.put("partnerId", "tab3huichuangapkhuichuang");
|
|
if (!Check.isNull(oaidmd5)) {
|
|
if (!Check.isNull(oaidmd5)) {
|
|
params.put("oaidmd5", oaidmd5);
|
|
params.put("oaidmd5", oaidmd5);
|
|
- } else if (!Check.isNull(imei)) {
|
|
|
|
|
|
+ }
|
|
|
|
+ if (!Check.isNull(imei)) {
|
|
params.put("imei", imei);
|
|
params.put("imei", imei);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -175,11 +176,11 @@ public class TrackController {
|
|
|
|
|
|
if (!Check.isNull(callback)) {
|
|
if (!Check.isNull(callback)) {
|
|
String callbackUrl = "https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=" + callback;
|
|
String callbackUrl = "https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=" + callback;
|
|
- if (!Check.isNull(oaidmd5)) {
|
|
|
|
|
|
+ /* if (!Check.isNull(oaidmd5)) {
|
|
callbackUrl += "&id=" + oaidmd5;
|
|
callbackUrl += "&id=" + oaidmd5;
|
|
} else if (!Check.isNull(imei)) {
|
|
} else if (!Check.isNull(imei)) {
|
|
callbackUrl += "&id=" + imei;
|
|
callbackUrl += "&id=" + imei;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
params.put("callback", callbackUrl);
|
|
params.put("callback", callbackUrl);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -190,7 +191,7 @@ public class TrackController {
|
|
if (Check.isNull(oaidmd5) && Check.isNull(imei)) {
|
|
if (Check.isNull(oaidmd5) && Check.isNull(imei)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- JSONObject json = clickInfoService.getRtaInfo(oaidmd5, imei, "tab3xcl");
|
|
|
|
|
|
+ /* JSONObject json = clickInfoService.getRtaInfo(oaidmd5, imei, "tab3xcl");
|
|
if (!Check.isNull(json)) {
|
|
if (!Check.isNull(json)) {
|
|
Integer code = json.getInteger("code");
|
|
Integer code = json.getInteger("code");
|
|
if (code == 10000) {
|
|
if (code == 10000) {
|
|
@@ -231,7 +232,11 @@ public class TrackController {
|
|
} else {
|
|
} else {
|
|
logger.info("新沉流调用rta返回结果错误:" + json);
|
|
logger.info("新沉流调用rta返回结果错误:" + json);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
+
|
|
|
|
+ String s = HttpUtils.httpGetRequest(url, headers, params);
|
|
|
|
+ logger.info("新沉流快手点击监测上报客户返回结果:" + s);
|
|
|
|
+
|
|
}
|
|
}
|
|
});
|
|
});
|
|
returnJson.put("code", 200);
|
|
returnJson.put("code", 200);
|