Skip to content

Commit 0b3ad91

Browse files
committed
feat(notification): update notification formatting
1 parent d1804f1 commit 0b3ad91

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

sqle/locale/active.en.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ NotifyManageRecordBodyRecord = "- SQL ID: %v\n- Data Source Name: %v\n- Environm
172172
NotifyManageRecordBodyTime = "Record Time Period: %v - %v"
173173
NotifyManageRecordSubject = "SQL Management Record"
174174
NotifyWorkflowBodyConfigUrl = "Please add a global URL in the system settings - global configuration"
175-
NotifyWorkflowBodyHead = "\n- Workflow Topic: %v\n- ProjectName: %v\n- Workflow ID: %v\n- Workflow Description: %v\n- Applicant: %v\n- Creation Time: %v"
176-
NotifyWorkflowBodyInstanceAndSchema = "- Data Source: %v\n- Schema: %v"
177-
NotifyWorkflowBodyInstanceErr = "Failed to obtain data source instance: %v\n"
178-
NotifyWorkflowBodyLink = "- Workflow Link: %v"
179-
NotifyWorkflowBodyReason = "- Rejection Reason: %v"
180-
NotifyWorkflowBodyReport = "- Workflow Audit Score: %v"
181-
NotifyWorkflowBodyStartEnd = "- Execute Start Time: %v\n- Execute End Time: %v"
182-
NotifyWorkflowBodyWorkFlowErr = "- Failed to read workflow task content, please check the workflow status through the SQLE interface"
175+
NotifyWorkflowBodyHead = "\n📋 Workflow Topic: %v\n💡 Project: %v\n🆔 Workflow ID: %v\n📝 Workflow Description: %v\n👤 Applicant: %v\n Creation Time: %v\n"
176+
NotifyWorkflowBodyInstanceAndSchema = "🗄️ Data Source: %v\n📊 Schema: %v\n"
177+
NotifyWorkflowBodyInstanceErr = "Failed to obtain data source instance: %v\n"
178+
NotifyWorkflowBodyLink = "🔗 Workflow Link: %v"
179+
NotifyWorkflowBodyReason = " Rejection Reason: %v\n"
180+
NotifyWorkflowBodyReport = " Workflow Audit Score: %v\n"
181+
NotifyWorkflowBodyStartEnd = "▶️ Execute Start Time: %v\n◀️ Execute End Time: %v\n"
182+
NotifyWorkflowBodyWorkFlowErr = " Failed to read workflow task content, please check the workflow status through the SQLE interface"
183183
OpAuditPlanSave = "Create audit task"
184184
OpAuditPlanViewOthers = "View others' audit tasks"
185185
OpSqlQueryQuery = "SQL query"

sqle/locale/active.zh.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ NotifyManageRecordBodyRecord = "- SQL ID: %v\n- 所在数据源名称: %v\n- 环
172172
NotifyManageRecordBodyTime = "记录时间周期: %v - %v"
173173
NotifyManageRecordSubject = "SQL管控记录"
174174
NotifyWorkflowBodyConfigUrl = "请在系统设置-全局配置中补充全局url"
175-
NotifyWorkflowBodyHead = "\n- 工单主题: %v\n 所属项目 %v\n- 工单ID: %v\n- 工单描述: %v\n- 申请人: %v\n- 创建时间: %v"
176-
NotifyWorkflowBodyInstanceAndSchema = "- 数据源: %v\n- schema: %v"
177-
NotifyWorkflowBodyInstanceErr = "获取数据源实例失败: %v\n"
178-
NotifyWorkflowBodyLink = "- 工单链接: %v"
179-
NotifyWorkflowBodyReason = "- 驳回原因: %v"
180-
NotifyWorkflowBodyReport = "- 工单审核得分: %v"
181-
NotifyWorkflowBodyStartEnd = "- 上线开始时间: %v\n- 上线结束时间: %v"
182-
NotifyWorkflowBodyWorkFlowErr = "- 读取工单任务内容失败,请通过SQLE界面确认工单状态"
175+
NotifyWorkflowBodyHead = "\n📋 工单主题: %v\n💡 所属项目: %v\n🆔 工单ID: %v\n📝 工单描述: %v\n👤 申请人: %v\n 创建时间: %v\n"
176+
NotifyWorkflowBodyInstanceAndSchema = "🗄️ 数据源: %v\n📊 Schema: %v\n"
177+
NotifyWorkflowBodyInstanceErr = "获取数据源实例失败: %v\n"
178+
NotifyWorkflowBodyLink = "🔗 工单链接: %v"
179+
NotifyWorkflowBodyReason = " 驳回原因: %v\n"
180+
NotifyWorkflowBodyReport = " 工单审核得分: %v\n"
181+
NotifyWorkflowBodyStartEnd = "▶️ 上线开始时间: %v\n◀️ 上线结束时间: %v\n"
182+
NotifyWorkflowBodyWorkFlowErr = " 读取工单任务内容失败,请通过SQLE界面确认工单状态"
183183
OpAuditPlanSave = "创建扫描任务"
184184
OpAuditPlanViewOthers = "查看他人创建的扫描任务"
185185
OpSqlQueryQuery = "SQL查询"

