增加若干操作日志/代理服务DNS CNAME显示的地方增加拷贝到剪贴板图标

internal/web/actions/default/clusters/cluster/node/node.go

@@ -77,12 +77,14 @@ func (this *NodeAction) RunGet(params struct {
 		return
 	}
 	dnsRouteMaps := []maps.Map{}
+	if dnsInfoResp.Node != nil {
 		for _, dnsInfo := range dnsInfoResp.Node.Routes {
 			dnsRouteMaps = append(dnsRouteMaps, maps.Map{
 				"name": dnsInfo.Name,
 				"code": dnsInfo.Code,
 			})
 		}
+	}
 	this.Data["dnsRoutes"] = dnsRouteMaps
 
 	// 登录信息

internal/web/actions/default/servers/components/ip-library/download.go

@@ -1,6 +1,7 @@
 package iplibrary
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -16,6 +17,9 @@ func (this *DownloadAction) Init() {
 func (this *DownloadAction) RunGet(params struct {
 	LibraryId int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "下载IP库 %d", params.LibraryId)
+
 	libraryResp, err := this.RPC().IPLibraryRPC().FindEnabledIPLibrary(this.AdminContext(), &pb.FindEnabledIPLibraryRequest{IpLibraryId: params.LibraryId})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/createGroupPopup.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -94,5 +95,8 @@ func (this *CreateGroupPopupAction) RunPost(params struct {
 		return
 	}
 
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "创建规则分组 %d，名称：%s", groupId, params.Name)
+
 	this.Success()
 }

internal/web/actions/default/servers/components/waf/createPopup.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
@@ -44,7 +45,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入策略名称")
 
-	_, err := this.RPC().HTTPFirewallPolicyRPC().CreateHTTPFirewallPolicy(this.AdminContext(), &pb.CreateHTTPFirewallPolicyRequest{
+	createResp, err := this.RPC().HTTPFirewallPolicyRPC().CreateHTTPFirewallPolicy(this.AdminContext(), &pb.CreateHTTPFirewallPolicyRequest{
 		IsOn:               params.IsOn,
 		Name:               params.Name,
 		Description:        params.Description,
@@ -55,5 +56,8 @@ func (this *CreatePopupAction) RunPost(params struct {
 		return
 	}
 
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.FirewallPolicyId)
+
 	this.Success()
 }

internal/web/actions/default/servers/components/waf/delete.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -12,6 +13,9 @@ type DeleteAction struct {
 func (this *DeleteAction) RunPost(params struct {
 	FirewallPolicyId int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d", params.FirewallPolicyId)
+
 	countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: params.FirewallPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
@@ -27,5 +31,7 @@ func (this *DeleteAction) RunPost(params struct {
 		return
 	}
 
+
+
 	this.Success()
 }

internal/web/actions/default/servers/components/waf/deleteGroup.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -14,6 +15,9 @@ func (this *DeleteGroupAction) RunPost(params struct {
 	FirewallPolicyId int64
 	GroupId          int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d 的规则分组 %d", params.FirewallPolicyId, params.GroupId)
+
 	firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/deleteSet.go

@@ -2,6 +2,7 @@ package waf
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -16,6 +17,9 @@ func (this *DeleteSetAction) RunPost(params struct {
 	GroupId int64
 	SetId   int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "删除WAF规则分组 %d 中的规则集 %d", params.GroupId, params.SetId)
+
 	groupConfig, err := models.SharedHTTPFirewallRuleGroupDAO.FindRuleGroupConfig(this.AdminContext(), params.GroupId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go

@@ -1,6 +1,7 @@
 package ipadmin
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/waf/ipadmin/ipadminutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
@@ -50,7 +51,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
 		Field("ipFrom", params.IpFrom).
 		Require("请输入开始IP")
 
-	_, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{
+	createResp, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{
 		IpListId:  params.ListId,
 		IpFrom:    params.IpFrom,
 		IpTo:      params.IpTo,
@@ -61,6 +62,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	itemId := createResp.IpItemId
 
 	// 发送通知
 	err = ipadminutils.NotifyUpdateToClustersWithFirewallPolicyId(this.AdminContext(), params.FirewallPolicyId)
@@ -69,5 +71,8 @@ func (this *CreateIPPopupAction) RunPost(params struct {
 		return
 	}
 
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "在WAF策略 %d 名单中添加IP %d", params.FirewallPolicyId, itemId)
+
 	this.Success()
 }

internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go

@@ -1,6 +1,7 @@
 package ipadmin
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/waf/ipadmin/ipadminutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -14,6 +15,9 @@ func (this *DeleteIPAction) RunPost(params struct {
 	FirewallPolicyId int64
 	ItemId           int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId)
+
 	// TODO 判断权限
 
 	_, err := this.RPC().IPItemRPC().DeleteIPItem(this.AdminContext(), &pb.DeleteIPItemRequest{IpItemId: params.ItemId})

internal/web/actions/default/servers/components/waf/ipadmin/index.go

@@ -2,6 +2,7 @@ package ipadmin
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -65,6 +66,9 @@ func (this *IndexAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId)
+
 	policyConfig, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/ipadmin/provinces.go

@@ -2,6 +2,7 @@ package ipadmin
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -67,6 +68,9 @@ func (this *ProvincesAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId)
+
 	policyConfig, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go

@@ -1,6 +1,7 @@
 package ipadmin
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/waf/ipadmin/ipadminutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -53,6 +54,9 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 名单中的IP %d", params.FirewallPolicyId, params.ItemId)
+
 	// TODO 校验ItemId所属用户
 	// TODO 校验IP格式（ipFrom/ipTo）
 

internal/web/actions/default/servers/components/waf/sortGroups.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -16,6 +17,9 @@ func (this *SortGroupsAction) RunPost(params struct {
 	Type             string
 	GroupIds         []int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 中的规则分组中的排序", params.FirewallPolicyId)
+
 	firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/sortSets.go

@@ -2,6 +2,7 @@ package waf
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -16,6 +17,9 @@ func (this *SortSetsAction) RunPost(params struct {
 	GroupId int64
 	SetIds  []int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 中的规则集排序", params.GroupId)
+
 	groupConfig, err := models.SharedHTTPFirewallRuleGroupDAO.FindRuleGroupConfig(this.AdminContext(), params.GroupId)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/update.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -67,6 +68,9 @@ func (this *UpdateAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 基本信息", params.FirewallPolicyId)
+
 	params.Must.
 		Field("name", params.Name).
 		Require("请输入策略名称")

internal/web/actions/default/servers/components/waf/updateGroupOn.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -13,6 +14,9 @@ func (this *UpdateGroupOnAction) RunPost(params struct {
 	GroupId int64
 	IsOn    bool
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "设置WAF规则分组 %d 开启状态", params.GroupId)
+
 	_, err := this.RPC().HTTPFirewallRuleGroupRPC().UpdateHTTPFirewallRuleGroupIsOn(this.AdminContext(), &pb.UpdateHTTPFirewallRuleGroupIsOnRequest{
 		FirewallRuleGroupId: params.GroupId,
 		IsOn:                params.IsOn,

internal/web/actions/default/servers/components/waf/updateGroupPopup.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -47,6 +48,9 @@ func (this *UpdateGroupPopupAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 基本信息", params.GroupId)
+
 	params.Must.
 		Field("name", params.Name).
 		Require("请输入分组名称")

internal/web/actions/default/servers/components/waf/updateSetOn.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -13,6 +14,9 @@ func (this *UpdateSetOnAction) RunPost(params struct {
 	SetId int64
 	IsOn  bool
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 开启状态", params.SetId)
+
 	_, err := this.RPC().HTTPFirewallRuleSetRPC().UpdateHTTPFirewallRuleSetIsOn(this.AdminContext(), &pb.UpdateHTTPFirewallRuleSetIsOnRequest{
 		FirewallRuleSetId: params.SetId,
 		IsOn:              params.IsOn,

internal/web/actions/default/servers/components/waf/updateSetPopup.go

@@ -2,6 +2,7 @@ package waf
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -25,6 +26,9 @@ func (this *UpdateSetPopupAction) RunGet(params struct {
 	Type             string
 	SetId            int64
 }) {
+	// 日志
+	this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 基本信息", params.SetId)
+
 	this.Data["groupId"] = params.GroupId
 	this.Data["type"] = params.Type
 

internal/web/actions/default/servers/server/delete/index.go

@@ -1,8 +1,9 @@
 package delete
 
 import (
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 )
 
@@ -23,6 +24,10 @@ func (this *IndexAction) RunPost(params struct {
 	ServerId int64
 	Must     *actions.Must
 }) {
+	// 记录日志
+	this.CreateLog(oplogs.LevelInfo, "删除代理服务 %d", params.ServerId)
+
+	// 执行删除
 	_, err := this.RPC().ServerRPC().DisableServer(this.AdminContext(), &pb.DisableServerRequest{ServerId: params.ServerId})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/dns/index.go

@@ -0,0 +1,33 @@
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "index")
+	this.SecondMenu("dns")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+}) {
+	dnsInfoResp, err := this.RPC().ServerRPC().FindEnabledServerDNS(this.AdminContext(), &pb.FindEnabledServerDNSRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["dnsName"] = dnsInfoResp.DnsName
+	if dnsInfoResp.Domain != nil {
+		this.Data["dnsDomain"] = dnsInfoResp.Domain.Name
+	} else {
+		this.Data["dnsDomain"] = ""
+	}
+
+	this.Show()
+}

internal/web/actions/default/servers/server/settings/dns/init.go

@@ -0,0 +1,18 @@
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(serverutils.NewServerHelper()).
+			Prefix("/servers/server/settings/dns").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/servers/server/settings/http/index.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
@@ -66,6 +67,9 @@ func (this *IndexAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 记录日志
+	this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTP设置", params.ServerId)
+
 	addresses := []*serverconfigs.NetworkAddressConfig{}
 	err := json.Unmarshal([]byte(params.Addresses), &addresses)
 	if err != nil {

internal/web/actions/default/servers/server/settings/https/index.go

@@ -3,6 +3,7 @@ package https
 import (
 	"encoding/json"
 	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -77,6 +78,9 @@ func (this *IndexAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
+	// 记录日志
+	this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTPS设置", params.ServerId)
+
 	addresses := []*serverconfigs.NetworkAddressConfig{}
 	err := json.Unmarshal([]byte(params.Addresses), &addresses)
 	if err != nil {

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -158,6 +158,11 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isActive": secondMenuItem == "basic",
 			"isOff":    !serverConfig.IsOn,
 		},
+		{
+			"name":     "DNS",
+			"url":      "/servers/server/settings/dns?serverId=" + serverIdString,
+			"isActive": secondMenuItem == "dns",
+		},
 	}
 
 	// HTTP

internal/web/actions/default/setup/install.go

@@ -124,6 +124,9 @@ func (this *InstallAction) RunPost(params struct {
 			if err != nil {
 				this.Fail("API节点启动失败：" + err.Error())
 			}
+
+			// 等待API节点初始化完成
+			time.Sleep(2 * time.Second)
 		}
 
 		// 写入API节点配置，完成安装

internal/web/import.go

@@ -35,6 +35,7 @@ import (
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/cache"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/charset"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds"
+	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/dns"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/gzip"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/headers"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/http"

web/public/js/components/common/copy-to-clipboard.js

@@ -0,0 +1,15 @@
+Vue.component("copy-to-clipboard", {
+	props: ["v-target"],
+	created: function () {
+		let jsFile = document.createElement("script")
+		jsFile.setAttribute("src", "/js/clipboard.min.js")
+		document.head.appendChild(jsFile)
+	},
+	methods: {
+		copy: function () {
+			new ClipboardJS('[data-clipboard-target]');
+			teaweb.success("已复制到剪切板")
+		}
+	},
+	template: `<a href="" title="拷贝到剪切板" :data-clipboard-target="'#' + vTarget" @click.prevent="copy"><i class="ui icon copy small"></i></em></a>`
+})

web/views/@default/servers/components/waf/@waf_menu.html

@@ -6,8 +6,9 @@
 	<menu-item :href="'/servers/components/waf/groups?firewallPolicyId=' + firewallPolicyId + '&type=outbound'" code="outbound">出站规则({{countOutboundGroups}})</menu-item>
 	<menu-item :href="'/servers/components/waf/ipadmin?firewallPolicyId=' + firewallPolicyId" code="ipadmin">IP管理</menu-item>
 	<menu-item :href="'/servers/components/waf/log?firewallPolicyId=' + firewallPolicyId" code="log">拦截日志</menu-item>
-	<menu-item :href="'/servers/components/waf/test?firewallPolicyId=' + firewallPolicyId" code="test">测试</menu-item>
+	<!-- TODO -->
+	<!--<menu-item :href="'/servers/components/waf/test?firewallPolicyId=' + firewallPolicyId" code="test">测试</menu-item>
 	<menu-item :href="'/servers/components/waf/import?firewallPolicyId=' + firewallPolicyId" code="import">导入</menu-item>
-	<menu-item :href="'/servers/components/waf/export?firewallPolicyId=' + firewallPolicyId" code="export">导出</menu-item>
+	<menu-item :href="'/servers/components/waf/export?firewallPolicyId=' + firewallPolicyId" code="export">导出</menu-item>-->
 	<menu-item :href="'/servers/components/waf/update?firewallPolicyId=' + firewallPolicyId" code="update">修改</menu-item>
 </second-menu>

web/views/@default/servers/server/settings/dns/index.html

@@ -0,0 +1,15 @@
+{$layout}
+
+{$template "/left_menu"}
+
+<div class="right-box">
+	<table class="ui table selectable definition">
+		<tr>
+			<td class="title">当前服务CNAME</td>
+			<td>
+				<span id="cname-text">{{dnsName}}.<span v-if="dnsDomain.length > 0">{{dnsDomain}}.</span><span v-else>根域名</span></span> &nbsp; <copy-to-clipboard :v-target="'cname-text'"></copy-to-clipboard>
+				<p class="comment">可以在DNS设置一个CNAME记录，名字为你自己的域名，值为上面这个值。</p>
+			</td>
+		</tr>
+	</table>
+</div>

web/views/@default/setup/index.html

@@ -76,7 +76,7 @@
 						<td>节点端口 *</td>
 						<td>
 							<input type="text" name="newPort" style="width:6em" maxlength="5" v-model="newAPINodePort"/>
-							<p class="comment">选一个在1024-65535之间并且没有正在使用的端口作为要启动的节点端口。</p>
+							<p class="comment">选一个在1024-65535之间并且没有正在使用的端口作为要启动的节点端口。如果你的服务器上有防火墙，请记得设置这个端口为通过。</p>
 						</td>
 					</tr>
 					<tr>