From 46297deaa1f15d2167f72004957e7e2f6beec2d0 Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Mon, 20 Mar 2017 22:43:32 +0800
Subject: [PATCH] HttpUriRequestConverter

---
 .../webmagic/downloader/HttpClientDownloader.java   |  2 +-
 .../downloader/HttpUriRequestConverter.java         | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java
index 052c6fae..7ca483aa 100644
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java
@@ -86,7 +86,7 @@ public class HttpClientDownloader extends AbstractDownloader {
             authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
             httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState);
         }
-        HttpUriRequest httpUriRequest = httpUriRequestConverter.convert(request, site);
+        HttpUriRequest httpUriRequest = httpUriRequestConverter.convert(request, site, proxy);
         CloseableHttpClient httpClient = getHttpClient(site);
         try {
             httpResponse = httpClient.execute(httpUriRequest, httpContext);
diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
index beda2e64..0ec4b0e9 100644
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
@@ -10,6 +10,7 @@ import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import us.codecraft.webmagic.Request;
 import us.codecraft.webmagic.Site;
+import us.codecraft.webmagic.proxy.Proxy;
 import us.codecraft.webmagic.utils.HttpConstant;
 
 import java.nio.charset.Charset;
@@ -25,14 +26,10 @@ import java.util.Map;
  */
 public class HttpUriRequestConverter {
 
-    public HttpUriRequest convert(Request request, Site site) {
-        return null;
-    }
-
-    private HttpUriRequest getHttpUriRequest(Request request, Site site, Map<String, String> headers, HttpHost proxy) {
+    public HttpUriRequest convert(Request request, Site site, Proxy proxy) {
         RequestBuilder requestBuilder = selectRequestMethod(request).setUri(request.getUrl());
-        if (headers != null) {
-            for (Map.Entry<String, String> headerEntry : headers.entrySet()) {
+        if (site.getHeaders() != null) {
+            for (Map.Entry<String, String> headerEntry : site.getHeaders().entrySet()) {
                 requestBuilder.addHeader(headerEntry.getKey(), headerEntry.getValue());
             }
         }
@@ -46,7 +43,7 @@ public class HttpUriRequestConverter {
         }
 
         if (proxy != null) {
-            requestConfigBuilder.setProxy(proxy);
+            requestConfigBuilder.setProxy(new HttpHost(proxy.getProxyHost().getHost(), proxy.getProxyHost().getPort()));
         }
         requestBuilder.setConfig(requestConfigBuilder.build());
         return requestBuilder.build();