From adf5f93b8d5df07a0ef7cfbc34b94435e4b01056 Mon Sep 17 00:00:00 2001
From: ping <terry2870@163.com>
Date: Mon, 23 May 2016 15:57:25 +0800
Subject: [PATCH] 使用httpclient 回调

---
 server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java b/server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java
index 7f50b2c..6e04f01 100644
--- a/server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java
+++ b/server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java
@@ -11,6 +11,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ import com.yoho.service.model.union.response.UnionResponse;
 import com.yoho.unions.common.constant.UnionConstant;
 import com.yoho.unions.common.enums.ClientTypeEnum;
 import com.yoho.unions.common.utils.DateUtil;
+import com.yoho.unions.common.utils.HttpUtils;
 import com.yoho.unions.dal.IAppActivateIdfaListDAO;
 import com.yoho.unions.dal.IUnionLogsDAO;
 import com.yoho.unions.dal.model.AppActivateIdfaList;
@@ -260,9 +262,15 @@ public class UnionServiceImpl implements IUnionService {
 //					}
 					log.info("activateUnion in call url={}", url);
 					// 调用接口发送短信请求
-					AsyncFuture<String> response = service.get("union.activate", url, null, String.class, null);
-					String result = response.get();
-					log.info("activateUnion call union url={}, and result={}", url, result);
+//					AsyncFuture<String> response = service.get("union.activate", url, null, String.class, null);
+//					String result = response.get();
+					
+					
+					//改成httpclient方式调用
+					
+					Pair<Integer, String> pair = HttpUtils.httpGet(url);
+					
+					log.info("activateUnion call union success url={}, and result={}", url, pair);
 				} catch (Exception e) {
 					log.error("callback error with request={}", request, e);
 				}
--
libgit2 0.24.0