sqle/locale/message_zh.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ var (
464464
NotifyManageRecordBodyTime = &i18n.Message{ID: "NotifyManageRecordBodyTime", Other: "记录时间周期: %v - %v"}
465465
NotifyManageRecordBodyProj = &i18n.Message{ID: "NotifyManageRecordBodyProj", Other: "所属项目: %v"}
466466

467-
NotifyWorkflowBodyHead = &i18n.Message{ID: "NotifyWorkflowBodyHead", Other: "\n- 工单主题: %v\n 所属项目 %v\n- 工单ID: %v\n- 工单描述: %v\n- 申请人: %v\n- 创建时间: %v"}
468-
NotifyWorkflowBodyWorkFlowErr = &i18n.Message{ID: "NotifyWorkflowBodyWorkFlowErr", Other: "- 读取工单任务内容失败,请通过SQLE界面确认工单状态"}
469-
NotifyWorkflowBodyLink = &i18n.Message{ID: "NotifyWorkflowBodyLink", Other: "- 工单链接: %v"}
467+
NotifyWorkflowBodyHead = &i18n.Message{ID: "NotifyWorkflowBodyHead", Other: "\n📋 工单主题: %v\n💡 所属项目: %v\n🆔 工单ID: %v\n📝 工单描述: %v\n👤 申请人: %v\n 创建时间: %v\n"}
468+
NotifyWorkflowBodyWorkFlowErr = &i18n.Message{ID: "NotifyWorkflowBodyWorkFlowErr", Other: " 读取工单任务内容失败,请通过SQLE界面确认工单状态"}
469+
NotifyWorkflowBodyLink = &i18n.Message{ID: "NotifyWorkflowBodyLink", Other: "🔗 工单链接: %v"}
470470
NotifyWorkflowBodyConfigUrl = &i18n.Message{ID: "NotifyWorkflowBodyConfigUrl", Other: "请在系统设置-全局配置中补充全局url"}
471-
NotifyWorkflowBodyInstanceErr = &i18n.Message{ID: "NotifyWorkflowBodyInstanceErr", Other: "获取数据源实例失败: %v\n"}
472-
NotifyWorkflowBodyInstanceAndSchema = &i18n.Message{ID: "NotifyWorkflowBodyInstanceAndSchema", Other: "- 数据源: %v\n- schema: %v"}
473-
NotifyWorkflowBodyStartEnd = &i18n.Message{ID: "NotifyWorkflowBodyStartEnd", Other: "- 上线开始时间: %v\n- 上线结束时间: %v"}
474-
NotifyWorkflowBodyReason = &i18n.Message{ID: "NotifyWorkflowBodyReason", Other: "- 驳回原因: %v"}
475-
NotifyWorkflowBodyReport = &i18n.Message{ID: "NotifyWorkflowBodyReport", Other: "- 工单审核得分: %v"}
471+
NotifyWorkflowBodyInstanceErr = &i18n.Message{ID: "NotifyWorkflowBodyInstanceErr", Other: "获取数据源实例失败: %v\n"}
472+
NotifyWorkflowBodyInstanceAndSchema = &i18n.Message{ID: "NotifyWorkflowBodyInstanceAndSchema", Other: "🗄️ 数据源: %v\n📊 Schema: %v\n"}
473+
NotifyWorkflowBodyStartEnd = &i18n.Message{ID: "NotifyWorkflowBodyStartEnd", Other: "▶️ 上线开始时间: %v\n◀️ 上线结束时间: %v\n"}
474+
NotifyWorkflowBodyReason = &i18n.Message{ID: "NotifyWorkflowBodyReason", Other: " 驳回原因: %v\n"}
475+
NotifyWorkflowBodyReport = &i18n.Message{ID: "NotifyWorkflowBodyReport", Other: " 工单审核得分: %v\n"}
476476
)

sqle/notification/notification.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,15 @@ func (w *WorkflowNotification) NotificationBody() i18nPkg.I18nStr {
153153
instanceMap[instance.ID] = instance
154154
}
155155

156+
// Add a blank line before task details for better readability
157+
bodyStr = append(bodyStr, i18nPkg.ConvertStr2I18nAsDefaultLang(""))
158+
156159
for _, t := range tasks {
157160
if instance, ok := instanceMap[t.InstanceId]; ok {
158161
t.Instance = instance
159162
}
160163

161-
bodyStr = append(bodyStr, i18nPkg.ConvertStr2I18nAsDefaultLang("--------------"), w.buildNotifyBody(t))
164+
bodyStr = append(bodyStr, i18nPkg.ConvertStr2I18nAsDefaultLang("────────────────"), w.buildNotifyBody(t))
162165
}
163166

164167
return locale.Bundle.JoinI18nStr(bodyStr, "\n")

0 commit comments

Comments
 (0)