From 2400ff7e1af7e9f95a29b33b0b3194302f50d587 Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Sun, 8 May 2016 20:31:43 +0800
Subject: [PATCH] resovle conflict

---
 .../webmagic/downloader/HttpClientGenerator.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java
index 225297ca..520d376e 100644
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientGenerator.java
@@ -62,6 +62,14 @@ public class HttpClientGenerator {
                     new UsernamePasswordCredentials(proxy.getUser(), proxy.getPassword()));
             httpClientBuilder.setDefaultCredentialsProvider(credsProvider);
         }
+
+        if(site!=null&&site.getHttpProxy()!=null&&site.getUsernamePasswordCredentials()!=null){
+            credsProvider = new BasicCredentialsProvider();
+            credsProvider.setCredentials(
+                    new AuthScope(site.getHttpProxy()),//可以访问的范围
+                    site.getUsernamePasswordCredentials());//用户名和密码
+            httpClientBuilder.setDefaultCredentialsProvider(credsProvider);
+        }
         
         httpClientBuilder.setConnectionManager(connectionManager);
         if (site != null && site.getUserAgent() != null) {
@@ -82,13 +90,6 @@ public class HttpClientGenerator {
             });
         }
 
-        if(site!=null&&site.getHttpProxy()!=null&&site.getUsernamePasswordCredentials()!=null){
-            CredentialsProvider credsProvider = new BasicCredentialsProvider();
-            credsProvider.setCredentials(
-                    new AuthScope(site.getHttpProxy()),//可以访问的范围
-                    site.getUsernamePasswordCredentials());//用户名和密码
-            httpClientBuilder.setDefaultCredentialsProvider(credsProvider);
-        }
 
         SocketConfig socketConfig = SocketConfig.custom().setSoKeepAlive(true).setTcpNoDelay(true).build();
         httpClientBuilder.setDefaultSocketConfig(socketConfig);