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

fix(接口测试): 修复场景点击caseID未跳转的缺陷 

--bug=1033075 --user=王孝刚 【接口测试】接口场景-导入一个case-点击caseID-未跳转有报错
https://www.tapd.cn/55049933/s/1438564
This commit is contained in:
wxg0103 2023-11-21 15:15:41 +08:00 committed by wxg0103
parent dc0c60c6f5
commit 66d96d2acc
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-test/backend/src/main/java/io/metersphere/api/exec/generator/JSONSchemaBuilder.java
View File

@ -51,9 +51,8 @@ public class JSONSchemaBuilder {
if (object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.ARRAY)) { if (object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.ARRAY)) {
analyzeProperty(rootObj, PropertyConstant.MS_OBJECT, object, map); analyzeProperty(rootObj, PropertyConstant.MS_OBJECT, object, map);
} else if (!object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.OBJECT) && !(object instanceof JsonObject)) { } else if (!object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.OBJECT) && !(object instanceof JsonObject)) {
String asString = object.getAsString();
analyzeProperty(rootObj, object.getAsString(), object, map); analyzeProperty(rootObj, object.getAsString(), object, map);
} else { } else if (object instanceof JsonObject){
formatObject(map, object, rootObj); formatObject(map, object, rootObj);
} }
} }

4
api-test/backend/src/main/java/io/metersphere/api/exec/generator/JSONSchemaParser.java
View File

@ -53,8 +53,10 @@ public class JSONSchemaParser {
&& object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.ARRAY)) { && object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.ARRAY)) {
analyzeProperty(rootObj, PropertyConstant.MS_OBJECT, object, processMap); analyzeProperty(rootObj, PropertyConstant.MS_OBJECT, object, processMap);
} else if (object.has(PropertyConstant.TYPE) } else if (object.has(PropertyConstant.TYPE)
&& !object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.OBJECT)) { && !object.get(PropertyConstant.TYPE).getAsString().equals(PropertyConstant.OBJECT) && !(object instanceof JsonObject)) {
analyzeProperty(rootObj, object.getAsString(), object, processMap); analyzeProperty(rootObj, object.getAsString(), object, processMap);
} else if (object instanceof JsonObject){
analyzeProperty(rootObj, PropertyConstant.MS_OBJECT, object, processMap);
} }
} }

3
api-test/frontend/src/api/user.js
View File

@ -1,7 +1,8 @@
import { get } from 'metersphere-frontend/src/plugins/request'; import { get } from 'metersphere-frontend/src/plugins/request';
export function getCurrentByResourceId(id) { export function getCurrentByResourceId(id) {
return get('/api/current/user/' + id, () => {}); console.log(id);
return get('/api/current/user/' + id);
} }
export function getProjectMember() { export function getProjectMember() {