Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java

pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java

@@ -48,10 +48,28 @@ public class PayResponse {
         //根据不同的账户类型 初始化支付配置
         this.service = apyAccount.getPayType().getPayService(apyAccount);
         this.storage = service.getPayConfigStorage();
-
+        //这里设置代理配置
+//        service.setRequestTemplateConfigStorage(getHttpConfigStorage());
         buildRouter(apyAccount.getPayId());
     }
 
+    /**
+     * 获取http配置，如果配置为null则为默认配置，无代理。
+     * 此处非必需
+     * @return
+     */
+    public HttpConfigStorage getHttpConfigStorage(){
+        HttpConfigStorage httpConfigStorage = new HttpConfigStorage();
+        //http代理地址
+        httpConfigStorage.setHttpProxyHost("192.168.1.69");
+        //代理端口
+        httpConfigStorage.setHttpProxyPort(3308);
+        //代理用户名
+        httpConfigStorage.setHttpProxyUsername("user");
+        //代理密码
+        httpConfigStorage.setHttpProxyPassword("password");
+        return httpConfigStorage;
+    }
 
 
     /**