Merge pull request '训练任务停止微信通知中加入结束时间' (#2703) from fix-2631 into V20220815

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2703
Reviewed-by: lewis <747342561@qq.com>

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"`
 }
 

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 {
 }
 
@@ -62,6 +66,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},
 	}
 }
@@ -91,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{}
 

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),