From dd6b50ba9c3bde8723e7d109c6516ad9a849868a Mon Sep 17 00:00:00 2001 From: ExplodingDragon Date: Wed, 12 Nov 2025 00:31:29 +0800 Subject: [PATCH] templ --- pkg/core/domain.go | 6 ++---- pkg/server.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/core/domain.go b/pkg/core/domain.go index be947dc..5f0e3a9 100644 --- a/pkg/core/domain.go +++ b/pkg/core/domain.go @@ -6,8 +6,6 @@ import ( "strings" "github.com/pkg/errors" - "gopkg.d7z.net/middleware/kv" - "go.uber.org/zap" ) @@ -19,12 +17,12 @@ type PageDomain struct { 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{ baseDomain: baseDomain, defaultBranch: defaultBranch, ServerMeta: meta, - alias: NewDomainAlias(alias), + alias: alias, } } diff --git a/pkg/server.go b/pkg/server.go index de69104..5762a35 100644 --- a/pkg/server.go +++ b/pkg/server.go @@ -98,7 +98,7 @@ func NewPageServer(backend core.Backend, options ServerOptions) *Server { options.CacheBlob, options.CacheBlobLimit, ) 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 if options.StaticDir != "" { fs = http.StripPrefix(staticPrefix, http.FileServer(http.Dir(options.StaticDir)))