cancel log

src/main/java/com/reyun/service/impl/ComplicatedEventsServiceImpl.java

@@ -300,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
             System.out.println(url);
             try {
                 String responseStr = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions);
-                System.out.println(responseStr);
                 ObjectMapper mapper = new ObjectMapper();
                 responseJson = mapper.readValue(responseStr, Map.class);
             } catch (Exception e) {
@@ -1034,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                 Map<String, String> channelMap = new HashMap<>();
 
                 //group by _cid or group by _campaignid
-                if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
+                /*if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
                     Account account = accountRepository.findOne(accountId);
                     try {
                         String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
@@ -1061,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                         logger.error("fail to get channel or campaign name");
                     }
 
-                }
+                }*/
 
 
                 //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)

src/main/java/com/reyun/util/HttpClientUtil.java

@@ -24,7 +24,7 @@ public class HttpClientUtil {
     private static final Log log = LogFactory.getLog(HttpClientUtil.class);
   
     // 读取超时  
-    private final static int SOCKET_TIMEOUT = 10000;  
+    private final static int SOCKET_TIMEOUT = 10000;
     // 连接超时  
     private final static int CONNECTION_TIMEOUT = 60000;  
     // 每个HOST的最大连接数量