get time out

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

@@ -1036,27 +1036,29 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                 //group by _cid or group by _campaignid
                 if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
                     Account account = accountRepository.findOne(accountId);
-                    String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
-                    String response = HttpClientUtil.doHttpGetRequest(url, "io");
-                    if (!StringUtil.isEmpty(response)) {
-                        try {
-                            JSONObject ob = JSONObject.fromObject(response);
-                            JSONObject content = ob.getJSONObject("content");
-                            if (groupArray.toString().contains(FIELD_CID)) {
-                                JSONObject channelObject = content.getJSONObject("channel");
-                                ObjectMapper mapper = new ObjectMapper();
-                                channelMap = mapper.readValue(channelObject.toString(), Map.class);
-                            }
-                            if (groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
-                                JSONObject campObject = content.getJSONObject("campaign");
-                                ObjectMapper mapper = new ObjectMapper();
-                                campaignMap = mapper.readValue(campObject.toString(), Map.class);
-                            }
-
-                        } catch (Exception e) {
-                            logger.error("fail to get channel or campaign name");
-                        }
+                    try {
+                        String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
+                        String response = HttpClientUtil.doHttpGetRequest(url, "io");
+                        if (!StringUtil.isEmpty(response)) {
+
+                                JSONObject ob = JSONObject.fromObject(response);
+                                JSONObject content = ob.getJSONObject("content");
+                                if (groupArray.toString().contains(FIELD_CID)) {
+                                    JSONObject channelObject = content.getJSONObject("channel");
+                                    ObjectMapper mapper = new ObjectMapper();
+                                    channelMap = mapper.readValue(channelObject.toString(), Map.class);
+                                }
+                                if (groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
+                                    JSONObject campObject = content.getJSONObject("campaign");
+                                    ObjectMapper mapper = new ObjectMapper();
+                                    campaignMap = mapper.readValue(campObject.toString(), Map.class);
+                                }
+
 
+
+                        }
+                    } catch (Exception e) {
+                        logger.error("fail to get channel or campaign name");
                     }
 
                 }

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 = 60000;  
+    private final static int SOCKET_TIMEOUT = 10000;  
     // 连接超时  
     private final static int CONNECTION_TIMEOUT = 60000;  
     // 每个HOST的最大连接数量