1

api/consts/notif_template.go

@@ -1,13 +1,20 @@
 package consts
 
 // notif_template
+
 const (
-	SysNotifTemp_FirstLogin              = 0
+	Notif_System = 0 // 系统消息
-	SysNotifTemp_StreamerPunished        = 1
+	Notif_Audit  = 1 // 审核消息
-	SysNotifTemp_StreamerPunishmentEnds  = 2
+	Notif_Paid   = 2 // 付费消息
-	SysNotifTemp_PswdChanged             = 3
+)
-	SysNotifTemp_AcctCancellationApplied = 4
+
-	SysNotifTemp_AcctCancelled           = 5
+const (
+	SysNotifTemp_FirstLogin              = 1
+	SysNotifTemp_StreamerPunished        = 2
+	SysNotifTemp_StreamerPunishmentEnds  = 3
+	SysNotifTemp_PswdChanged             = 4
+	SysNotifTemp_AcctCancellationApplied = 5
+	SysNotifTemp_AcctCancelled           = 6
 
 	AudNotifTemp_AvatarChanged             = 100
 	AudNotifTemp_AvatarRollbacked          = 101
@@ -22,3 +29,9 @@ const (
 	AudNotifTemp_WithdrawlInfoPassed       = 110
 	AudNotifTemp_WithdrawlInfoRejected     = 111
 )
+
+var NotifDescMap = map[int64]string{
+	Notif_System: "系统消息",
+	Notif_Audit:  "审核消息",
+	Notif_Paid:   "付费消息",
+}

api/consts/option.go

@@ -32,6 +32,17 @@ const (
 	AccountPunishment_BlockFromPaying                 = 7 // 禁止付款
 )
 
+var AccountPunishmentMap = map[int64]string{
+	AccountPunishment_BlockFromCreatingMoment:         "发贴",
+	AccountPunishment_BlockFromCreatingFreeZoneMoment: "发免费空间贴",
+	AccountPunishment_BlockFromCreatingPaidZoneMoment: "发付费空间贴",
+	AccountPunishment_BlockFromCreatingZoneMoment:     "发空间贴",
+	AccountPunishment_BlockFromBeingSearched:          "从搜索中被发现",
+	AccountPunishment_BlockFromBeingDiscovered:        "在推荐页面被发现",
+	AccountPunishment_BlockFromBeingSeenAtMoment:      "在广场页面被发现",
+	AccountPunishment_BlockFromPaying:                 "付款",
+}
+
 const (
 	Recomm_Down = 0
 	Recomm_Up   = 1

apollostruct/notif_template.go

@@ -3,6 +3,6 @@ package apollostruct
 type NotifTemplateCfg struct {
 	NotifTemplate    string `json:"notif_template"`
 	NType            int64  `json:"n_type"`
-	LinkTextTemplate string `json:"link_text_template"`
 	Action           string `json:"string"`
+	LinkTextTemplate string `json:"link_text_template"`
 }

app/mix/service/apiservice.go

@@ -163,6 +163,8 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB
 			ec = errcode.ErrCodeLoginRegisterUserFail
 			return
 		}
+		// 写入自动发送消息的标签
+		s.utilWriteNotifInfo(ctx, consts.SysNotifTemp_FirstLogin, account.GetMid())
 	} else if ec != errcode.ErrCodeLoginSrvOk {
 		return
 	}

app/mix/service/service.go

@@ -3753,6 +3753,11 @@ func (s *Service) OpCreateAccountPunishment(ctx *gin.Context, req *accountpunish
 		ec = errcode.ErrCodeAccountPunishmentSrvFail
 		return
 	}
+
+	// 封禁消息
+	s.utilWriteNotifInfo(ctx, consts.SysNotifTemp_StreamerPunished, req.AccountPunishment.GetMid(),
+		consts.AccountPunishmentMap[req.AccountPunishment.GetType()], req.AccountPunishment.GetEndTimeFormatAsChinese())
+
 	return
 }
 

app/mix/service/utilservice.go

@@ -2115,3 +2115,19 @@ func (s *Service) UtilEncryptVideosForZoneMomentVOs(ctx *gin.Context, list []*zo
 		}
 	}
 }
+
+func (s *Service) utilWriteNotifInfo(ctx *gin.Context, notifTempId int64, objMid int64, notifTempParams ...any) {
+	// 获取通知builder
+	notifBuilders := make([]*dbstruct.NotifBuilder, 0)
+	notifBuildersObj, ok := ctx.Get("notif_builders")
+	if ok {
+		notifBuilders = notifBuildersObj.([]*dbstruct.NotifBuilder)
+	}
+
+	notifBuilders = append(notifBuilders, &dbstruct.NotifBuilder{
+		TemplateId:     notifTempId,
+		ObjMids:        []int64{objMid},
+		TemplateParams: notifTempParams,
+	})
+	ctx.Set("notif_builders", notifBuilders)
+}

dbstruct/accountpunishment.go

@@ -33,9 +33,23 @@ func (p *AccountPunishment) GetEndTimeFormatString() string {
 	return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("1/2 15:04")
 }
 
+func (p *AccountPunishment) GetEndTimeFormatAsChinese() string {
+	if p == nil || p.EndTime == nil {
+		return ""
+	}
+	return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("2006年1月2日 15时04分")
+}
+
 func (p *AccountPunishment) IsPermanent() bool {
 	if p == nil || p.Duration == nil {
 		return false
 	}
 	return util.DerefInt64(p.Duration) == PermanentDuration
 }
