fix(接口测试): 修复测试计划定时任务提示被遮挡问题

This commit is contained in:
fit2-zhao 2022-11-24 11:37:59 +08:00 committed by fit2-zhao
parent 44b80b82ff
commit 4f229d3d21
3 changed files with 17 additions and 22 deletions

View File

@ -194,29 +194,25 @@ public class ApiJMeterFileService {
} else {
return new HashMap<>();
}
}
private Map<String, byte[]> getPlugJar() {
Map<String, byte[]> jarFiles = new LinkedHashMap<>();
// jar
List<Plugin> plugins = pluginService.list();
if (CollectionUtils.isNotEmpty(plugins)) {
plugins = plugins.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-> new TreeSet<>(Comparator.comparing(Plugin::getPluginId))), ArrayList::new));
if (CollectionUtils.isNotEmpty(plugins)) {
plugins.forEach(item -> {
String path = item.getSourcePath();
File file = new File(path);
if (file.isDirectory() && !path.endsWith("/")) {
file = new File(path + "/");
}
byte[] fileByte = FileUtils.fileToByte(file);
if (fileByte != null) {
jarFiles.put(file.getName(), fileByte);
}
});
}
plugins = plugins.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(Plugin::getPluginId))), ArrayList::new));
plugins.forEach(item -> {
File file = new File(item.getSourcePath());
if (file.isDirectory() && !item.getSourcePath().endsWith("/")) {
file = new File(item.getSourcePath() + "/");
}
byte[] fileByte = FileUtils.fileToByte(file);
if (fileByte != null) {
jarFiles.put(file.getName(), fileByte);
}
});
}
return jarFiles;
}

View File

@ -59,11 +59,6 @@ public class JmeterRunRequestDTO {
*/
private HashTree hashTree;
/**
* Node 执行脚本
*/
private String jmxScript;
/**
* 并发数
*/

View File

@ -425,6 +425,10 @@ export default {
});
},
saveCron() {
if (this.runConfig.runWithinResourcePool && this.runConfig.resourcePoolId == null) {
this.$warning(this.$t('workspace.env_group.please_select_run_within_resource_pool'));
return;
}
this.$refs['from'].validate((valid) => {
if (valid) {
this.intervalShortValidate();