Merge pull request Arronlong#26 from Arronlong/develop

Arronlong · web-flow · commit e6944efb08de · 2018-09-25T11:30:47.000+08:00
修改demo说明，同时更新版本到1.0.4
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 <dependency>
     <groupId>com.arronlong</groupId>
     <artifactId>httpclientutil</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.4</version>
 </dependency>
 ```
 
@@ -75,7 +75,16 @@ public static void main(String[] args) throws HttpProcessException, FileNotFound
 	//如果指向看是否访问正常
 	//String result3 = HttpClientUtil.head(config); // 返回Http协议号+状态码
 	//int statusCode = HttpClientUtil.status(config);//返回状态码
-										
+	
+	//[新增方法]sendAndGetResp，可以返回原生的HttpResponse对象，
+	//同时返回常用的几类对象：result、header、StatusLine、StatusCode
+	HttpResult respResult = HttpClientUtil.sendAndGetResp(config);
+	System.out.println("返回结果：\n"+respResult.getResult());
+	System.out.println("返回resp-header："+respResult.getRespHeaders());//可以遍历
+	System.out.println("返回具体resp-header："+respResult.getHeaders("Date"));
+	System.out.println("返回StatusLine对象："+respResult.getStatusLine());
+	System.out.println("返回StatusCode："+respResult.getStatusCode());
+	System.out.println("返回HttpResponse对象）（可自行处理）："+respResult.getResp());
 }
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.arronlong</groupId>
 	<artifactId>httpclientutil</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.4</version>
 	<name>${project.artifactId}</name>
 	<description>基于HttpClient-4.4.1封装的工具类。支持插件式配置Header、插件式配置httpclient对象，这样就可以方便地自定义header信息、配置ssl、配置proxy、Cookie等</description>
 
diff --git a/src/main/java/com/arronlong/httpclientutil/common/HttpResult.java b/src/main/java/com/arronlong/httpclientutil/common/HttpResult.java
@@ -56,6 +56,7 @@ public HttpResult(HttpResponse resp) {
 		this.respHeaders = resp.getAllHeaders();
 		this.protocolVersion = resp.getProtocolVersion();
 		this.statusCode = resp.getStatusLine().getStatusCode();
+		this.resp = resp;
 	}
 	
 	/**
@@ -64,8 +65,9 @@ public HttpResult(HttpResponse resp) {
 	 * @param name	头信息名称
 	 * @return
 	 */
-    public Header[] getHeaders(final String name) {
-        return this.resp.getHeaders(name);
+    public Header getHeaders(final String name) {
+    	Header[] headers = this.resp.getHeaders(name);
+        return headers!=null && headers.length>0?headers[0]:null;
     }
 
 	public String getResult() {
diff --git a/src/test/java/com/arronlong/httpclientutil/test/Demo.java b/src/test/java/com/arronlong/httpclientutil/test/Demo.java
@@ -11,6 +11,7 @@
 import com.arronlong.httpclientutil.builder.HCB;
 import com.arronlong.httpclientutil.common.HttpConfig;
 import com.arronlong.httpclientutil.common.HttpHeader;
+import com.arronlong.httpclientutil.common.HttpResult;
 import com.arronlong.httpclientutil.common.SSLs.SSLProtocolVersion;
 import com.arronlong.httpclientutil.exception.HttpProcessException;
 
@@ -84,6 +85,16 @@ public static void main(String[] args) throws HttpProcessException, FileNotFound
 		//如果指向看是否访问正常
 		//String result3 = HttpClientUtil.head(config); // 返回Http协议号+状态码
 		//int statusCode = HttpClientUtil.status(config);//返回状态码
-											
+		
+		//[新增方法]sendAndGetResp，可以返回原生的HttpResponse对象，
+		//同时返回常用的几类对象：result、header、StatusLine、StatusCode
+		HttpResult respResult = HttpClientUtil.sendAndGetResp(config);
+		System.out.println("返回结果：\n"+respResult.getResult());
+		System.out.println("返回resp-header："+respResult.getRespHeaders());//可以遍历
+		System.out.println("返回具体resp-header："+respResult.getHeaders("Date"));
+		System.out.println("返回StatusLine对象："+respResult.getStatusLine());
+		System.out.println("返回StatusCode："+respResult.getStatusCode());
+		System.out.println("返回HttpResponse对象）（可自行处理）："+respResult.getResp());
+		
 	}
 }
