fix(接口测试): 增加是否开启定时同步jar开关

This commit is contained in:
fit2-zhao 2021-12-28 17:58:50 +08:00 committed by fit2-zhao
parent adddf12baa
commit bb47c26701
7 changed files with 22 additions and 2 deletions

View File

@ -11,6 +11,8 @@ import java.util.Map;
public class RunRequest { public class RunRequest {
private String testId; private String testId;
private String poolId; private String poolId;
// 开启定时同步
private boolean enable;
// api / case 或有这个属性值 // api / case 或有这个属性值
private String reportId; private String reportId;
private String url; private String url;

View File

@ -192,6 +192,7 @@ public class JMeterService {
NodeDTO node = JSON.parseObject(configuration, NodeDTO.class); NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
String nodeIp = node.getIp(); String nodeIp = node.getIp();
Integer port = node.getPort(); Integer port = node.getPort();
runRequest.setEnable(node.isEnable());
String uri = String.format(BASE_URL + "/jmeter/api/start", nodeIp, port); String uri = String.format(BASE_URL + "/jmeter/api/start", nodeIp, port);
ResponseEntity<String> result = restTemplate.postForEntity(uri, runRequest, String.class); ResponseEntity<String> result = restTemplate.postForEntity(uri, runRequest, String.class);
if (result == null || !StringUtils.equals("SUCCESS", result.getBody())) { if (result == null || !StringUtils.equals("SUCCESS", result.getBody())) {

View File

@ -7,6 +7,7 @@ import lombok.Setter;
@Setter @Setter
public class NodeDTO { public class NodeDTO {
private String ip; private String ip;
private boolean enable;
private Integer port; private Integer port;
private Integer monitorPort; private Integer monitorPort;
private Integer maxConcurrency; private Integer maxConcurrency;

View File

@ -128,18 +128,23 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item :label="$t('test_resource_pool.max_threads')" <el-form-item :label="$t('test_resource_pool.max_threads')"
:rules="requiredRules"> :rules="requiredRules">
<el-input-number v-model="item.maxConcurrency" :min="1" :max="1000000000"/> <el-input-number v-model="item.maxConcurrency" :min="1" :max="1000000000"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item :label="$t('test_resource_pool.pod_thread_limit')" <el-form-item :label="$t('test_resource_pool.pod_thread_limit')"
:rules="requiredRules"> :rules="requiredRules">
<el-input-number v-model="item.podThreadLimit" :min="1" :max="1000000"/> <el-input-number v-model="item.podThreadLimit" :min="1" :max="1000000"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item :label="$t('test_resource_pool.sync_jar')">
<el-checkbox v-model="item.enable"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
@ -201,6 +206,14 @@
:max="1000000000"></el-input-number> :max="1000000000"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
align="center"
prop="enable"
:label="$t('test_resource_pool.sync_jar')">
<template v-slot:default="{row}">
<el-checkbox size="small" v-model="row.enable"/>
</template>
</el-table-column>
<el-table-column align="center" :label="$t('commons.operating')"> <el-table-column align="center" :label="$t('commons.operating')">
<template v-slot:default="{row, $index}"> <template v-slot:default="{row, $index}">
<el-button @click="removeResourceInfo($index)" type="danger" icon="el-icon-delete" size="mini" <el-button @click="removeResourceInfo($index)" type="danger" icon="el-icon-delete" size="mini"

View File

@ -1917,6 +1917,7 @@ export default {
update_resource_pool: 'Create resource pool', update_resource_pool: 'Create resource pool',
select_pool_type: 'Select resource type', select_pool_type: 'Select resource type',
max_threads: 'Maximum concurrent number', max_threads: 'Maximum concurrent number',
sync_jar: 'Timing synchronization jar',
input_pool_name: 'Please enter the resource pool name', input_pool_name: 'Please enter the resource pool name',
pool_name_valid: 'Resource pool name does not support special characters', pool_name_valid: 'Resource pool name does not support special characters',
cannot_remove_all_node: 'Cannot delete all independent nodes', cannot_remove_all_node: 'Cannot delete all independent nodes',

View File

@ -1928,6 +1928,7 @@ export default {
update_resource_pool: '修改资源池', update_resource_pool: '修改资源池',
select_pool_type: '选择资源类型', select_pool_type: '选择资源类型',
max_threads: '最大并发数', max_threads: '最大并发数',
sync_jar: '定时同步JAR',
input_pool_name: '请输入资源池名称', input_pool_name: '请输入资源池名称',
pool_name_valid: '资源池名称不支持特殊字符', pool_name_valid: '资源池名称不支持特殊字符',
cannot_remove_all_node: '不能删除所有独立节点', cannot_remove_all_node: '不能删除所有独立节点',

View File

@ -1929,6 +1929,7 @@ export default {
update_resource_pool: '修改資源池', update_resource_pool: '修改資源池',
select_pool_type: '選擇資源類型', select_pool_type: '選擇資源類型',
max_threads: '最大並發數', max_threads: '最大並發數',
sync_jar: '定時同步JAR',
input_pool_name: '請輸入資源池名稱', input_pool_name: '請輸入資源池名稱',
pool_name_valid: '資源池名稱不支持特殊字符', pool_name_valid: '資源池名稱不支持特殊字符',
cannot_remove_all_node: '不能刪除所有獨立節點', cannot_remove_all_node: '不能刪除所有獨立節點',