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] 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 {