yumeng пре 8 месеци
родитељ
комит
e24ce92b7b

+ 37 - 28
src/main/java/cn/com/ctop/track/controller/TrackController.java

@@ -16,6 +16,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 @Controller
 @RequestMapping("/convert")
@@ -28,15 +30,17 @@ public class TrackController {
     @Autowired
     private ConvertInfoService convertInfoService;
     private static String url = "https://ugapi.alipay.com/monitor";
-
+    static ExecutorService click1ExecutorService = Executors.newFixedThreadPool(15);
+    static ExecutorService click2ExecutorService = Executors.newFixedThreadPool(15);
+    static ExecutorService back1ExecutorService = Executors.newFixedThreadPool(15);
+    static ExecutorService back2ExecutorService = Executors.newFixedThreadPool(15);
 
     // 老链接 屏蔽5
     @RequestMapping(value = "/click1")
     public JSONObject click1(HttpServletRequest request,
                              HttpServletResponse response) {
 
-        logger.info(request.getQueryString());
-        System.err.println("支付宝老快手点击监测");
+        logger.info("快手点击监测回调1开始");
         JSONObject returnJson = new JSONObject();
         try {
             //test
@@ -76,15 +80,16 @@ public class TrackController {
                 String callbackUrl = "https://track.tjyourong.com.cn/convert/back1?kuaishouCallback=" + callback;
                 params.put("callback", callbackUrl);
             }
-
-            String s = HttpUtils.httpGetRequest(url, headers, params);
-            System.err.println("---------------支付宝老,返回结果------------------");
-            System.err.println(s);
+            click1ExecutorService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    String s = HttpUtils.httpGetRequest(url, headers, params);
+                    logger.info("快手点击监测1上报客户返回结果:" + s);
+                }
+            });
             returnJson.put("code", 200);
             returnJson.put("success", true);
             returnJson.put("result", "success");
-
-
         } catch (Exception e) {
             returnJson.put("code", 500);
             returnJson.put("success", false);
@@ -99,8 +104,7 @@ public class TrackController {
     public JSONObject click2(HttpServletRequest request,
                              HttpServletResponse response) {
 
-        logger.info(request.getQueryString());
-        System.err.println("支付宝新快手点击监测");
+        logger.info("快手点击监测回调2开始");
         JSONObject returnJson = new JSONObject();
         try {
             //test
@@ -141,14 +145,16 @@ public class TrackController {
                 params.put("callback", callbackUrl);
             }
 
-            String s = HttpUtils.httpGetRequest(url, headers, params);
-            System.err.println("---------------支付宝新,返回结果------------------");
-            System.err.println(s);
+            click2ExecutorService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    String s = HttpUtils.httpGetRequest(url, headers, params);
+                    logger.info("快手点击监测2上报客户返回结果:" + s);
+                }
+            });
             returnJson.put("code", 200);
             returnJson.put("success", true);
             returnJson.put("result", "success");
-
-
         } catch (Exception e) {
             returnJson.put("code", 500);
             returnJson.put("success", false);
@@ -163,7 +169,7 @@ public class TrackController {
     public JSONObject back1(HttpServletRequest request,
                             HttpServletResponse response) {
 
-        logger.info("支付宝回传老: " + request.getQueryString());
+        logger.info("支付宝回传1开始");
         JSONObject returnJson = new JSONObject();
         try {
 
@@ -177,15 +183,17 @@ public class TrackController {
             } else if ("8".equals(transformtype)) {
                 Map<String, String> headers = new HashMap<>();
                 String event_type = "84";
-                String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
-                System.err.println("---------------支付宝回传老,返回结果------------------");
-                System.err.println(s);
+                back1ExecutorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
+                        logger.info("回传媒体转化结果1返回结果:" + s);
+                    }
+                });
                 returnJson.put("code", 200);
                 returnJson.put("success", true);
                 returnJson.put("result", "success");
             }
-
-
         } catch (Exception e) {
             returnJson.put("code", 500);
             returnJson.put("success", false);
@@ -203,7 +211,6 @@ public class TrackController {
         logger.info("支付宝回传新: " + request.getQueryString());
         JSONObject returnJson = new JSONObject();
         try {
-
             String url = request.getParameter("kuaishouCallback");
             String transformtype = request.getParameter("transformtype");
             if ("8".equals(transformtype)) {
@@ -214,15 +221,17 @@ public class TrackController {
             } else if ("5".equals(transformtype)) {
                 Map<String, String> headers = new HashMap<>();
                 String event_type = "84";
-                String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
-                System.err.println("---------------支付宝回传新,返回结果------------------");
-                System.err.println(s);
+                back2ExecutorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        String s = HttpUtils.backHttpGetRequest(url, headers, event_type);
+                        logger.info("回传媒体转化结果2返回结果:" + s);
+                    }
+                });
                 returnJson.put("code", 200);
                 returnJson.put("success", true);
                 returnJson.put("result", "success");
             }
-
-
         } catch (Exception e) {
             returnJson.put("code", 500);
             returnJson.put("success", false);

+ 0 - 3
src/main/java/cn/com/ctop/track/utils/HttpUtils.java

@@ -520,8 +520,6 @@ public class HttpUtils {
         String strReturn = "";
         try {
             String uri = url + "?" + mapParamsSortToStringBySeperator(params, "&");
-            System.err.println("链接-----------------------------");
-            System.err.println(uri);
             HttpGet httpGet = new HttpGet(uri);
             if (headers != null) {
                 Iterator<String> keyIter = headers.keySet().iterator();
@@ -571,7 +569,6 @@ public class HttpUtils {
     }
 
 
-
     public static String httpGet(String url, Map<String, Object> paramsMap, Map<String, String> headers) {
         String result = null;
         try {