+
+func (p *AccountPunishment) GetType() int64 {
+	if p == nil || p.Type == nil {
+		return 0
+	}
+	return *p.Type
+}

dbstruct/notification.go

@@ -93,3 +93,13 @@ type NotifReceivePull struct {
 	Ut         int64  `json:"ut" bson:"ut"`                   // 更新时间
 	DelFlag    int64  `json:"del_flag" bson:"del_flag"`       // 删除标记
 }
+
+type NotifBuilder struct {
+	TemplateId             int64   // 模板id
+	TemplateParams         []any   // 模板参数
+	ObjMids                []int64 // 目标Mids
+	ObjType                int64   // 目标类型
+	LinkTextTemplateParams []any   // 链接模板参数
+	Params                 string  // 链接参数
+	PushTime               int64   // 推送时间
+}

library/middleware/notif_sender.go

@@ -1,9 +1,12 @@
 package middleware
 
 import (
+	"fmt"
+	"service/apollostruct"
 	"service/app/mix/service"
 	"service/app/mix/service/logic"
 	"service/dbstruct"
+	"service/library/apollo"
 	"service/library/logger"
 
 	"service/api/consts"
@@ -20,34 +23,73 @@ var (
 
 func InitNotifSender(_DefaultNotification *logic.Notification, _DefaultNotifBcstCenter service.NotifBcstCenter) {
 	DefaultNotifSender = func(ctx *gin.Context) {
-		notifTempId := ctx.MustGet("notif_template_id").(int64)
-		notifTempParams := ctx.MustGet("notif_template_params").([]string)
 
-		notification := &dbstruct.Notification{}
+		// 获取通知builder
-		// 通知接收人mids不为空则默认认为是自定义发送
+		notifBuildersObj, ok := ctx.Get("notif_builders")
-		if len(notif.ObjMids) > 0 {
+		if !ok {
-			notification.ObjType = goproto.Int64(consts.Notification_ObjType_Customized)
-		}
-
-		notification.SubMid = goproto.Int64(0)
-		notification.PushTime = goproto.Int64(0)
-
-		err := _DefaultNotification.OpCreate(ctx, &notificationproto.OpCreateReq{
-			Notification: notification,
-		})
-		if err != nil {
-			logger.Error("通知创建失败:%v", err)
 			ctx.Next()
 		}
+		notifBuilders := notifBuildersObj.([]*dbstruct.NotifBuilder)
 
-		nids := make([]int64, 0)
+		for _, notifBuilder := range notifBuilders {
-		nids = append(nids, notification.GetId())
+			notification := &dbstruct.Notification{}
+			notification.SubMid = goproto.Int64(0)
 
-		err = _DefaultNotifBcstCenter.BcstNotifs(ctx, nids, notification.GetObjType(), notification.ObjMids)
+			// 从模板Id拿到模板信息
-		if err != nil {
+			key := fmt.Sprint(notifBuilder.TemplateId)
-			logger.Error("通知广播失败:%v", err)
+			cfg := apollostruct.NotifTemplateCfg{}
-			ctx.Next()
+			err := apollo.GetJson(key, &cfg, apollo.ApolloOpts().SetNamespace("notif_template"))
+			if err != nil {
+				logger.Error("Apollo read failed : %v", err)
+				continue
+			}
+
+			// 通知接收人mids不为空则默认认为是自定义发送
+			if len(notifBuilder.ObjMids) > 0 {
+				notification.ObjType = goproto.Int64(consts.Notification_ObjType_Customized)
+			} else {
+				notification.ObjType = goproto.Int64(notifBuilder.ObjType)
+			}
+
+			// 消息类型
+			notification.NType = goproto.Int64(cfg.NType)
+			notification.NDesc = goproto.String(consts.NotifDescMap[cfg.NType])
+
+			// 拼装通知信息
+			msg := fmt.Sprintf(cfg.NotifTemplate, notifBuilder.TemplateParams...)
+			notification.Message = goproto.String(msg)
+
+			// 链接信息
+			if cfg.Action != "" {
+				linkText := fmt.Sprintf(cfg.LinkTextTemplate, notifBuilder.LinkTextTemplateParams...)
+				notification.LinkText = goproto.String(linkText)
+				notification.Action = goproto.String(cfg.Action)
+				notification.Params = goproto.String(notifBuilder.Params)
+			}
+
+			// 推送时间
+			notification.PushTime = goproto.Int64(notifBuilder.PushTime)
+
+			// 创建通知
+			err = _DefaultNotification.OpCreate(ctx, &notificationproto.OpCreateReq{
+				Notification: notification,
+			})
+			if err != nil {
+				logger.Error("通知创建失败:%v", err)
+				ctx.Next()
+			}
+
+			nids := make([]int64, 0)
+			nids = append(nids, notification.GetId())
+
+			// 广播通知
+			err = _DefaultNotifBcstCenter.BcstNotifs(ctx, nids, notification.GetObjType(), notification.ObjMids)
+			if err != nil {
+				logger.Error("通知广播失败:%v", err)
+				continue
+			}
 		}
+
 		ctx.Next()
 	}
 }