From f8b732c9b839cae828c0125e76b79581718f66de Mon Sep 17 00:00:00 2001 From: yusing Date: Wed, 26 Feb 2025 01:46:46 +0800 Subject: [PATCH] fix app url when using fqdn alias --- internal/homepage/homepage.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/internal/homepage/homepage.go b/internal/homepage/homepage.go index 481c87a..9ad1d81 100644 --- a/internal/homepage/homepage.go +++ b/internal/homepage/homepage.go @@ -2,6 +2,7 @@ package homepage import ( "encoding/json" + "strings" config "github.com/yusing/go-proxy/internal/config/types" "github.com/yusing/go-proxy/internal/utils" @@ -42,13 +43,17 @@ func (cfg *ItemConfig) GetOverride(alias string) *ItemConfig { } func (item *Item) MarshalJSON() ([]byte, error) { - godoxyCfg := config.GetInstance().Value() - // use first domain as base domain - domains := godoxyCfg.MatchDomains var url *string - if len(domains) > 0 { - url = new(string) - *url = item.Alias + domains[0] + if !strings.ContainsRune(item.Alias, '.') { + godoxyCfg := config.GetInstance().Value() + // use first domain as base domain + domains := godoxyCfg.MatchDomains + if len(domains) > 0 { + url = new(string) + *url = item.Alias + domains[0] + } + } else { + url = &item.Alias } return json.Marshal(map[string]any{ "show": item.Show,