From fefe5068adf9adb3002449630adb472400635516 Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 13:32:48 +0800 Subject: [PATCH 1/3] by Robin at 20241217 --- app/mix/service/utilservice.go | 4 ++-- library/regexpcli/client.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index fc37b0a8..000ccfa7 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -2332,7 +2332,7 @@ func (s *Service) utilBuildInwardHyperLink(ctx *gin.Context, frontendRouteId int // 将跳转路径的占位符替换 appRoute, err := regexpcli.GetRegexp(consts.AppHyperlinkRegexp).ReplaceFunc( frontendroute.GetAppRoutePath(), func(m regexp2.Match) string { - return fmt.Sprint(argsMap["app"][m.Groups()[1].String()]) + return fmt.Sprint(argsMap["app"][strings.ToUpper(m.Groups()[2].String())]) }, -1, -1) if err != nil { logger.Error("regexp2 ReplaceFunc fail, err: %v", err) @@ -2341,7 +2341,7 @@ func (s *Service) utilBuildInwardHyperLink(ctx *gin.Context, frontendRouteId int h5Route, err := regexpcli.GetRegexp(consts.H5HyperlinkRegexp).ReplaceFunc( frontendroute.GetH5RoutePath(), func(m regexp2.Match) string { - return fmt.Sprintf("%v%v", m.String(), argsMap["h5"][m.Groups()[2].String()]) + return fmt.Sprint(argsMap["h5"][m.Groups()[1].String()]) }, -1, -1) if err != nil { logger.Error("regexp2 ReplaceFunc fail, err: %v", err) diff --git a/library/regexpcli/client.go b/library/regexpcli/client.go index b1d1d615..3d4c5d73 100644 --- a/library/regexpcli/client.go +++ b/library/regexpcli/client.go @@ -16,8 +16,8 @@ func Init() { defaultRegexpClient = new(Client) defaultRegexpClient.regexpMap = make(map[string]*regexp2.Regexp) - defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`\[(.*?)\]`, 0) - defaultRegexpClient.regexpMap[consts.H5HyperlinkRegexp] = regexp2.MustCompile(`(\?|&)(.*?)=`, 0) + defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`(.*?)=(.*?)&*`, 0) + defaultRegexpClient.regexpMap[consts.H5HyperlinkRegexp] = regexp2.MustCompile(`\[(.*?)\]`, 0) } func GetRegexp(str string) *regexp2.Regexp { From 91ec58186ff139fd7d76ab4152832e0974b905b8 Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 13:51:55 +0800 Subject: [PATCH 2/3] 1 --- app/mix/service/service.go | 12 ++++++++++++ app/mix/service/utilservice.go | 2 +- library/regexpcli/client.go | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/mix/service/service.go b/app/mix/service/service.go index b3591e38..af407c40 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -5204,6 +5204,18 @@ func (s *Service) OpDeleteRavenIQTestVisit(ctx *gin.Context, id int64) (ec errco func (s *Service) OpCreateNotification(ctx *gin.Context, req *notificationproto.OpCreateReq) (ec errcode.ErrCode) { ec = errcode.ErrCodeNotificationSrvOk + // 默认缩略图 + if len(req.Thumbnail.GetImageIds()) == 0 { + defaultThumbnailId, err := apollo.GetIntValue(consts.DefaultNotifThumbnailIdKey, apollo.ApolloOpts().SetNamespace("application")) + if err != nil { + logger.Error("Apollo read failed : %v", err) + return errcode.ErrCodeApolloReadFail + } + req.Thumbnail = &dbstruct.MediaComponent{ + ImageIds: util.Int64Slice([]int64{int64(defaultThumbnailId)}), + } + } + // 首先将该通知的信息插入数据库，获得nid req.Notification.Status = goproto.Int64(consts.Notification_Created) err := _DefaultNotification.OpCreate(ctx, req) diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index 000ccfa7..dfd9e9bf 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -2332,7 +2332,7 @@ func (s *Service) utilBuildInwardHyperLink(ctx *gin.Context, frontendRouteId int // 将跳转路径的占位符替换 appRoute, err := regexpcli.GetRegexp(consts.AppHyperlinkRegexp).ReplaceFunc( frontendroute.GetAppRoutePath(), func(m regexp2.Match) string { - return fmt.Sprint(argsMap["app"][strings.ToUpper(m.Groups()[2].String())]) + return fmt.Sprintf("%v=%v%v", m.Groups()[1].String(), argsMap["app"][strings.ToLower(m.Groups()[2].String())], m.Groups()[3].String()) }, -1, -1) if err != nil { logger.Error("regexp2 ReplaceFunc fail, err: %v", err) diff --git a/library/regexpcli/client.go b/library/regexpcli/client.go index 3d4c5d73..3961e52d 100644 --- a/library/regexpcli/client.go +++ b/library/regexpcli/client.go @@ -16,7 +16,7 @@ func Init() { defaultRegexpClient = new(Client) defaultRegexpClient.regexpMap = make(map[string]*regexp2.Regexp) - defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`(.*?)=(.*?)&*`, 0) + defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`(.*?)=([A-Z]+)(&*)`, 0) defaultRegexpClient.regexpMap[consts.H5HyperlinkRegexp] = regexp2.MustCompile(`\[(.*?)\]`, 0) } From 394f7226a056bc46f94996e0b3c67e10ae1d6fc0 Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 13:56:14 +0800 Subject: [PATCH 3/3] by Robin at 20241217 --- app/mix/service/notif_builder_handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix/service/notif_builder_handler.go b/app/mix/service/notif_builder_handler.go index 15bdf6a8..31f4211c 100644 --- a/app/mix/service/notif_builder_handler.go +++ b/app/mix/service/notif_builder_handler.go @@ -709,7 +709,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_User() { argsMap := make(map[string]any) argsMap["template_params"] = []any{streamerAcct.GetName(), util.FormatTsAsNotifT(order.GetSuperfanshipUntil())} - argsMap["thumbnail"] = streamer.Album + argsMap["thumbnail"] = streamer.Cover argsMap["build_hyperlink"] = DefaultService.utilBuildInwardHyperLink argsMap["hyperlink_params_map"] = util.NewHyperLinkParamsMapBuilder().NewEnds("app", "h5").WriteParamToAllEnd("mid", order.GetUid()).Map() argsMap["link_text_template_params"] = []any{streamerAcct.GetName()}