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

fix(接口文档): #1007558 接口文档的JSON-Schema 预览不正确 

--bug=1007558 --user=宋天阳 JSON-Schema 预览不正确
https://www.tapd.cn/55049933/s/1061803
This commit is contained in:
song-tianyang 2021-10-29 18:49:57 +08:00 committed by song-tianyang
parent 3906123bdb
commit 987d8f919c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
View File

@ -1,5 +1,6 @@
package io.metersphere.api.service; package io.metersphere.api.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.metersphere.api.dto.share.*; import io.metersphere.api.dto.share.*;
@ -9,6 +10,7 @@ import io.metersphere.base.mapper.TestPlanReportMapper;
import io.metersphere.base.mapper.ext.ExtShareInfoMapper; import io.metersphere.base.mapper.ext.ExtShareInfoMapper;
import io.metersphere.commons.constants.ShareType; import io.metersphere.commons.constants.ShareType;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.json.JSONSchemaGenerator;
import io.metersphere.commons.utils.BeanUtils; import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.SessionUtils; import io.metersphere.commons.utils.SessionUtils;
@ -165,6 +167,10 @@ public class ShareInfoService {
if (isJsonSchema) { if (isJsonSchema) {
apiInfoDTO.setRequestBodyParamType("JSON-SCHEMA"); apiInfoDTO.setRequestBodyParamType("JSON-SCHEMA");
apiInfoDTO.setJsonSchemaBody(bodyObj); apiInfoDTO.setJsonSchemaBody(bodyObj);
if(bodyObj.containsKey("jsonSchema")){
JSONObject jsonSchemaObj = bodyObj.getJSONObject("jsonSchema");
apiInfoDTO.setRequestPreviewData(JSON.parse(JSONSchemaGenerator.getJson(jsonSchemaObj.toJSONString())));
}
} else { } else {
if (bodyObj.containsKey("raw")) { if (bodyObj.containsKey("raw")) {
String raw = bodyObj.getString("raw"); String raw = bodyObj.getString("raw");
@ -359,7 +365,9 @@ public class ShareInfoService {
} }
} }
} }
if(!previewJsonArray.isEmpty()){
apiInfoDTO.setRequestPreviewData(previewJsonArray); apiInfoDTO.setRequestPreviewData(previewJsonArray);
}
apiInfoDTO.setSelectedFlag(true); apiInfoDTO.setSelectedFlag(true);
return apiInfoDTO; return apiInfoDTO;
} }