Merge branch 'master' of github.com:Arronlong/httpclientUtil

unknown · unknown · commit f68f2db1c45b · 2016-03-17T08:54:04.000+08:00
Lines starting with '#' will be ignored, and an empty message aborts
diff --git a/src/main/java/com/tgb/ccl/http/common/HttpConfig.java b/src/main/java/com/tgb/ccl/http/common/HttpConfig.java
@@ -49,6 +49,11 @@ public static HttpConfig custom(){
 	 * Header头信息
 	 */
 	private Header[] headers;
+	
+	/**
+	 * 是否返回response的headers
+	 */
+	private boolean isReturnRespHeaders;
 
 	/**
 	 * 请求方法
@@ -127,6 +132,15 @@ public HttpConfig headers(Header[] headers) {
 		return this;
 	}
 	
+	/**
+	 * Header头信息(是否返回response中的headers)
+	 */
+	public HttpConfig headers(Header[] headers, boolean isReturnRespHeaders) {
+		this.headers = headers;
+		this.isReturnRespHeaders=isReturnRespHeaders;
+		return this;
+	}
+	
 	/**
 	 * 请求方法
 	 */
@@ -214,6 +228,9 @@ public CloseableHttpAsyncClient asynclient() {
 	public Header[] headers() {
 		return headers;
 	}
+	public boolean isReturnRespHeaders() {
+		return isReturnRespHeaders;
+	}
 	
 	public String url() {
 		return url;
diff --git a/src/main/java/com/tgb/ccl/http/httpclient/HttpClientUtil.java b/src/main/java/com/tgb/ccl/http/httpclient/HttpClientUtil.java
@@ -372,6 +372,11 @@ private static HttpResponse execute(HttpConfig config) throws HttpProcessExcepti
 			//执行请求操作，并拿到结果（同步阻塞）
 			resp = (config.context()==null)?config.client().execute(request) : config.client().execute(request, config.context()) ;
 			
+			if(config.isReturnRespHeaders()){
+				//获取所有response的header信息
+				config.headers(resp.getAllHeaders());
+			}
+			
 			//获取结果实体
 			return resp;
 			
@@ -428,7 +433,7 @@ public static OutputStream fmt2Stream(HttpResponse resp, OutputStream out) throw
 		}
 		return out;
 	}
-
+	
 	/**
 	 * 根据请求方法名，获取request对象
 	 * 

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,11 @@ private static HttpResponse execute(HttpConfig config) throws HttpProcessExcepti`
`372`	`372`	`//执行请求操作，并拿到结果（同步阻塞）`
`373`	`373`	`resp = (config.context()==null)?config.client().execute(request) : config.client().execute(request, config.context()) ;`
`374`	`374`
	`375`	`+ if(config.isReturnRespHeaders()){`
	`376`	`+ //获取所有response的header信息`
	`377`	`+ config.headers(resp.getAllHeaders());`
	`378`	`+ }`
	`379`	`+`
`375`	`380`	`//获取结果实体`
`376`	`381`	`return resp;`
`377`	`382`
`@@ -428,7 +433,7 @@ public static OutputStream fmt2Stream(HttpResponse resp, OutputStream out) throw`
`428`	`433`	`}`
`429`	`434`	`return out;`
`430`	`435`	`}`
`431`		`-`
	`436`	`+`
`432`	`437`	`/**`
`433`	`438`	`* 根据请求方法名，获取request对象`
`434`	`439`	`*`