From 14ea1aa7fa7c69605f720d8ef84ba1742f5b8e07 Mon Sep 17 00:00:00 2001 From: winfredLIN Date: Fri, 23 Feb 2024 03:23:57 +0000 Subject: [PATCH 1/2] comment: add warning todo to dms --- sqle/dms/common.go | 1 + 1 file changed, 1 insertion(+) diff --git a/sqle/dms/common.go b/sqle/dms/common.go index 524e33518a..2ddea6cacc 100644 --- a/sqle/dms/common.go +++ b/sqle/dms/common.go @@ -127,6 +127,7 @@ func GetUserNameWithDelTag(userId string) string { return user.Name } +// !dms-todo: 注意脚本服务调用该接口，接口修改会导致脚本服务调用原接口失败，需要通知相关开发修改接口调用 // dms-todo: 临时方案 func GetPorjectUIDByName(ctx context.Context, projectName string, needActive ...bool) (projectUID string, err error) { project, err := GetPorjectByName(ctx, projectName) From 28ec5165a7d04cc00a01328ed0d34277d2b10ebd Mon Sep 17 00:00:00 2001 From: winfredLIN Date: Fri, 23 Feb 2024 03:26:36 +0000 Subject: [PATCH 2/2] modify: add project name to the request of webhook --- sqle/notification/webhook.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sqle/notification/webhook.go b/sqle/notification/webhook.go index c6223a3f67..c5b31d0def 100644 --- a/sqle/notification/webhook.go +++ b/sqle/notification/webhook.go @@ -22,6 +22,7 @@ type webHookRequestBody struct { type workflowPayload struct { ProjectName string `json:"project_name"` + ProjectUID string `json:"project_uid"` WorkflowID string `json:"workflow_id"` WorkflowSubject string `json:"workflow_subject"` WorkflowStatus string `json:"workflow_status"` @@ -55,6 +56,18 @@ func workflowSendRequest(action string, workflow *model.Workflow) (err error) { if err != nil { return err } + ret, _, err := dmsobject.ListProjects(context.TODO(), dms.GetDMSServerAddress(), v1.ListProjectReq{ + PageSize: 1, + PageIndex: 1, + FilterByUID: string(workflow.ProjectId), + }) + if err != nil { + return err + } + var projectName string + if len(ret) > 0 { + projectName = ret[0].Name + } currentStepID := uint(0) if workflow.CurrentStep() != nil { currentStepID = workflow.CurrentStep().ID @@ -65,7 +78,8 @@ func workflowSendRequest(action string, workflow *model.Workflow) (err error) { Timestamp: time.Now().Format(time.RFC3339), Payload: &httpBodyPayload{ Workflow: &workflowPayload{ - ProjectName: string(workflow.ProjectId), + ProjectName: projectName, + ProjectUID: string(workflow.ProjectId), WorkflowID: workflow.WorkflowId, WorkflowSubject: workflow.Subject, WorkflowStatus: workflow.Record.Status,