|
@@ -83,8 +83,24 @@ public class TrackController {
|
|
click1ExecutorService.submit(new Runnable() {
|
|
click1ExecutorService.submit(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- String s = HttpUtils.httpGetRequest(url, headers, params);
|
|
|
|
- logger.info("快手点击监测1上报客户返回结果:" + s);
|
|
|
|
|
|
+ if (Check.isNull(oaidmd5) && Check.isNull(imei)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ JSONObject json = clickInfoService.getRtaInfo(oaidmd5, imei, null);
|
|
|
|
+ if (!Check.isNull(json)) {
|
|
|
|
+ Integer code = json.getInteger("code");
|
|
|
|
+ if (code == 10000) {
|
|
|
|
+ Boolean requiredFlow = json.getBoolean("requiredFlow");
|
|
|
|
+ if (requiredFlow) {
|
|
|
|
+ String s = HttpUtils.httpGetRequest(url, headers, params);
|
|
|
|
+ logger.info("快手点击监测1上报客户返回结果:" + s);
|
|
|
|
+ } else {
|
|
|
|
+ logger.info("客户rta返回结果为false,停止上报数据");
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ logger.info("调用rta返回结果错误:" + json);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
returnJson.put("code", 200);
|
|
returnJson.put("code", 200);
|
|
@@ -104,7 +120,7 @@ public class TrackController {
|
|
public JSONObject click2(HttpServletRequest request,
|
|
public JSONObject click2(HttpServletRequest request,
|
|
HttpServletResponse response) {
|
|
HttpServletResponse response) {
|
|
|
|
|
|
- logger.info("快手点击监测回传2开始,回调值:" + request.getQueryString());
|
|
|
|
|
|
+ logger.info("新沉流快手点击监测回传开始,回调值:" + request.getQueryString());
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
try {
|
|
try {
|
|
//test
|
|
//test
|
|
@@ -144,12 +160,27 @@ public class TrackController {
|
|
String callbackUrl = "https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=" + callback;
|
|
String callbackUrl = "https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=" + callback;
|
|
params.put("callback", callbackUrl);
|
|
params.put("callback", callbackUrl);
|
|
}
|
|
}
|
|
-
|
|
|
|
click2ExecutorService.submit(new Runnable() {
|
|
click2ExecutorService.submit(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- String s = HttpUtils.httpGetRequest(url, headers, params);
|
|
|
|
- logger.info("快手点击监测2上报客户返回结果:" + s);
|
|
|
|
|
|
+ if (Check.isNull(oaidmd5) && Check.isNull(imei)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ JSONObject json = clickInfoService.getRtaInfo(oaidmd5, imei, null);
|
|
|
|
+ if (!Check.isNull(json)) {
|
|
|
|
+ Integer code = json.getInteger("code");
|
|
|
|
+ if (code == 10000) {
|
|
|
|
+ Boolean requiredFlow = json.getBoolean("requiredFlow");
|
|
|
|
+ if (requiredFlow) {
|
|
|
|
+ String s = HttpUtils.httpGetRequest(url, headers, params);
|
|
|
|
+ logger.info("新沉流快手点击监测上报客户返回结果:" + s);
|
|
|
|
+ } else {
|
|
|
|
+ logger.info("新沉流客户rta返回结果为false,停止上报数据");
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ logger.info("新沉流调用rta返回结果错误:" + json);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
returnJson.put("code", 200);
|
|
returnJson.put("code", 200);
|
|
@@ -208,7 +239,7 @@ public class TrackController {
|
|
public JSONObject back2(HttpServletRequest request,
|
|
public JSONObject back2(HttpServletRequest request,
|
|
HttpServletResponse response) {
|
|
HttpServletResponse response) {
|
|
|
|
|
|
- logger.info("支付宝唤起回传2开始,回传值:" + request.getQueryString());
|
|
|
|
|
|
+ logger.info("新沉流支付宝客户唤起回传开始,回传值:" + request.getQueryString());
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
try {
|
|
try {
|
|
String url = request.getParameter("kuaishouCallback");
|
|
String url = request.getParameter("kuaishouCallback");
|
|
@@ -225,7 +256,7 @@ public class TrackController {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
|
|
String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
|
|
- logger.info("回传媒体唤起结果2返回结果:" + s);
|
|
|
|
|
|
+ logger.info("新沉流回传媒体唤起结果返回结果:" + s);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
returnJson.put("code", 200);
|
|
returnJson.put("code", 200);
|