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

fix(接口定义): 修复删除jar包还能引用到jar包内容的缺陷 

--bug=1023186 --user=王孝刚 【接口测试】文件管理中删除jar包后，还能引用到jar包的内容
https://www.tapd.cn/55049933/s/1336737
This commit is contained in:
wxg0103 2023-02-16 17:51:02 +08:00 committed by wxg0103
parent 68f06dcd7f
commit dff708dfcb
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/jmeter/NewDriverManager.java
View File

@ -63,8 +63,8 @@ public class NewDriverManager {
FileMetadataService fileMetadataService = CommonBeanFactory.getBean(FileMetadataService.class); FileMetadataService fileMetadataService = CommonBeanFactory.getBean(FileMetadataService.class);
map.forEach((key, value) -> { map.forEach((key, value) -> {
loaderProjectIds.add(key);
if (CollectionUtils.isNotEmpty(value)) { if (CollectionUtils.isNotEmpty(value)) {
loaderProjectIds.add(key);
//历史数据 //历史数据
value.stream().distinct().filter(s -> s.isHasFile()).forEach(s -> { value.stream().distinct().filter(s -> s.isHasFile()).forEach(s -> {
//获取文件内容 //获取文件内容

24
framework/sdk-parent/jmeter/src/main/java/io/metersphere/utils/JarConfigUtils.java
View File

@ -35,13 +35,16 @@ public class JarConfigUtils {
.stream() .stream()
.map(ProjectJarConfig::getId) .map(ProjectJarConfig::getId)
.collect(Collectors.toList()).contains(nodeFile)).collect(Collectors.toList()); .collect(Collectors.toList()).contains(nodeFile)).collect(Collectors.toList());
expiredJar.forEach(jar if (CollectionUtils.isNotEmpty(expiredJar)) {
-> deleteDir(StringUtils.join( expiredJar.forEach(jar
localPath, -> deleteDir(StringUtils.join(
File.separator, localPath,
item, File.separator,
File.separator, item,
jar))); File.separator,
jar)));
jarConfigsMap.put(item, new ArrayList<>());
}
projectJarConfigs.forEach(projectJarConfig -> { projectJarConfigs.forEach(projectJarConfig -> {
if (CollectionUtils.isNotEmpty(nodeFiles)) { if (CollectionUtils.isNotEmpty(nodeFiles)) {
nodeFiles.forEach(refId -> { nodeFiles.forEach(refId -> {
@ -59,15 +62,18 @@ public class JarConfigUtils {
} }
}); });
} else { } else {
//本地完全没有jar包 需要下载
jarConfigs.add(projectJarConfig); jarConfigs.add(projectJarConfig);
} }
} }
}); });
} else { } else {
//本地没有文件，需要从服务器下载 //项目级别的目录都不存在，需要从服务器下载
jarConfigs.add(projectJarConfig); jarConfigs.add(projectJarConfig);
} }
jarConfigsMap.put(item, jarConfigs); if (CollectionUtils.isNotEmpty(jarConfigs)) {
jarConfigsMap.put(item, jarConfigs);
}
}); });
} }
}); });