From 408f3f0d4754d21d7a2d200db1c66aff55263e45 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Sat, 28 Mar 2020 10:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               | 32 -------------------
 .../main/java/io/metersphere/Application.java |  7 +---
 .../java/io/metersphere/config/WebConfig.java |  7 ++++
 .../service/TestResourcePoolService.java      |  7 ++--
 4 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 561fe81516..ab143b2730 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -110,7 +110,6 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.12</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -128,43 +127,12 @@
             <artifactId>slf4j-simple</artifactId>
         </dependency>
 
-        <!-- jmeter -->
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_http</artifactId>
-            <version>${jmeter.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/kg.apc/jmeter-plugins-tst -->
-        <dependency>
-            <groupId>kg.apc</groupId>
-            <artifactId>jmeter-plugins-tst</artifactId>
-            <version>2.5</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/kg.apc/jmeter-plugins-casutg -->
-        <dependency>
-            <groupId>kg.apc</groupId>
-            <artifactId>jmeter-plugins-casutg</artifactId>
-            <version>2.9</version>
-        </dependency>
-
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
             <version>5.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/backend/src/main/java/io/metersphere/Application.java b/backend/src/main/java/io/metersphere/Application.java
index 20ac59d613..693b24040f 100644
--- a/backend/src/main/java/io/metersphere/Application.java
+++ b/backend/src/main/java/io/metersphere/Application.java
@@ -6,8 +6,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication(exclude = {QuartzAutoConfiguration.class})
 @ServletComponentScan
@@ -17,8 +15,5 @@ public class Application {
         SpringApplication.run(Application.class, args);
     }
 
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/config/WebConfig.java b/backend/src/main/java/io/metersphere/config/WebConfig.java
index 35acc14672..1546184637 100644
--- a/backend/src/main/java/io/metersphere/config/WebConfig.java
+++ b/backend/src/main/java/io/metersphere/config/WebConfig.java
@@ -1,7 +1,9 @@
 package io.metersphere.config;
 
 import io.metersphere.interceptor.TestInterceptor;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -12,4 +14,9 @@ public class WebConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new TestInterceptor());
     }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index 058c555d34..e81cc22944 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -16,7 +16,7 @@ import io.metersphere.dto.TestResourcePoolDTO;
 import io.metersphere.engine.kubernetes.provider.KubernetesProvider;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +43,8 @@ public class TestResourcePoolService {
     private TestResourceMapper testResourceMapper;
     @Resource
     private ExtTestReourcePoolMapper extTestReourcePoolMapper;
+    @Resource
+    private RestTemplate restTemplate;
 
     public TestResourcePoolDTO addTestResourcePool(TestResourcePoolDTO testResourcePool) {
         testResourcePool.setId(UUID.randomUUID().toString());
@@ -100,9 +102,8 @@ public class TestResourcePoolService {
 
     private boolean validateNode(NodeDTO node) {
         try {
-            RestTemplate restTemplate = new RestTemplate();
             ResponseEntity<String> entity = restTemplate.getForEntity(String.format(nodeControllerUrl, node.getIp(), node.getPort()), String.class);
-            return entity.getStatusCode().value() == HttpStatus.SC_OK;
+            return HttpStatus.OK.equals(entity.getStatusCode());
         } catch (Exception e) {
             return false;
         }