修复模板变量失效问题

pkg/core/domain.go

@@ -6,8 +6,6 @@ import (
 	"regexp"
 	"strings"
 
-	"code.d7z.net/d7z-project/gitea-pages/pkg/renders"
-
 	"code.d7z.net/d7z-project/gitea-pages/pkg/utils"
 
 	"github.com/pkg/errors"
@@ -45,17 +43,6 @@ func (m *PageDomainContent) CacheKey() string {
 	return fmt.Sprintf("%s/%s/%s/%s", m.Owner, m.Repo, m.CommitID, m.Path)
 }
 
-func (m *PageDomainContent) TryRender(path ...string) renders.Render {
-	for _, s := range path {
-		for _, compiler := range m.rendersL {
-			if compiler.regex.Match(s) {
-				return compiler.Render
-			}
-		}
-	}
-	return nil
-}
-
 func (p *PageDomain) ParseDomainMeta(domain, path, branch string) (*PageDomainContent, error) {
 	if branch == "" {
 		branch = p.defaultBranch
@@ -105,6 +92,7 @@ func (p *PageDomain) ReturnMeta(owner string, repo string, branch string, path [
 				zap.L().Warn("别名绑定失败", zap.Error(err))
 			}
 		}
+
 		return rel, nil
 	} else {
 		zap.L().Debug("查询错误", zap.Error(err))

pkg/core/meta.go

@@ -39,13 +39,13 @@ type renderCompiler struct {
 }
 
 type PageMetaContent struct {
-	CommitID         string            `json:"id"`               // 提交 COMMIT ID
+	CommitID         string              `json:"id"`               // 提交 COMMIT ID
-	IsPage           bool              `json:"pg"`               // 是否为 Page
+	IsPage           bool                `json:"pg"`               // 是否为 Page
-	Domain           string            `json:"domain"`           // 匹配的域名
+	Domain           string              `json:"domain"`           // 匹配的域名
-	HistoryRouteMode bool              `json:"historyRouteMode"` // 路由模式
+	HistoryRouteMode bool                `json:"historyRouteMode"` // 路由模式
-	CustomNotFound   bool              `json:"404"`              // 注册了自定义 404 页面
+	CustomNotFound   bool                `json:"404"`              // 注册了自定义 404 页面
-	LastModified     time.Time         `json:"up"`               // 上次更新时间
+	LastModified     time.Time           `json:"up"`               // 上次更新时间
-	Renders          map[string]string `json:"renders"`          // 配置的渲染器
+	Renders          map[string][]string `json:"renders"`          // 配置的渲染器
 
 	rendersL []*renderCompiler
 }
@@ -53,15 +53,28 @@ type PageMetaContent struct {
 func (m *PageMetaContent) From(data string) error {
 	err := json.Unmarshal([]byte(data), m)
 	clear(m.rendersL)
-	for key, g := range m.Renders {
+	for key, gs := range m.Renders {
-		m.rendersL = append(m.rendersL, &renderCompiler{
+		for _, g := range gs {
-			regex:  glob.MustCompile(g),
+			m.rendersL = append(m.rendersL, &renderCompiler{
-			Render: renders.GetRender(key),
+				regex:  glob.MustCompile(g),
-		})
+				Render: renders.GetRender(key),
+			})
+		}
 	}
 	return err
 }
 
+func (m *PageMetaContent) TryRender(path ...string) renders.Render {
+	for _, s := range path {
+		for _, compiler := range m.rendersL {
+			if compiler.regex.Match(s) {
+				return compiler.Render
+			}
+		}
+	}
+	return nil
+}
+
 func (m *PageMetaContent) String() string {
 	marshal, _ := json.Marshal(m)
 	return string(marshal)
@@ -74,7 +87,7 @@ func NewServerMeta(client *http.Client, backend Backend, config utils.Config, tt
 func (s *ServerMeta) GetMeta(baseDomain, owner, repo, branch string) (*PageMetaContent, error) {
 	rel := &PageMetaContent{
 		IsPage:  false,
-		Renders: make(map[string]string),
+		Renders: make(map[string][]string),
 	}
 	if repos, err := s.Repos(owner); err != nil {
 		return nil, err
@@ -154,7 +167,7 @@ func (s *ServerMeta) GetMeta(baseDomain, owner, repo, branch string) (*PageMetaC
 			if found {
 				if r := renders.GetRender(before); r != nil {
 					if g, err := glob.Compile(after); err == nil {
-						rel.Renders[before] = after
+						rel.Renders[before] = append(rel.Renders[before], after)
 						rel.rendersL = append(rel.rendersL, &renderCompiler{
 							regex:  g,
 							Render: r,