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

fix(接口自动化): 接口自动化多节点执行问题调整

This commit is contained in:
fit2-zhao 2021-04-19 09:53:52 +08:00 committed by fit2-zhao
parent 78f15b801c
commit fbdb707d7a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
View File

@ -31,8 +31,9 @@ import java.util.Map;
@Service @Service
public class MsKafkaListener { public class MsKafkaListener {
public static final String TOPICS = "ms-api-exec-topic"; public static final String TOPICS = "ms-api-exec-topic";
public static final String CONSUME_ID = "ms-api-exec-consume";
@KafkaListener(topics = TOPICS) @KafkaListener(id = CONSUME_ID, topics = TOPICS, groupId = "${spring.kafka.consumer.group-id}")
public void consume(ConsumerRecord<?, String> record) { public void consume(ConsumerRecord<?, String> record) {
LogUtil.info("接收到执行结果开始存储"); LogUtil.info("接收到执行结果开始存储");
this.save(record.value()); this.save(record.value());

2
backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
View File

@ -55,7 +55,7 @@ public class ApiDefinitionExecResultService {
ApiDefinitionExecResult saveResult = new ApiDefinitionExecResult(); ApiDefinitionExecResult saveResult = new ApiDefinitionExecResult();
saveResult.setId(UUID.randomUUID().toString()); saveResult.setId(UUID.randomUUID().toString());
saveResult.setCreateTime(item.getStartTime()); saveResult.setCreateTime(item.getStartTime());
saveResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId()); saveResult.setUserId(result.getUserId());
saveResult.setName(item.getName()); saveResult.setName(item.getName());
if (item.getName().indexOf("<->") != -1) { if (item.getName().indexOf("<->") != -1) {
saveResult.setName(item.getName().substring(0, item.getName().indexOf("<->"))); saveResult.setName(item.getName().substring(0, item.getName().indexOf("<->")));