From 892e126a2b0e988e20ec0fbf078d46744615a90b Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 12 Aug 2022 14:20:06 +0800 Subject: [PATCH 1/2] #2624 update --- modules/auth/wechat/client.go | 1 + modules/auth/wechat/cloudbrain.go | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/auth/wechat/client.go b/modules/auth/wechat/client.go index 367a80c3a2..9f7b5b45f4 100644 --- a/modules/auth/wechat/client.go +++ b/modules/auth/wechat/client.go @@ -66,6 +66,7 @@ type DefaultWechatTemplate struct { Keyword1 TemplateValue `json:"keyword1"` Keyword2 TemplateValue `json:"keyword2"` Keyword3 TemplateValue `json:"keyword3"` + Keyword4 TemplateValue `json:"keyword4"` Remark TemplateValue `json:"remark"` } diff --git a/modules/auth/wechat/cloudbrain.go b/modules/auth/wechat/cloudbrain.go index 9af091f157..a64087a036 100644 --- a/modules/auth/wechat/cloudbrain.go +++ b/modules/auth/wechat/cloudbrain.go @@ -62,6 +62,7 @@ func (CloudbrainStopMsg) Data(ctx *TemplateContext) *DefaultWechatTemplate { Keyword1: TemplateValue{Value: ctx.Cloudbrain.DisplayJobName}, Keyword2: TemplateValue{Value: getJobTypeDisplayName(ctx.Cloudbrain.JobType)}, Keyword3: TemplateValue{Value: time.Unix(int64(ctx.Cloudbrain.CreatedUnix), 0).Format("2006-01-02 15:04:05")}, + Keyword4: TemplateValue{Value: time.Unix(int64(ctx.Cloudbrain.EndTime), 0).Format("2006-01-02 15:04:05")}, Remark: TemplateValue{Value: setting.CloudbrainStoppedRemark}, } } -- 2.34.1 From a854693c8a9bfa6cdbba63d0b3cb2811b6fc50f5 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 12 Aug 2022 17:06:42 +0800 Subject: [PATCH 2/2] #2624 update --- modules/auth/wechat/cloudbrain.go | 8 ++++++++ modules/auth/wechat/template.go | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/auth/wechat/cloudbrain.go b/modules/auth/wechat/cloudbrain.go index a64087a036..5dbe0a4ea8 100644 --- a/modules/auth/wechat/cloudbrain.go +++ b/modules/auth/wechat/cloudbrain.go @@ -53,6 +53,10 @@ func (CloudbrainStartMsg) Url(ctx *TemplateContext) string { return getCloudbrainTemplateUrl(*ctx.Cloudbrain, repo) } +func (CloudbrainStartMsg) TemplateId(ctx *TemplateContext) string { + return setting.CloudbrainStartedTemplateId +} + type CloudbrainStopMsg struct { } @@ -92,6 +96,10 @@ func (CloudbrainStopMsg) Url(ctx *TemplateContext) string { return getCloudbrainTemplateUrl(*ctx.Cloudbrain, repo) } +func (CloudbrainStopMsg) TemplateId(ctx *TemplateContext) string { + return setting.CloudbrainStoppedTemplateId +} + var startMsg = &CloudbrainStartMsg{} var stopMsg = &CloudbrainStopMsg{} diff --git a/modules/auth/wechat/template.go b/modules/auth/wechat/template.go index bc206e3b29..cd8e21f74c 100644 --- a/modules/auth/wechat/template.go +++ b/modules/auth/wechat/template.go @@ -3,7 +3,6 @@ package wechat import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" "errors" "fmt" ) @@ -13,6 +12,7 @@ type Template interface { Data(ctx *TemplateContext) *DefaultWechatTemplate MsgId(ctx *TemplateContext) string Url(ctx *TemplateContext) string + TemplateId(ctx *TemplateContext) string } type TemplateContext struct { @@ -36,7 +36,7 @@ func SendTemplateMsg(template Template, ctx *TemplateContext, userId int64) erro } req := TemplateMsgRequest{ ToUser: openId, - TemplateId: setting.CloudbrainStartedTemplateId, + TemplateId: template.TemplateId(ctx), Url: template.Url(ctx), ClientMsgId: template.MsgId(ctx), Data: template.Data(ctx), -- 2.34.1