|
@@ -10,13 +10,13 @@ import com.alibaba.fastjson.JSONObject;
|
|
import org.apache.log4j.Logger;
|
|
import org.apache.log4j.Logger;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
-import org.springframework.data.mongodb.core.MongoTemplate;
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+import java.net.URLEncoder;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
import java.util.TreeMap;
|
|
@@ -29,17 +29,13 @@ public class TrackController {
|
|
private static Logger logger = Logger.getLogger(TrackController.class);
|
|
private static Logger logger = Logger.getLogger(TrackController.class);
|
|
@Autowired
|
|
@Autowired
|
|
private ClickInfoService clickInfoService;
|
|
private ClickInfoService clickInfoService;
|
|
- @Autowired
|
|
|
|
- private TaobaoNoticeService taobaoNoticeService;
|
|
|
|
- @Autowired
|
|
|
|
- private ConvertInfoService convertInfoService;
|
|
|
|
|
|
+
|
|
private static String url = "https://ugapi.alipay.com/monitor";
|
|
private static String url = "https://ugapi.alipay.com/monitor";
|
|
static ExecutorService click1ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService click1ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService click2ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService click2ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService back1ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService back1ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService back2ExecutorService = Executors.newFixedThreadPool(15);
|
|
static ExecutorService back2ExecutorService = Executors.newFixedThreadPool(15);
|
|
- @Autowired
|
|
|
|
- private MongoTemplate mongoTemplate;
|
|
|
|
|
|
+
|
|
|
|
|
|
// 老链接 屏蔽5
|
|
// 老链接 屏蔽5
|
|
@RequestMapping(value = "/click1")
|
|
@RequestMapping(value = "/click1")
|
|
@@ -87,7 +83,8 @@ public class TrackController {
|
|
params.put("cid", cid);
|
|
params.put("cid", cid);
|
|
}
|
|
}
|
|
if (!Check.isNull(callback)) {
|
|
if (!Check.isNull(callback)) {
|
|
- String callbackUrl = "https://track.tjyourong.com.cn/convert/back1?kuaishouCallback=" + callback;
|
|
|
|
|
|
+ String postUrl = URLEncoder.encode("https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=", "utf-8");
|
|
|
|
+ String callbackUrl = postUrl + callback;
|
|
params.put("callback", callbackUrl);
|
|
params.put("callback", callbackUrl);
|
|
}
|
|
}
|
|
click1ExecutorService.submit(new Runnable() {
|
|
click1ExecutorService.submit(new Runnable() {
|
|
@@ -179,7 +176,8 @@ public class TrackController {
|
|
params.put("accountid", accountid);
|
|
params.put("accountid", accountid);
|
|
|
|
|
|
if (!Check.isNull(callback)) {
|
|
if (!Check.isNull(callback)) {
|
|
- String callbackUrl = "https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=" + callback;
|
|
|
|
|
|
+ String postUrl = URLEncoder.encode("https://track.tjyourong.com.cn/convert/back2?kuaishouCallback=", "utf-8");
|
|
|
|
+ String callbackUrl = postUrl + callback;
|
|
params.put("callback", callbackUrl);
|
|
params.put("callback", callbackUrl);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -206,6 +204,8 @@ public class TrackController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
// 老链接 屏蔽5
|
|
// 老链接 屏蔽5
|
|
@RequestMapping(value = "/back1")
|
|
@RequestMapping(value = "/back1")
|
|
@ResponseBody
|
|
@ResponseBody
|