test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-05 05:29:29 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

fix(接口测试): 引用的公共脚本被删除，获取接口详情报错

Browse Source
This commit is contained in:
AgAngle 2024-03-29 16:52:54 +08:00 committed by Craftsman
parent f1215eba88
commit c7c8734ced
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptProcessorConverter.java
View File

@ -57,6 +57,10 @@ public abstract class ScriptProcessorConverter extends MsProcessorConverter<Scri
String scriptLanguage = scriptProcessor.getScriptLanguage();
String script = scriptProcessor.getScript();
if (scriptProcessor.isEnableCommonScript()) {
if (BooleanUtils.isTrue(scriptProcessor.getCommonScriptInfo().getDeleted())) {
// 如果公共脚本被删除则不处理
return;
}
scriptLanguage = scriptProcessor.getCommonScriptInfo().getScriptLanguage();
script = scriptProcessor.getCommonScriptInfo().getScript();
}

9
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiCommonService.java
View File

@ -208,8 +208,17 @@ public class ApiCommonService {
for (ScriptProcessor processor : scriptsProcessors) {
CommonScriptInfo commonScriptInfo = processor.getCommonScriptInfo();
CustomFunctionBlob customFunctionBlob = customFunctionBlobMap.get(commonScriptInfo.getId());
CustomFunction customFunction = customFunctionMap.get(commonScriptInfo.getId());
if (customFunction == null || customFunctionBlob == null) {
if (customFunction == null) {
// 公共脚本被删除，就改成非公共脚本
processor.getCommonScriptInfo().setDeleted(true);
}
continue;
}
// 设置公共脚本信息
Optional.ofNullable(customFunctionBlob.getParams()).ifPresent(paramsBlob -> {
List<KeyValueParam> commonParams = JSON.parseArray(new String(paramsBlob), KeyValueParam.class);

4
backend/services/project-management/src/main/java/io/metersphere/project/dto/CommonScriptInfo.java
View File

@ -18,6 +18,10 @@ public class CommonScriptInfo {
*/
@Size(min = 1, max = 50)
private String id;
/**
* 脚本是否删除
*/
private Boolean deleted = false;
/**
* 公共脚本的名字
* 页面展示需要