TS-6644 修复上传文件设置代理不生效

jpush · Oct 27, 2021 · 34907f3 · 34907f3
1 parent 36475f2
commit 34907f3
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java b/src/main/java/cn/jiguang/common/connection/NativeHttpClient.java
@@ -133,14 +133,7 @@ private ResponseWrapper _doRequest(String url, String content,
         try {
             URL aUrl = new URL(url);
 
-            if (null != _proxy) {
-                conn = (HttpURLConnection) aUrl.openConnection(_proxy.getNetProxy());
-                if (_proxy.isAuthenticationNeeded()) {
-                    conn.setRequestProperty("Proxy-Authorization", _proxy.getProxyAuthorization());
-                }
-            } else {
-                conn = (HttpURLConnection) aUrl.openConnection();
-            }
+            conn = getConnectionByUrl(aUrl);
 
             conn.setConnectTimeout(_connectionTimeout);
             conn.setReadTimeout(_readTimeout);
@@ -315,7 +308,7 @@ private String formUpload(String urlStr, Map<String, String> textMap,
         String BOUNDARY = "---------------------------" + System.currentTimeMillis();
         try {
             URL url = new URL(urlStr);
-            conn = (HttpURLConnection) url.openConnection();
+            conn = getConnectionByUrl(url);
             conn.setConnectTimeout(5000);
             conn.setReadTimeout(30000);
             conn.setDoOutput(true);
@@ -423,6 +416,19 @@ private String formUpload(String urlStr, Map<String, String> textMap,
         return res;
     }
 
+    public HttpURLConnection getConnectionByUrl(URL url) throws IOException {
+        HttpURLConnection conn;
+        if (null != _proxy) {
+            conn = (HttpURLConnection) url.openConnection(_proxy.getNetProxy());
+            if (_proxy.isAuthenticationNeeded()) {
+                conn.setRequestProperty("Proxy-Authorization", _proxy.getProxyAuthorization());
+            }
+        } else {
+            conn = (HttpURLConnection) url.openConnection();
+        }
+        return conn;
+    }
+
     private static class SimpleHostnameVerifier implements HostnameVerifier {
 
         public boolean verify(String hostname, SSLSession session) {