From 389e716391baa0829300de6d0309d4c61ae2847a Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 24 Apr 2023 09:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E9=9B=86=E7=BE=A4=E9=80=89=E6=8B=A9DN?= =?UTF-8?q?S=E5=9F=9F=E5=90=8D=E6=97=B6=E8=87=AA=E5=8A=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=B9=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/dns/domainOptions.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/web/actions/default/dns/domainOptions.go b/internal/web/actions/default/dns/domainOptions.go index 45a3039a..d3012570 100644 --- a/internal/web/actions/default/dns/domainOptions.go +++ b/internal/web/actions/default/dns/domainOptions.go @@ -4,6 +4,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" + "sort" ) // DomainOptionsAction 域名列表选项 @@ -21,10 +22,18 @@ func (this *DomainOptionsAction) RunPost(params struct { this.ErrorPage(err) return } - domainMaps := []maps.Map{} + + // 排序 + if len(domainsResp.DnsDomains) > 0 { + sort.Slice(domainsResp.DnsDomains, func(i, j int) bool { + return domainsResp.DnsDomains[i].Name < domainsResp.DnsDomains[j].Name + }) + } + + var domainMaps = []maps.Map{} for _, domain := range domainsResp.DnsDomains { // 未开启或者已删除的先跳过 - if !domain.IsOn || domain.IsDeleted { + if !domain.IsOn || domain.IsDeleted || !domain.IsUp { continue }