fix(接口测试): 修复测试计划定时任务提示被遮挡问题
This commit is contained in:
parent
44b80b82ff
commit
4f229d3d21
|
@ -194,29 +194,25 @@ public class ApiJMeterFileService {
|
||||||
} else {
|
} else {
|
||||||
return new HashMap<>();
|
return new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, byte[]> getPlugJar() {
|
private Map<String, byte[]> getPlugJar() {
|
||||||
Map<String, byte[]> jarFiles = new LinkedHashMap<>();
|
Map<String, byte[]> jarFiles = new LinkedHashMap<>();
|
||||||
// jar 包
|
|
||||||
List<Plugin> plugins = pluginService.list();
|
List<Plugin> plugins = pluginService.list();
|
||||||
if (CollectionUtils.isNotEmpty(plugins)) {
|
if (CollectionUtils.isNotEmpty(plugins)) {
|
||||||
plugins = plugins.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
|
plugins = plugins.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
|
||||||
-> new TreeSet<>(Comparator.comparing(Plugin::getPluginId))), ArrayList::new));
|
new TreeSet<>(Comparator.comparing(Plugin::getPluginId))), ArrayList::new));
|
||||||
if (CollectionUtils.isNotEmpty(plugins)) {
|
plugins.forEach(item -> {
|
||||||
plugins.forEach(item -> {
|
File file = new File(item.getSourcePath());
|
||||||
String path = item.getSourcePath();
|
if (file.isDirectory() && !item.getSourcePath().endsWith("/")) {
|
||||||
File file = new File(path);
|
file = new File(item.getSourcePath() + "/");
|
||||||
if (file.isDirectory() && !path.endsWith("/")) {
|
}
|
||||||
file = new File(path + "/");
|
byte[] fileByte = FileUtils.fileToByte(file);
|
||||||
}
|
if (fileByte != null) {
|
||||||
byte[] fileByte = FileUtils.fileToByte(file);
|
jarFiles.put(file.getName(), fileByte);
|
||||||
if (fileByte != null) {
|
}
|
||||||
jarFiles.put(file.getName(), fileByte);
|
});
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return jarFiles;
|
return jarFiles;
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,11 +59,6 @@ public class JmeterRunRequestDTO {
|
||||||
*/
|
*/
|
||||||
private HashTree hashTree;
|
private HashTree hashTree;
|
||||||
|
|
||||||
/**
|
|
||||||
* Node 执行脚本
|
|
||||||
*/
|
|
||||||
private String jmxScript;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 并发数
|
* 并发数
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -425,6 +425,10 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
saveCron() {
|
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) => {
|
this.$refs['from'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.intervalShortValidate();
|
this.intervalShortValidate();
|
||||||
|
|
Loading…
Reference in New Issue