|
@@ -69,7 +69,7 @@ public class TrackingController {
|
|
|
public Object tencentImpression(HttpServletRequest request) throws Exception {
|
|
public Object tencentImpression(HttpServletRequest request) throws Exception {
|
|
|
impressionSemaphore.acquire();
|
|
impressionSemaphore.acquire();
|
|
|
try {
|
|
try {
|
|
|
- return doImpression(request, false);
|
|
|
|
|
|
|
+ return doImpression(request, "v1", 0);
|
|
|
} finally {
|
|
} finally {
|
|
|
impressionSemaphore.release();
|
|
impressionSemaphore.release();
|
|
|
}
|
|
}
|
|
@@ -95,10 +95,6 @@ public class TrackingController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private Object doImpression(HttpServletRequest request, boolean isNewLink) throws Exception {
|
|
|
|
|
- return doImpression(request, isNewLink ? "v2" : "v1", isNewLink ? 20 : 0);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
private Object doImpression(HttpServletRequest request, String trackingVersion, int deductionRate) throws Exception {
|
|
private Object doImpression(HttpServletRequest request, String trackingVersion, int deductionRate) throws Exception {
|
|
|
Map<String, String> params = flatQueryParams(request);
|
|
Map<String, String> params = flatQueryParams(request);
|
|
|
markTrackingVersion(params, trackingVersion, deductionRate);
|
|
markTrackingVersion(params, trackingVersion, deductionRate);
|
|
@@ -154,7 +150,7 @@ public class TrackingController {
|
|
|
throws Exception {
|
|
throws Exception {
|
|
|
clickSemaphore.acquire();
|
|
clickSemaphore.acquire();
|
|
|
try {
|
|
try {
|
|
|
- return doClick(request, response, false);
|
|
|
|
|
|
|
+ return doClick(request, response, "v1", 0);
|
|
|
} finally {
|
|
} finally {
|
|
|
clickSemaphore.release();
|
|
clickSemaphore.release();
|
|
|
}
|
|
}
|
|
@@ -182,16 +178,6 @@ public class TrackingController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private Object doClick(HttpServletRequest request, HttpServletResponse response)
|
|
|
|
|
- throws Exception {
|
|
|
|
|
- return doClick(request, response, false);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- private Object doClick(HttpServletRequest request, HttpServletResponse response, boolean isNewLink)
|
|
|
|
|
- throws Exception {
|
|
|
|
|
- return doClick(request, response, isNewLink ? "v2" : "v1", isNewLink ? 20 : 0);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
private Object doClick(HttpServletRequest request, HttpServletResponse response,
|
|
private Object doClick(HttpServletRequest request, HttpServletResponse response,
|
|
|
String trackingVersion, int deductionRate)
|
|
String trackingVersion, int deductionRate)
|
|
|
throws Exception {
|
|
throws Exception {
|