From 56c8a27ab062b0aaf9c3060dc18fe05f6722cd00 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 22 May 2023 09:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9B=86=E7=BE=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=8F=9C=E5=8D=95=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 3 +++ .../clusters/clusterutils/cluster_helper.go | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index bc6d599f..113ca1dc 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,11 @@ go 1.18 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon +replace github.com/TeaOSLab/EdgePlus => ../EdgePlus + require ( github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000 + github.com/TeaOSLab/EdgePlus v0.0.0-00010101000000-000000000000 github.com/cespare/xxhash v1.1.0 github.com/go-sql-driver/mysql v1.5.0 github.com/iwind/TeaGo v0.0.0-20230304012706-c1f4a4e27470 diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go index a67e6560..827f3e49 100644 --- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go +++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go @@ -139,6 +139,13 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F "isOn": cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0, }) + items = append(items, maps.Map{ + "name": "网站设置", + "url": "/clusters/cluster/settings/global-server-config?clusterId=" + clusterId, + "isActive": selectedItem == "globalServerConfig", + "isOn": true, + }) + items = append(items, maps.Map{ "name": "健康检查", "url": "/clusters/cluster/settings/health?clusterId=" + clusterId, @@ -153,13 +160,6 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F "isOn": info != nil && info.HasDDoSProtection, }) - items = append(items, maps.Map{ - "name": "网站设置", - "url": "/clusters/cluster/settings/global-server-config?clusterId=" + clusterId, - "isActive": selectedItem == "globalServerConfig", - "isOn": true, - }) - items = append(items, maps.Map{ "name": "-", })