Merge branch 'dev' of https://github.com/metersphere/server into dev

backend/src/main/java/io/metersphere/config/WebConfig.java

@@ -3,6 +3,7 @@ package io.metersphere.config;
 import io.metersphere.interceptor.TestInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -17,6 +18,12 @@ public class WebConfig implements WebMvcConfigurer {
 
     @Bean
     public RestTemplate restTemplate() {
-        return new RestTemplate();
+        RestTemplate restTemplate = new RestTemplate();
+        HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+        httpRequestFactory.setConnectionRequestTimeout(4000);
+        httpRequestFactory.setConnectTimeout(4000);
+        httpRequestFactory.setReadTimeout(5000);
+        restTemplate.setRequestFactory(httpRequestFactory);
+        return restTemplate;
     }
 }

backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java

@@ -6,6 +6,7 @@ import io.metersphere.base.domain.TestResource;
 import io.metersphere.commons.constants.ResourceStatusEnum;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.dto.NodeDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.performance.engine.AbstractEngine;
@@ -84,7 +85,12 @@ public class DockerTestEngine extends AbstractEngine {
         testRequest.setTestData(context.getTestData());
         testRequest.setEnv(context.getEnv());
 
-        restTemplate.postForObject(uri, testRequest, String.class);
+        try {
+            restTemplate.postForObject(uri, testRequest, String.class);
+        } catch (Exception e) {
+            LogUtil.error("run test fail..." + testId);
+            MSException.throwException(Translator.get("start_engine_fail"));
+        }
     }
 
     @Override
@@ -97,7 +103,12 @@ public class DockerTestEngine extends AbstractEngine {
             Integer port = node.getPort();
 
             String uri = String.format(BASE_URL + "/jmeter/container/stop/" + testId, ip, port);
-            restTemplate.getForObject(uri, String.class);
+            try {
+                restTemplate.getForObject(uri, String.class);
+            } catch (Exception e) {
+                LogUtil.error("stop load test fail... " + testId);
+                MSException.throwException(Translator.get("delete_fail"));
+            }
         });
     }
 

backend/src/main/java/io/metersphere/service/TestResourcePoolService.java

@@ -201,11 +201,6 @@ public class TestResourcePoolService {
 
     private boolean validateNode(NodeDTO node) {
         try {
-            HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
-            httpRequestFactory.setConnectionRequestTimeout(4000);
-            httpRequestFactory.setConnectTimeout(4000);
-            httpRequestFactory.setReadTimeout(5000);
-            restTemplate.setRequestFactory(httpRequestFactory);
             ResponseEntity<String> entity = restTemplate.getForEntity(String.format(nodeControllerUrl, node.getIp(), node.getPort()), String.class);
             return HttpStatus.OK.equals(entity.getStatusCode());
         } catch (Exception e) {

backend/src/main/resources/i18n/messages_en_US.properties

@@ -6,6 +6,8 @@ number=Number
 row=row
 error=error
 connection_failed=Connection failed
+delete_fail=Delete fail
+start_engine_fail=Start fail
 #user related
 user_email_already_exists=User email already exists
 user_id_is_null=User ID cannot be null

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -5,6 +5,8 @@ cannot_be_null=不能为空
 number=第
 row=行
 error=出错
+delete_fail=删除失败
+start_engine_fail=启动失败
 #user related
 user_email_already_exists=用户邮箱已存在
 user_id_is_null=用户ID不能为空

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -6,6 +6,8 @@ number=第
 row=行
 error=出錯
 connection_failed=連接失敗
+delete_fail=刪除失敗
+start_engine_fail=啟動失敗
 #user related
 user_email_already_exists=用戶郵箱已存在
 user_id_is_null=用戶ID不能為空