test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

post -> get

This commit is contained in:
Captain.B 2020-04-21 16:35:04 +08:00
parent 3e655fbc55
commit 31fd266e59
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java
View File

@ -10,7 +10,6 @@ import io.metersphere.dto.NodeDTO;
import io.metersphere.engine.AbstractEngine; import io.metersphere.engine.AbstractEngine;
import io.metersphere.engine.EngineContext; import io.metersphere.engine.EngineContext;
import io.metersphere.engine.EngineFactory; import io.metersphere.engine.EngineFactory;
import io.metersphere.engine.docker.request.BaseRequest;
import io.metersphere.engine.docker.request.TestRequest; import io.metersphere.engine.docker.request.TestRequest;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -91,14 +90,13 @@ public class DockerTestEngine extends AbstractEngine {
public void stop() { public void stop() {
// TODO 停止运行测试 // TODO 停止运行测试
String testId = loadTest.getId(); String testId = loadTest.getId();
BaseRequest request = new BaseRequest();
this.resourceList.forEach(r -> { this.resourceList.forEach(r -> {
NodeDTO node = JSON.parseObject(r.getConfiguration(), NodeDTO.class); NodeDTO node = JSON.parseObject(r.getConfiguration(), NodeDTO.class);
String ip = node.getIp(); String ip = node.getIp();
Integer port = node.getPort(); Integer port = node.getPort();
String uri = String.format(BASE_URL + "/jmeter/container/stop/" + testId, ip, port); String uri = String.format(BASE_URL + "/jmeter/container/stop/" + testId, ip, port);
restTemplate.postForObject(uri, request, String.class); restTemplate.getForObject(uri, String.class);
}); });
} }
@ -106,14 +104,13 @@ public class DockerTestEngine extends AbstractEngine {
public Map<String, String> log() { public Map<String, String> log() {
String testId = loadTest.getId(); String testId = loadTest.getId();
Map<String, String> logs = new HashMap<>(); Map<String, String> logs = new HashMap<>();
BaseRequest request = new BaseRequest();
this.resourceList.forEach(r -> { this.resourceList.forEach(r -> {
NodeDTO node = JSON.parseObject(r.getConfiguration(), NodeDTO.class); NodeDTO node = JSON.parseObject(r.getConfiguration(), NodeDTO.class);
String ip = node.getIp(); String ip = node.getIp();
Integer port = node.getPort(); Integer port = node.getPort();
String uri = String.format(BASE_URL + "/jmeter/container/log/" + testId, ip, port); String uri = String.format(BASE_URL + "/jmeter/container/log/" + testId, ip, port);
String log = restTemplate.postForObject(uri, request, String.class); String log = restTemplate.getForObject(uri, String.class);
logs.put(node.getIp(), log); logs.put(node.getIp(), log);
}); });
return logs; return logs;