fix (接口定义): 修复导入sql类型接口目录错误问题
--bug=1007085 --user=赵勇 【接口测试】导入sql接口定义,没有导入到所选模块中【+github#6024】 https://www.tapd.cn/55049933/s/1056589
This commit is contained in:
parent
cae077582e
commit
e1b0467752
|
@ -70,12 +70,16 @@ public class ApiDefinitionImportUtil {
|
||||||
|
|
||||||
private static void createNodeTree(NodeTree nodeTree, String pid, String projectId,
|
private static void createNodeTree(NodeTree nodeTree, String pid, String projectId,
|
||||||
ApiModuleService apiModuleService, String path, int baseLevel) {
|
ApiModuleService apiModuleService, String path, int baseLevel) {
|
||||||
|
ApiModule apiModule = apiModuleService.get(pid);
|
||||||
ApiModule module = new ApiModule();
|
ApiModule module = new ApiModule();
|
||||||
BeanUtils.copyBean(module, nodeTree);
|
BeanUtils.copyBean(module, nodeTree);
|
||||||
apiModuleService.buildNewModule(module);
|
apiModuleService.buildNewModule(module);
|
||||||
module.setProjectId(projectId);
|
module.setProjectId(projectId);
|
||||||
module.setParentId(pid);
|
module.setParentId(pid);
|
||||||
module.setLevel(module.getLevel() + baseLevel);
|
module.setLevel(module.getLevel() + baseLevel);
|
||||||
|
if (apiModule != null) {
|
||||||
|
module.setProtocol(apiModule.getProtocol());
|
||||||
|
}
|
||||||
createModule(module, SessionUtils.getUserId());
|
createModule(module, SessionUtils.getUserId());
|
||||||
nodeTree.setNewId(module.getId());
|
nodeTree.setNewId(module.getId());
|
||||||
path = path + nodeTree.getName();
|
path = path + nodeTree.getName();
|
||||||
|
@ -91,6 +95,7 @@ public class ApiDefinitionImportUtil {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据导出的模块树,创建新的模块树
|
* 根据导出的模块树,创建新的模块树
|
||||||
|
*
|
||||||
* @param nodeTree
|
* @param nodeTree
|
||||||
* @param projectId
|
* @param projectId
|
||||||
*/
|
*/
|
||||||
|
@ -124,12 +129,14 @@ public class ApiDefinitionImportUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void createModule(ApiModule module) {
|
public static void createModule(ApiModule module) {
|
||||||
createModule(module, null);
|
createModule(module, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void createModule(ApiModule module, String userId) {
|
public static void createModule(ApiModule module, String userId) {
|
||||||
ApiModuleService apiModuleService = CommonBeanFactory.getBean(ApiModuleService.class);
|
ApiModuleService apiModuleService = CommonBeanFactory.getBean(ApiModuleService.class);
|
||||||
module.setProtocol(RequestType.HTTP);
|
if (StringUtils.isEmpty(module.getProtocol())) {
|
||||||
|
module.setProtocol(RequestType.HTTP);
|
||||||
|
}
|
||||||
if (module.getName().length() > 64) {
|
if (module.getName().length() > 64) {
|
||||||
module.setName(module.getName().substring(0, 64));
|
module.setName(module.getName().substring(0, 64));
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,6 +60,9 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
|
||||||
super(ApiModuleDTO.class);
|
super(ApiModuleDTO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ApiModule get(String id) {
|
||||||
|
return apiModuleMapper.selectByPrimaryKey(id);
|
||||||
|
}
|
||||||
public List<ApiModuleDTO> getNodeTreeByProjectId(String projectId, String protocol) {
|
public List<ApiModuleDTO> getNodeTreeByProjectId(String projectId, String protocol) {
|
||||||
// 判断当前项目下是否有默认模块,没有添加默认模块
|
// 判断当前项目下是否有默认模块,没有添加默认模块
|
||||||
this.getDefaultNode(projectId,protocol);
|
this.getDefaultNode(projectId,protocol);
|
||||||
|
|
|
@ -70,9 +70,9 @@ function getScenarioFiles(obj) {
|
||||||
return scenarioFiles;
|
return scenarioFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function saveScenario(url, scenario, scenarioDefinition, _this,success) {
|
export function saveScenario(url, scenario, scenarioDefinition, _this, success) {
|
||||||
let bodyFiles = getBodyUploadFiles(scenario, scenarioDefinition);
|
let bodyFiles = getBodyUploadFiles(scenario, scenarioDefinition);
|
||||||
if (_this.$store.state.pluginFiles && _this.$store.state.pluginFiles.length > 0) {
|
if (_this && _this.$store && _this.$store.state && _this.$store.state.pluginFiles && _this.$store.state.pluginFiles.length > 0) {
|
||||||
_this.$store.state.pluginFiles.forEach(fileItem => {
|
_this.$store.state.pluginFiles.forEach(fileItem => {
|
||||||
if (fileItem.file) {
|
if (fileItem.file) {
|
||||||
scenario.bodyFileRequestIds.push(fileItem.file.uid);
|
scenario.bodyFileRequestIds.push(fileItem.file.uid);
|
||||||
|
|
|
@ -101,7 +101,8 @@
|
||||||
this.$emit('saveAsEdit', this.scenarioForm);
|
this.$emit('saveAsEdit', this.scenarioForm);
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
} else {
|
} else {
|
||||||
saveScenario(path, this.scenarioForm, [], () => {
|
saveScenario(path, this.scenarioForm, [], this,(response) => {
|
||||||
|
this.$success(this.$t('commons.save_success'));
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
this.$emit('refresh');
|
this.$emit('refresh');
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue