diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index a8b5ab7..1b19433 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -184,7 +184,7 @@ public class MyApplication extends Application { builder.readTimeout(10, TimeUnit.SECONDS); builder.writeTimeout(10, TimeUnit.SECONDS); builder.connectTimeout(10, TimeUnit.SECONDS); - builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()); + //builder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()); builder.hostnameVerifier(SSLSocketClient.getHostnameVerifier()); OkHttpClient client = builder.build(); OkGo.getInstance().init(this).setOkHttpClient(client).setRetryCount(0); diff --git a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java index cf13b95..59ef500 100644 --- a/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java +++ b/app/src/main/java/qianmu/container/http/retrofit/RetrofitUtil.java @@ -66,11 +66,9 @@ public class RetrofitUtil { return builder.build(); } catch (Throwable t) { LoggerUtil.e("initOkHttpClient", StringUtil.getThrowableStr(t)); - return new OkHttpClient.Builder().sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()) - .retryOnConnectionFailure(true) - .hostnameVerifier(SSLSocketClient.getHostnameVerifier()) - .connectTimeout(timeout, TimeUnit.SECONDS).readTimeout(timeout, TimeUnit.SECONDS) - .writeTimeout(timeout, TimeUnit.SECONDS).build(); + return new OkHttpClient.Builder().connectTimeout(timeout, TimeUnit.SECONDS) + .retryOnConnectionFailure(true).addInterceptor(new BaseInterceptor()) + .readTimeout(timeout, TimeUnit.SECONDS).writeTimeout(timeout, TimeUnit.SECONDS).build(); } }