From 2bd01c5fed7a0125c3c24a8fbc3280d0990d8056 Mon Sep 17 00:00:00 2001 From: siosio Date: Wed, 10 Jan 2018 12:56:01 +0900 Subject: [PATCH] =?UTF-8?q?http=20proxy=E5=AF=BE=E5=BF=9C=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/siosio/Client.kt | 17 +++++++++++++++-- src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/siosio/Client.kt b/src/main/java/siosio/Client.kt index e2f481f..c6486db 100644 --- a/src/main/java/siosio/Client.kt +++ b/src/main/java/siosio/Client.kt @@ -1,13 +1,26 @@ package siosio +import com.intellij.util.net.* +import org.apache.http.client.config.* import org.apache.http.client.methods.* import org.apache.http.impl.client.* +import java.util.concurrent.* object Client { fun get(uri: String): String { - val response = HttpClients.createDefault() - .execute(HttpGet(uri)) + val clientBuilder = RequestConfig.custom() + IdeHttpClientHelpers.ApacheHttpClient4.setProxyForUrlIfEnabled(clientBuilder, uri) + + val response: CloseableHttpResponse = try { + HttpClients.custom() + .setDefaultRequestConfig(clientBuilder.build()) + .setConnectionTimeToLive(1, TimeUnit.SECONDS) + .build() + .execute(HttpGet(uri)) + } catch (e: Exception) { + return "" + } return when (response.statusLine.statusCode) { 200 -> response.entity.content.reader().readText() diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 28c5dd2..0ccb891 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ GradleDependenciesHelper Gradle Dependencies Helper - 1.10 + 1.11 siosio org.jetbrains.plugins.gradle org.intellij.groovy