From c7e11b05f90440d5c73ecee684bb7b08e30294cc Mon Sep 17 00:00:00 2001 From: user <8352767+zhegu123@user.noreply.gitee.com> Date: Thu, 6 Jul 2023 15:41:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jenkins/cloudpipeline/CodeArtsPipelineService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java b/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java index 23a3826..8db8175 100644 --- a/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java +++ b/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java @@ -53,9 +53,11 @@ public class CodeArtsPipelineService implements Serializable { e.printStackTrace(); } } + String url = "https://devcloud."+customInput.getRegion()+".huaweicloud.com/cicd/project/"+customInput.getProject_id()+"/pipeline/detail/" + customInput.getPipeline_id() + "/" + response.getPipelineRunId() + "?v=1"; + listener.getLogger().println("关于具体详情，可前往：" + url + "\n查看"); //SMN消息通知 if(StringUtils.isNotBlank(customInput.getTopicUrn())){ - publishMessage(customInput, info, listener); + publishMessage(customInput, info, listener,response.getPipelineRunId()); } } catch (ConnectionException e) { e.printStackTrace(); @@ -102,7 +104,7 @@ public class CodeArtsPipelineService implements Serializable { - public static void publishMessage(CustomInput customInput, ShowPipelineRunDetailResponse info, TaskListener listener) { + public static void publishMessage(CustomInput customInput, ShowPipelineRunDetailResponse info, TaskListener listener,String runId) { ICredential auth = new BasicCredentials() .withAk(customInput.getAk()) .withSk(customInput.getSk()); @@ -115,11 +117,13 @@ public class CodeArtsPipelineService implements Serializable { request.withTopicUrn(customInput.getTopicUrn()); PublishMessageRequestBody body = new PublishMessageRequestBody(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String url = "https://devcloud."+customInput.getRegion()+".huaweicloud.com/cicd/project/"+customInput.getProject_id()+"/pipeline/detail/" + customInput.getPipeline_id() + "/" + runId + "?v=1"; String message = "尊敬的华为云用户，您好：\n执行CodeArts pipeline的信息："; message+="\nname：" + info.getName(); message+="\n开始时间：" + sdf.format(new Date(Long.parseLong(String.valueOf(info.getStartTime())))); message+="\n结束时间：" + sdf.format(new Date(Long.parseLong(String.valueOf(info.getEndTime())))); message+="\n结果：" + info.getStatus(); + message+="\n链接：" + url; body.withMessage(message); request.withBody(body); try { -- Gitee From bfec9a16b10ad5610db8f19ca96d96036fbbac82 Mon Sep 17 00:00:00 2001 From: user <8352767+zhegu123@user.noreply.gitee.com> Date: Thu, 6 Jul 2023 16:14:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudpipeline/CodeArtsPipelineService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java b/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java index 8db8175..e80eb09 100644 --- a/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java +++ b/src/main/java/com/huawei/jenkins/cloudpipeline/CodeArtsPipelineService.java @@ -53,8 +53,11 @@ public class CodeArtsPipelineService implements Serializable { e.printStackTrace(); } } - String url = "https://devcloud."+customInput.getRegion()+".huaweicloud.com/cicd/project/"+customInput.getProject_id()+"/pipeline/detail/" + customInput.getPipeline_id() + "/" + response.getPipelineRunId() + "?v=1"; - listener.getLogger().println("关于具体详情，可前往：" + url + "\n查看"); + //临时解决方案，因为域名不一样，url是对应上海一的,只在上海一返回链接,后续api会有链接返回 + if("cn-east-3".equals(customInput.getRegion())){ + String url = "https://devcloud."+customInput.getRegion()+".huaweicloud.com/cicd/project/"+customInput.getProject_id()+"/pipeline/detail/" + customInput.getPipeline_id() + "/" + response.getPipelineRunId() + "?v=1"; + listener.getLogger().println("关于具体详情，可前往：" + url + "\n查看"); + } //SMN消息通知 if(StringUtils.isNotBlank(customInput.getTopicUrn())){ publishMessage(customInput, info, listener,response.getPipelineRunId()); @@ -123,7 +126,10 @@ public class CodeArtsPipelineService implements Serializable { message+="\n开始时间：" + sdf.format(new Date(Long.parseLong(String.valueOf(info.getStartTime())))); message+="\n结束时间：" + sdf.format(new Date(Long.parseLong(String.valueOf(info.getEndTime())))); message+="\n结果：" + info.getStatus(); - message+="\n链接：" + url; + //临时解决方案，因为域名不一样，url是对应上海一的,只在上海一返回链接,后续api会有链接返回 + if("cn-east-3".equals(customInput.getRegion())){ + message+="\n链接：" + url; + } body.withMessage(message); request.withBody(body); try { -- Gitee