wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

by Robin at 20241217

This commit is contained in:
Robin 2024-12-17 13:32:48 +08:00
parent 05dde6d4f2
commit fefe5068ad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mix/service/utilservice.go
View File

@ -2332,7 +2332,7 @@ func (s *Service) utilBuildInwardHyperLink(ctx *gin.Context, frontendRouteId int
// 将跳转路径的占位符替换 // 将跳转路径的占位符替换
appRoute, err := regexpcli.GetRegexp(consts.AppHyperlinkRegexp).ReplaceFunc( appRoute, err := regexpcli.GetRegexp(consts.AppHyperlinkRegexp).ReplaceFunc(
frontendroute.GetAppRoutePath(), func(m regexp2.Match) string { 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) }, -1, -1)
if err != nil { if err != nil {
logger.Error("regexp2 ReplaceFunc fail, err: %v", err) 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( h5Route, err := regexpcli.GetRegexp(consts.H5HyperlinkRegexp).ReplaceFunc(
frontendroute.GetH5RoutePath(), func(m regexp2.Match) string { 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) }, -1, -1)
if err != nil { if err != nil {
logger.Error("regexp2 ReplaceFunc fail, err: %v", err) logger.Error("regexp2 ReplaceFunc fail, err: %v", err)

4
library/regexpcli/client.go
View File

@ -16,8 +16,8 @@ func Init() {
defaultRegexpClient = new(Client) defaultRegexpClient = new(Client)
defaultRegexpClient.regexpMap = make(map[string]*regexp2.Regexp) defaultRegexpClient.regexpMap = make(map[string]*regexp2.Regexp)
defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`\[(.*?)\]`, 0) defaultRegexpClient.regexpMap[consts.AppHyperlinkRegexp] = regexp2.MustCompile(`(.*?)=(.*?)&*`, 0)
defaultRegexpClient.regexpMap[consts.H5HyperlinkRegexp] = regexp2.MustCompile(`(\?|&)(.*?)=`, 0) defaultRegexpClient.regexpMap[consts.H5HyperlinkRegexp] = regexp2.MustCompile(`\[(.*?)\]`, 0)
} }
func GetRegexp(str string) *regexp2.Regexp { func GetRegexp(str string) *regexp2.Regexp {