From 8595e2f6f3abc55e0971d5a302e74b1363251434 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 11 Oct 2021 10:23:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20--bug=3D1007080=20--user=3D=E5=88=98?= =?UTF-8?q?=E7=91=9E=E6=96=8C=20=E3=80=90github#6630=E3=80=91=E4=B8=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=9A=E7=9F=A5=E6=A8=A1=E6=9D=BF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=80=81=E7=9A=84=E6=B6=88=E6=81=AF=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=92=8C=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20https://www.tapd.cn/55049933/s/1054317?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/metersphere/track/service/IssuesService.java | 8 -------- .../organization/components/api/ApiHomeNotification.vue | 2 +- .../components/track/DefectTaskNotification.vue | 4 ++-- frontend/src/business/components/xpack | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java index e2a3b6c58c..048a05c1f9 100644 --- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java +++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java @@ -300,14 +300,6 @@ public class IssuesService { return issuesMapper.selectByPrimaryKey(id); } - private static String getIssuesContext(SessionUser user, IssuesUpdateRequest issuesRequest, String type) { - String context = ""; - if (StringUtils.equals(NoticeConstants.Event.CREATE, type)) { - context = "缺陷任务通知：" + user.getName() + "发起了一个缺陷" + "'" + issuesRequest.getTitle() + "'" + "请跟进"; - } - return context; - } - public List getZentaoBuilds(IssuesRequest request) { ZentaoPlatform platform = (ZentaoPlatform) IssueFactory.createPlatform(IssuesManagePlatform.Zentao.name(), request); return platform.getBuilds(); diff --git a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue index 5366721461..19e381ac38 100644 --- a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue +++ b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue @@ -180,7 +180,7 @@ export default { "\n" + "\n" + "", - robotTitle: "${operator}发起了一个缺陷:${issuesName}，请跟进", + robotTitle: "${operator}创建了缺陷:${issuesName}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue index 2785bb3e63..59b7d3f7c0 100644 --- a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${operator}发起了一个缺陷:${name}

\n" + + "

${operator}创建了缺陷:${name}

\n" + "
\n" + "\n" + "", - robotTitle: "${operator}发起了一个缺陷:${name}", + robotTitle: "${operator}创建了缺陷:${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 71e705f48d..68e291c762 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 71e705f48da10eb37135b189582ca0c917a2ffb3 +Subproject commit 68e291c7626aa1250303104f6c39d9646a1339e5