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

fix(测试跟踪): 同步jira缺陷非描述字段的富文本框图片未同步 

--bug=1014666 --user=陈建星 【测试跟踪】github#15514 jira自定义富文本环境字段添加图片后，同步到ms缺陷图片未显示 https://www.tapd.cn/55049933/s/1197257
This commit is contained in:
chenjianxing 2022-07-07 17:10:42 +08:00 committed by f2c-ci-robot[bot]
parent 90911b4f8b
commit 1f8c1ab8d5
2 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
View File

@ -412,6 +412,11 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
}
protected String syncIssueCustomField(String customFieldsStr, JSONObject issue) {
List<CustomFieldItemDTO> customFieldItemDTOList = syncIssueCustomFieldList(customFieldsStr, issue);
return JSONObject.toJSONString(customFieldItemDTOList);
}
protected List<CustomFieldItemDTO> syncIssueCustomFieldList(String customFieldsStr, JSONObject issue) {
List<CustomFieldItemDTO> customFields = CustomFieldService.getCustomFields(customFieldsStr);
Set<String> names = issue.keySet();
customFields.forEach(item -> {
@ -451,7 +456,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
}
}
});
return JSONObject.toJSONString(customFields);
return customFields;
}
@Override

73
backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
View File

@ -78,8 +78,31 @@ public class JiraPlatform extends AbstractIssuePlatform {
JSONObject fields = jiraIssue.getFields();
String status = getStatus(fields);
String description = dealWithDescription(fields.getString("description"), fields.getJSONArray("attachment"));
Map<String, String> fileContentMap = getContextMap(fields.getJSONArray("attachment"));
// 先转换下desc的图片
String description = dealWithDescription(fields.getString("description"), fileContentMap);
fields.put("description", description);
CustomFieldItemDTO descItem = null;
List<CustomFieldItemDTO> customFieldItems = syncIssueCustomFieldList(issue.getCustomFields(), jiraIssue.getFields());
// 其他自定义里有富文本框的也转换下图片
for (CustomFieldItemDTO item : customFieldItems) {
if (StringUtils.equals("description", item.getId())) {
// desc转过了，跳过
descItem = item;
} else {
if (StringUtils.equals(CustomFieldType.RICH_TEXT.getValue(), item.getType())) {
item.setValue(dealWithDescription((String) item.getValue(), fileContentMap));
}
}
}
// 剩下的附件就是非富文本框的附件
description = appendMoreImage(description, fileContentMap);
if (descItem != null) {
descItem.setValue(description);
}
JSONObject assignee = (JSONObject) fields.get("assignee");
issue.setTitle(fields.getString("summary"));
@ -89,34 +112,15 @@ public class JiraPlatform extends AbstractIssuePlatform {
issue.setDescription(description);
issue.setPlatformStatus(status);
issue.setPlatform(key);
issue.setCustomFields(syncIssueCustomField(issue.getCustomFields(), jiraIssue.getFields()));
issue.setCustomFields(JSONObject.toJSONString(customFieldItems));
return issue;
}
private String dealWithDescription(String description, JSONArray attachments) {
private String dealWithDescription(String description, Map<String, String> fileContentMap) {
if (StringUtils.isBlank(description)) {
return description;
}
// 附件处理
Map<String, String> fileContentMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(attachments)) {
for (int i = 0; i < attachments.size(); i++) {
JSONObject attachment = attachments.getJSONObject(i);
String filename = attachment.getString("filename");
String content = attachment.getString("content");
content = "/resource/md/get/url?platform=Jira&url=" + URLEncoder.encode(content, StandardCharsets.UTF_8);
if (StringUtils.contains(attachment.getString("mimeType"), "image")) {
String contentUrl = "![" + filename + "](" + content + ")";
fileContentMap.put(filename, contentUrl);
} else {
String contentUrl = "附件[" + filename + "]下载地址:" + content;
fileContentMap.put(filename, contentUrl);
}
}
}
String[] splitStrs = description.split("\\n\\n");
for (int j = 0; j < splitStrs.length; j++) {
String splitStr = splitStrs[j];
@ -139,7 +143,10 @@ public class JiraPlatform extends AbstractIssuePlatform {
}
}
}
return description;
}
private String appendMoreImage(String description, Map<String, String> fileContentMap) {
for (String key: fileContentMap.keySet()) {
// 同步jira上传的附件
description += "\n" + fileContentMap.get(key);
@ -147,6 +154,28 @@ public class JiraPlatform extends AbstractIssuePlatform {
return description;
}
private Map<String, String> getContextMap(JSONArray attachments) {
// 附件处理
Map<String, String> fileContentMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(attachments)) {
for (int i = 0; i < attachments.size(); i++) {
JSONObject attachment = attachments.getJSONObject(i);
String filename = attachment.getString("filename");
String content = attachment.getString("content");
content = "/resource/md/get/url?platform=Jira&url=" + URLEncoder.encode(content, StandardCharsets.UTF_8);
if (StringUtils.contains(attachment.getString("mimeType"), "image")) {
String contentUrl = "![" + filename + "](" + content + ")";
fileContentMap.put(filename, contentUrl);
} else {
String contentUrl = "附件[" + filename + "]下载地址:" + content;
fileContentMap.put(filename, contentUrl);
}
}
}
return fileContentMap;
}
private String getStatus(JSONObject fields) {
JSONObject statusObj = (JSONObject) fields.get("status");
if (statusObj != null) {