This commit is contained in:
ExplodingDragon
2025-11-12 00:31:29 +08:00
parent 47992401f7
commit dd6b50ba9c
2 changed files with 3 additions and 5 deletions

View File

@@ -6,8 +6,6 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"gopkg.d7z.net/middleware/kv"
"go.uber.org/zap" "go.uber.org/zap"
) )
@@ -19,12 +17,12 @@ type PageDomain struct {
defaultBranch string defaultBranch string
} }
func NewPageDomain(meta *ServerMeta, alias kv.KV, baseDomain, defaultBranch string) *PageDomain { func NewPageDomain(meta *ServerMeta, alias *DomainAlias, baseDomain, defaultBranch string) *PageDomain {
return &PageDomain{ return &PageDomain{
baseDomain: baseDomain, baseDomain: baseDomain,
defaultBranch: defaultBranch, defaultBranch: defaultBranch,
ServerMeta: meta, ServerMeta: meta,
alias: NewDomainAlias(alias), alias: alias,
} }
} }

View File

@@ -98,7 +98,7 @@ func NewPageServer(backend core.Backend, options ServerOptions) *Server {
options.CacheBlob, options.CacheBlobLimit, options.CacheBlob, options.CacheBlobLimit,
) )
svcMeta := core.NewServerMeta(options.HTTPClient, backend, options.CacheMeta, options.Domain, options.CacheMetaTTL) svcMeta := core.NewServerMeta(options.HTTPClient, backend, options.CacheMeta, options.Domain, options.CacheMetaTTL)
pageMeta := core.NewPageDomain(svcMeta, options.Alias, options.Domain, options.DefaultBranch) pageMeta := core.NewPageDomain(svcMeta, core.NewDomainAlias(options.Alias), options.Domain, options.DefaultBranch)
var fs http.Handler var fs http.Handler
if options.StaticDir != "" { if options.StaticDir != "" {
fs = http.StripPrefix(staticPrefix, http.FileServer(http.Dir(options.StaticDir))) fs = http.StripPrefix(staticPrefix, http.FileServer(http.Dir(options.StaticDir)))