From c0af1786657915357e4bbd55ab27d96e62a11906 Mon Sep 17 00:00:00 2001
From: egan <egzosn@gmail.com>
Date: Thu, 28 Jun 2018 20:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egzosn/pay/common/http/HttpRequestTemplate.java   | 11 ++++++-----
 pom.xml                                               |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
index bfbe3c6..c60db6d 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
@@ -134,11 +134,6 @@ public class HttpRequestTemplate {
      */
     public CredentialsProvider createCredentialsProvider(HttpConfigStorage configStorage){
 
-        if (StringUtils.isNotBlank(configStorage.getHttpProxyHost())) {
-            //http代理地址设置
-            httpProxy = new HttpHost(configStorage.getHttpProxyHost(),configStorage.httpProxyPort);;
-        }
-
 
         if (StringUtils.isBlank(configStorage.getAuthUsername())) {
             return null;
@@ -185,6 +180,12 @@ public class HttpRequestTemplate {
      */
     public HttpRequestTemplate setHttpConfigStorage(HttpConfigStorage configStorage) {
         this.configStorage = configStorage;
+
+        if (StringUtils.isNotBlank(configStorage.getHttpProxyHost())) {
+            //http代理地址设置
+            httpProxy = new HttpHost(configStorage.getHttpProxyHost(),configStorage.httpProxyPort);;
+        }
+
         return this;
     }
 
diff --git a/pom.xml b/pom.xml
index 46601ca..6e87beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
                     <encoding>utf-8</encoding>
                 </configuration>
             </plugin>
-           <plugin>
+       <!--    <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
                 <version>1.6.3</version>
@@ -181,7 +181,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 </project>
\ No newline at end of file