From 1bd38afbd3d7b82ec8362e4a48c7e835a31e609f Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Wed, 2 Mar 2022 20:51:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=89=88=E7=A6=85=E9=81=93=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=B1=E5=93=8D=E7=89=88=E6=9C=AC=20--bug?= =?UTF-8?q?=3D1010678=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20github#1104?= =?UTF-8?q?4=EF=BC=8C=E5=AF=B9=E6=8E=A5=E7=A6=85=E9=81=93=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=89=886.4=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E2=80=9C=E5=BD=B1=E5=93=8D=E7=89=88=E6=9C=AC=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=88=9B=E5=BB=BA=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=20https://www.tapd.cn/55049933/s/11?= =?UTF-8?q?12366?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/track/issue/ZentaoPlatform.java | 7 +++++-- .../metersphere/track/issue/client/ZentaoClient.java | 11 +++++++++-- .../track/issue/client/ZentaoGetClient.java | 2 +- .../track/issue/client/ZentaoPathInfoClient.java | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java index a19c1febe3..3f0fd1031f 100644 --- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java +++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java @@ -338,11 +338,14 @@ public class ZentaoPlatform extends AbstractIssuePlatform { } public List getBuilds() { - Map builds = zentaoClient.getBuilds(getProjectId(projectId)); + Map builds = zentaoClient.getBuildsByCreateMetaData(getProjectId(projectId)); + if (builds == null || builds.isEmpty()) { + builds = zentaoClient.getBuilds(getProjectId(projectId)); + } List res = new ArrayList<>(); builds.forEach((k, v) -> { if (StringUtils.isNotBlank(k)) { - res.add(new ZentaoBuild(k, v)); + res.add(new ZentaoBuild(k, v.toString())); } }); return res; diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java index 31c1f402b9..a0723bf845 100644 --- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java +++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java @@ -142,8 +142,15 @@ public abstract class ZentaoClient extends BaseClient { return getCreateMetaData(productID).getCustomFields(); } - public Map getBuilds(String productID) { - return getCreateMetaData(productID).getBuilds(); + public Map getBuildsByCreateMetaData(String projectId) { + return getCreateMetaData(projectId).getBuilds(); + } + + public Map getBuilds(String projectId) { + String sessionId = login(); + ResponseEntity response = restTemplate.exchange(requestUrl.getBuildsGet(), + HttpMethod.GET, null, String.class, projectId, sessionId); + return JSONObject.parseObject(response.getBody()).getJSONObject("data").getInnerMap(); } public JSONArray getBugsByProjectId(String projectId, int pageNum, int pageSize) { diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java index ccaf693d44..d77b9f47a3 100644 --- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java +++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java @@ -14,7 +14,7 @@ public class ZentaoGetClient extends ZentaoClient { private static final String BUG_GET="&module=bug&methodName=getById¶ms=bugID={1}&t=json&zentaosid={2}"; private static final String STORY_GET="&module=story&methodName=getProductStories¶ms=productID={key}&t=json&zentaosid="; private static final String USER_GET="&module=user&methodName=getList&t=json&zentaosid="; - private static final String BUILDS_GET="&module=build&methodName=getProductBuildPairs&productID={0}&zentaosid="; + private static final String BUILDS_GET="&module=build&methodName=getProductBuildPairs&productID={0}&zentaosid={1}"; private static final String FILE_UPLOAD="&module=file&methodName=saveUpload&t=json&zentaosid="; private static final String CREATE_META_DATA="?m=bug&f=create&productID={0}&t=json&zentaosid={1}"; private static final String REPLACE_IMG_URL=""; diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java index 69b4797211..431ed4afc6 100644 --- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java +++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java @@ -15,7 +15,7 @@ public class ZentaoPathInfoClient extends ZentaoClient { private static final String BUG_GET = "/api-getModel-bug-getById-bugID={1}?zentaosid={2}"; private static final String STORY_GET = "/api-getModel-story-getProductStories-productID={key}?zentaosid="; private static final String USER_GET = "/api-getModel-user-getList?zentaosid="; - private static final String BUILDS_GET = "/api-getModel-build-getProductBuildPairs-productID={projectId}?zentaosid="; + private static final String BUILDS_GET = "/api-getModel-build-getProductBuildPairs-productID={0}?zentaosid={1}"; private static final String CREATE_META_DATA="/bug-create-{0}.json"; private static final String FILE_UPLOAD = "/api-getModel-file-saveUpload.json?zentaosid="; private static final String REPLACE_IMG_URL = "";