From bf638f1d95c42aaf6be3eb338172ddefe1b4c778 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 10 May 2021 18:04:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8Ckettle=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/ExtractDataService.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 2f45efe807..78620eba60 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -540,27 +540,25 @@ public class ExtractDataService { public boolean isKettleRunning(){ try { - if (InetAddress.getByName(carte).isReachable(1000)) { - HttpClient httpClient; - HttpGet getMethod = new HttpGet( "http://" + carte + ":" + port); - HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder(); - clientBuilder.setConnectionTimeout(1); - clientBuilder.setCredentials(user, passwd); - httpClient = clientBuilder.build(); - HttpResponse httpResponse = httpClient.execute( getMethod ); - int statusCode = httpResponse.getStatusLine().getStatusCode(); - if ( statusCode != -1 ) { - if ( statusCode == HttpStatus.SC_UNAUTHORIZED ) { - return false; - } - } + if (!InetAddress.getByName(carte).isReachable(1000)) { + return false; + } + HttpClient httpClient; + HttpGet getMethod = new HttpGet( "http://" + carte + ":" + port); + HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder(); + clientBuilder.setConnectionTimeout(1); + clientBuilder.setCredentials(user, passwd); + httpClient = clientBuilder.build(); + HttpResponse httpResponse = httpClient.execute( getMethod ); + int statusCode = httpResponse.getStatusLine().getStatusCode(); + if ( statusCode != -1 && statusCode < 400) { + return true; }else { return false; } }catch (Exception e){ return false; } - return false; } private static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" +