Commit 86ee99338b27121cdf77dbe0825c1f5f8db41185
1 parent
9b42d9d7
Exists in
master
提交okhttp关于https处理
Showing
1 changed file
with
4 additions
and
49 deletions
Show diff stats
src/main/java/com/taover/util/UtilHttpByOkHttp.java
... | ... | @@ -5,21 +5,13 @@ import java.io.IOException; |
5 | 5 | import java.io.UnsupportedEncodingException; |
6 | 6 | import java.net.URLEncoder; |
7 | 7 | import java.nio.charset.Charset; |
8 | -import java.security.KeyManagementException; | |
9 | -import java.security.NoSuchAlgorithmException; | |
10 | -import java.security.cert.X509Certificate; | |
8 | +import java.util.Arrays; | |
11 | 9 | import java.util.HashMap; |
12 | 10 | import java.util.Iterator; |
13 | 11 | import java.util.Map; |
14 | 12 | import java.util.concurrent.TimeUnit; |
15 | 13 | |
16 | -import javax.net.ssl.HostnameVerifier; | |
17 | -import javax.net.ssl.SSLContext; | |
18 | -import javax.net.ssl.SSLSession; | |
19 | -import javax.net.ssl.SSLSocketFactory; | |
20 | -import javax.net.ssl.TrustManager; | |
21 | -import javax.net.ssl.X509TrustManager; | |
22 | - | |
14 | +import okhttp3.ConnectionSpec; | |
23 | 15 | import okhttp3.FormBody; |
24 | 16 | import okhttp3.Headers; |
25 | 17 | import okhttp3.MediaType; |
... | ... | @@ -259,8 +251,7 @@ public class UtilHttpByOkHttp { |
259 | 251 | .readTimeout(timeoutInSecond, TimeUnit.SECONDS) |
260 | 252 | .writeTimeout(timeoutInSecond,TimeUnit.SECONDS) |
261 | 253 | .retryOnConnectionFailure(true) |
262 | - .sslSocketFactory(getTrustedSSLSocketFactory()) | |
263 | - .hostnameVerifier(DO_NOT_VERIFY); | |
254 | + .connectionSpecs(Arrays.asList(ConnectionSpec.COMPATIBLE_TLS)); | |
264 | 255 | return builder.build(); |
265 | 256 | } |
266 | 257 | |
... | ... | @@ -299,43 +290,7 @@ public class UtilHttpByOkHttp { |
299 | 290 | } |
300 | 291 | return response.body(); |
301 | 292 | } |
302 | - | |
303 | - | |
304 | - static TrustManager[] trustAllCerts = new TrustManager[]{ | |
305 | - new X509TrustManager() { | |
306 | - public java.security.cert.X509Certificate[] getAcceptedIssuers() { | |
307 | - X509Certificate[] x509Certificates = new X509Certificate[0]; | |
308 | - return x509Certificates; | |
309 | - } | |
310 | - | |
311 | - public void checkClientTrusted( | |
312 | - java.security.cert.X509Certificate[] certs, String authType) { | |
313 | - } | |
314 | - | |
315 | - public void checkServerTrusted( | |
316 | - java.security.cert.X509Certificate[] certs, String authType) { | |
317 | - } | |
318 | - } | |
319 | - }; | |
320 | - | |
321 | - static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() { | |
322 | - @Override | |
323 | - public boolean verify(String hostname, SSLSession session) { | |
324 | - return true; | |
325 | - } | |
326 | - }; | |
327 | - | |
328 | - private static SSLSocketFactory getTrustedSSLSocketFactory() { | |
329 | - try { | |
330 | - SSLContext sc = SSLContext.getInstance("SSL"); | |
331 | - sc.init(null, trustAllCerts, new java.security.SecureRandom()); | |
332 | - return sc.getSocketFactory(); | |
333 | - } catch (KeyManagementException | NoSuchAlgorithmException e) { | |
334 | - e.printStackTrace(); | |
335 | - return null; | |
336 | - } | |
337 | - } | |
338 | - | |
293 | + | |
339 | 294 | public static void main(String args[]){ |
340 | 295 | String contactSsid = "lM4AeZSizgFROR/OAHmUos4BUTkf"; |
341 | 296 | try { | ... | ... |