实现基本的域名、记录管理

internal/configloaders/admin_module.go

@@ -158,7 +158,7 @@ func AllModuleMaps() []maps.Map {
 	}
 	if teaconst.IsPlus {
 		m = append(m, maps.Map{
-			"name": "域名服务器",
+			"name": "域名服务",
 			"code": AdminModuleCodeNS,
 			"url":  "/ns",
 		})

internal/rpc/rpc_client.go

@@ -360,6 +360,14 @@ func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
 	return pb.NewNSNodeServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
+	return pb.NewNSDomainServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
+	return pb.NewNSRecordServiceClient(this.pickConn())
+}
+
 // Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
 	ctx := context.Background()

internal/web/actions/actionutils/utils.go

@@ -37,6 +37,8 @@ func FailPage(action actions.ActionWrapper, err error) {
 	<div style="background: #eee; border: 1px #ccc solid; padding: 10px; font-size: 12px; line-height: 1.8">
 	` + teaconst.ErrServer + `
 	<div>可以通过查看 <strong><em>$安装目录/logs/run.log</em></strong> 日志文件查看具体的错误提示。</div>
+	<hr style="border-top: 1px #ccc solid"/>
+	<div style="color: red">Error: ` + err.Error() + `</pre>
 	</div>
 	</body>
 </html>`)

internal/web/actions/default/ns/clusters/init.go

@@ -15,6 +15,7 @@ func init() {
 			Prefix("/ns/clusters").
 			Get("", new(IndexAction)).
 			GetPost("/create", new(CreateAction)).
+			Post("/options", new(OptionsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/ns/clusters/logs/index.go

@@ -0,0 +1,88 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+}
+
+func (this *IndexAction) RunGet(params struct {
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
+}) {
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+
+	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
+		NodeId:  0,
+		Role:    nodeconfigs.NodeRoleDNS,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:  0,
+		Role:    nodeconfigs.NodeRoleDNS,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
+
+	logs := []maps.Map{}
+	for _, log := range logsResp.NodeLogs {
+		// 节点信息
+		nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: log.NodeId})
+		if err != nil {
+			continue
+		}
+		node := nodeResp.NsNode
+		if node == nil || node.NsCluster == nil {
+			continue
+		}
+
+		logs = append(logs, maps.Map{
+			"tag":         log.Tag,
+			"description": log.Description,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
+			"level":       log.Level,
+			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+			"count":       log.Count,
+			"node": maps.Map{
+				"id": node.Id,
+				"cluster": maps.Map{
+					"id":   node.NsCluster.Id,
+					"name": node.NsCluster.Name,
+				},
+				"name": node.Name,
+			},
+		})
+	}
+	this.Data["logs"] = logs
+
+	this.Show()
+}

internal/web/actions/default/ns/clusters/logs/init.go

@@ -0,0 +1,19 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNS)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "log").
+			Prefix("/ns/clusters/logs").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/ns/clusters/options.go

@@ -0,0 +1,30 @@
+package clusters
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	clustersResp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	clusterMaps := []maps.Map{}
+	for _, cluster := range clustersResp.NsClusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/create.go

@@ -0,0 +1,62 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package domains
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateAction) Init() {
+	this.Nav("", "", "create")
+}
+
+func (this *CreateAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *CreateAction) RunPost(params struct {
+	Name      string
+	ClusterId int64
+	UserId    int64
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	var domainId int64
+	defer func() {
+		this.CreateLogInfo("创建域名 %d", domainId)
+	}()
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入域名").
+		Expect(func() (message string, success bool) {
+			success = domainutils.ValidateDomainFormat(params.Name)
+			if !success {
+				message = "请输入正确的域名"
+			}
+			return
+		}).
+		Field("clusterId", params.ClusterId).
+		Gt(0, "请选择所属集群")
+
+	createResp, err := this.RPC().NSDomainRPC().CreateNSDomain(this.AdminContext(), &pb.CreateNSDomainRequest{
+		NsClusterId: params.ClusterId,
+		UserId:      params.UserId,
+		Name:        params.Name,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domainId = createResp.NsDomainId
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/delete.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package domains
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	DomainId int64
+}) {
+	defer this.CreateLogInfo("删除域名 %d", params.DomainId)
+
+	_, err := this.RPC().NSDomainRPC().DeleteNSDomain(this.AdminContext(), &pb.DeleteNSDomainRequest{NsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/domain.go

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package domains
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type DomainAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DomainAction) Init() {
+	this.Nav("", "", "index")
+}
+
+func (this *DomainAction) RunGet(params struct {
+	DomainId int64
+}) {
+	// 域名信息
+	domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domain := domainResp.NsDomain
+	if domain == nil {
+		this.NotFound("nsDomain", params.DomainId)
+		return
+	}
+
+	var clusterMap maps.Map
+	if domain.NsCluster != nil {
+		clusterMap = maps.Map{
+			"id":   domain.NsCluster.Id,
+			"name": domain.NsCluster.Name,
+		}
+	}
+
+	// 用户信息
+	var userMap maps.Map
+	if domain.User != nil {
+		userMap = maps.Map{
+			"id":       domain.User.Id,
+			"username": domain.User.Username,
+			"fullname": domain.User.Fullname,
+		}
+	}
+
+	this.Data["domain"] = maps.Map{
+		"id":      domain.Id,
+		"name":    domain.Name,
+		"isOn":    domain.IsOn,
+		"cluster": clusterMap,
+		"user":    userMap,
+	}
+
+	this.Show()
+}

internal/web/actions/default/ns/domains/records/createPopup.go

@@ -0,0 +1,81 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package records
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct {
+	DomainId int64
+}) {
+	// 域名信息
+	domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domain := domainResp.NsDomain
+	if domain == nil {
+		this.NotFound("nsDomain", params.DomainId)
+		return
+	}
+	this.Data["domain"] = maps.Map{
+		"id":   domain.Id,
+		"name": domain.Name,
+	}
+
+	// 类型
+	this.Data["types"] = dnsconfigs.FindAllRecordTypeDefinitions()
+
+	// TTL
+	this.Data["ttlValues"] = dnsconfigs.FindAllRecordTTL()
+
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	DomainId    int64
+	Name        string
+	Type        string
+	Value       string
+	Ttl         int32
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	var recordId int64
+	defer func() {
+		this.CreateLogInfo("创建域名记录 %d", recordId)
+	}()
+
+	createResp, err := this.RPC().NSRecordRPC().CreateNSRecord(this.AdminContext(), &pb.CreateNSRecordRequest{
+		NsDomainId:  params.DomainId,
+		Description: params.Description,
+		Name:        params.Name,
+		Type:        params.Type,
+		Value:       params.Value,
+		Ttl:         params.Ttl,
+		NsRouteIds:  nil, // TODO 等待实现
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	recordId = createResp.NsRecordId
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/records/delete.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package records
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	RecordId int64
+}) {
+	defer this.CreateLogInfo("删除域名记录 %d", params.RecordId)
+
+	_, err := this.RPC().NSRecordRPC().DeleteNSRecord(this.AdminContext(), &pb.DeleteNSRecordRequest{NsRecordId: params.RecordId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/records/index.go

@@ -0,0 +1,96 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package records
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "record")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	DomainId int64
+	Type     string
+	Keyword  string
+	RouteId  int64 // TODO
+}) {
+	this.Data["type"] = params.Type
+	this.Data["keyword"] = params.Keyword
+	this.Data["routeId"] = params.RouteId
+
+	// 域名信息
+	domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domain := domainResp.NsDomain
+	if domain == nil {
+		this.NotFound("nsDomain", params.DomainId)
+		return
+	}
+	this.Data["domain"] = maps.Map{
+		"id":   domain.Id,
+		"name": domain.Name,
+	}
+
+	// 记录
+	countResp, err := this.RPC().NSRecordRPC().CountAllEnabledNSRecords(this.AdminContext(), &pb.CountAllEnabledNSRecordsRequest{
+		NsDomainId: params.DomainId,
+		Type:       params.Type,
+		NsRouteId:  params.RouteId,
+		Keyword:    params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	recordsResp, err := this.RPC().NSRecordRPC().ListEnabledNSRecords(this.AdminContext(), &pb.ListEnabledNSRecordsRequest{
+		NsDomainId: params.DomainId,
+		Type:       params.Type,
+		NsRouteId:  params.RouteId,
+		Keyword:    params.Keyword,
+		Offset:     page.Offset,
+		Size:       page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var recordMaps = []maps.Map{}
+	for _, record := range recordsResp.NsRecords {
+		routeMaps := []maps.Map{}
+		for _, route := range record.NsRoutes {
+			routeMaps = append(routeMaps, maps.Map{
+				"id":   route.Id,
+				"name": route.Name,
+			})
+		}
+
+		recordMaps = append(recordMaps, maps.Map{
+			"id":          record.Id,
+			"name":        record.Name,
+			"type":        record.Type,
+			"value":       record.Value,
+			"ttl":         record.Ttl,
+			"weight":      record.Weight,
+			"description": record.Description,
+			"routes":      routeMaps,
+		})
+	}
+	this.Data["records"] = recordMaps
+
+	this.Show()
+}

internal/web/actions/default/ns/domains/records/updatePopup.go

@@ -0,0 +1,98 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package records
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdatePopupAction) RunGet(params struct {
+	RecordId int64
+}) {
+	recordResp, err := this.RPC().NSRecordRPC().FindEnabledNSRecord(this.AdminContext(), &pb.FindEnabledNSRecordRequest{NsRecordId: params.RecordId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	record := recordResp.NsRecord
+	if record == nil {
+		this.NotFound("nsRecord", params.RecordId)
+		return
+	}
+
+	this.Data["record"] = maps.Map{
+		"id":          record.Id,
+		"name":        record.Name,
+		"type":        record.Type,
+		"value":       record.Value,
+		"ttl":         record.Ttl,
+		"weight":      record.Weight,
+		"description": record.Description,
+	}
+
+	// 域名信息
+	domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: record.NsDomain.Id})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domain := domainResp.NsDomain
+	if domain == nil {
+		this.NotFound("nsDomain", record.NsDomain.Id)
+		return
+	}
+	this.Data["domain"] = maps.Map{
+		"id":   domain.Id,
+		"name": domain.Name,
+	}
+
+	// 类型
+	this.Data["types"] = dnsconfigs.FindAllRecordTypeDefinitions()
+
+	// TTL
+	this.Data["ttlValues"] = dnsconfigs.FindAllRecordTTL()
+
+	this.Show()
+}
+
+func (this *UpdatePopupAction) RunPost(params struct {
+	RecordId    int64
+	Name        string
+	Type        string
+	Value       string
+	Ttl         int32
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	this.CreateLogInfo("修改域名记录 %d", params.RecordId)
+
+	_, err := this.RPC().NSRecordRPC().UpdateNSRecord(this.AdminContext(), &pb.UpdateNSRecordRequest{
+		NsRecordId:  params.RecordId,
+		Description: params.Description,
+		Name:        params.Name,
+		Type:        params.Type,
+		Value:       params.Value,
+		Ttl:         params.Ttl,
+		NsRouteIds:  nil, // TODO 等待实现
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/domains/update.go

@@ -0,0 +1,96 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package domains
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
+}
+
+func (this *UpdateAction) RunGet(params struct {
+	DomainId int64
+}) {
+	// 域名信息
+	domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domain := domainResp.NsDomain
+	if domain == nil {
+		this.NotFound("nsDomain", params.DomainId)
+		return
+	}
+
+	var clusterId = int64(0)
+	if domain.NsCluster != nil {
+		clusterId = domain.NsCluster.Id
+	}
+
+	// 用户信息
+	var userId = int64(0)
+	if domain.User != nil {
+		userId = domain.User.Id
+	}
+
+	this.Data["domain"] = maps.Map{
+		"id":        domain.Id,
+		"name":      domain.Name,
+		"isOn":      domain.IsOn,
+		"clusterId": clusterId,
+		"userId":    userId,
+	}
+
+	this.Show()
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	DomainId  int64
+	Name      string
+	ClusterId int64
+	UserId    int64
+	IsOn      bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	this.CreateLogInfo("修改域名 %d", params.DomainId)
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入域名").
+		Expect(func() (message string, success bool) {
+			success = domainutils.ValidateDomainFormat(params.Name)
+			if !success {
+				message = "请输入正确的域名"
+			}
+			return
+		}).
+		Field("clusterId", params.ClusterId).
+		Gt(0, "请选择所属集群")
+
+	_, err := this.RPC().NSDomainRPC().UpdateNSDomain(this.AdminContext(), &pb.UpdateNSDomainRequest{
+		NsDomainId:  params.DomainId,
+		NsClusterId: params.ClusterId,
+		UserId:      params.UserId,
+		Name:        params.Name,
+		IsOn:        params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/index.go

@@ -2,6 +2,8 @@ package ns
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
 )
 
 type IndexAction struct {
@@ -9,9 +11,80 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
+	this.FirstMenu("index")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+	UserId    int64
+	Keyword   string
+}) {
+	this.Data["clusterId"] = params.ClusterId
+	this.Data["userId"] = params.UserId
+	this.Data["keyword"] = params.Keyword
+
+	// 集群数量
+	countClustersResp, err := this.RPC().NSClusterRPC().CountAllEnabledNSClusters(this.AdminContext(), &pb.CountAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countClusters"] = countClustersResp.Count
+
+	// 分页
+	countResp, err := this.RPC().NSDomainRPC().CountAllEnabledNSDomains(this.AdminContext(), &pb.CountAllEnabledNSDomainsRequest{
+		UserId:      params.UserId,
+		NsClusterId: params.ClusterId,
+		Keyword:     params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	page := this.NewPage(countResp.Count)
+
+	// 列表
+	domainsResp, err := this.RPC().NSDomainRPC().ListEnabledNSDomains(this.AdminContext(), &pb.ListEnabledNSDomainsRequest{
+		UserId:      params.UserId,
+		NsClusterId: params.ClusterId,
+		Keyword:     params.Keyword,
+		Offset:      page.Offset,
+		Size:        page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	domainMaps := []maps.Map{}
+	for _, domain := range domainsResp.NsDomains {
+		// 集群信息
+		var clusterMap maps.Map
+		if domain.NsCluster != nil {
+			clusterMap = maps.Map{
+				"id":   domain.NsCluster.Id,
+				"name": domain.NsCluster.Name,
+			}
+		}
+
+		// 用户信息
+		var userMap maps.Map
+		if domain.User != nil {
+			userMap = maps.Map{
+				"id":       domain.User.Id,
+				"username": domain.User.Username,
+				"fullname": domain.User.Fullname,
+			}
+		}
+
+		domainMaps = append(domainMaps, maps.Map{
+			"id":      domain.Id,
+			"name":    domain.Name,
+			"isOn":    domain.IsOn,
+			"cluster": clusterMap,
+			"user":    userMap,
+		})
+	}
+	this.Data["domains"] = domainMaps
 
 	this.Show()
 }

internal/web/actions/default/ns/init.go

@@ -2,6 +2,8 @@ package ns
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/domains"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/domains/records"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -14,6 +16,20 @@ func init() {
 			Prefix("/ns").
 			Get("", new(IndexAction)).
 
+			// 域名相关
+			Prefix("/ns/domains").
+			GetPost("/create", new(domains.CreateAction)).
+			Post("/delete", new(domains.DeleteAction)).
+			Get("/domain", new(domains.DomainAction)).
+			GetPost("/update", new(domains.UpdateAction)).
+
+			// 记录相关
+			Prefix("/ns/domains/records").
+			Get("", new(records.IndexAction)).
+			GetPost("/createPopup", new(records.CreatePopupAction)).
+			GetPost("/updatePopup", new(records.UpdatePopupAction)).
+			Post("/delete", new(records.DeleteAction)).
+
 			EndAll()
 	})
 }

internal/web/actions/default/ns/users/init.go

@@ -0,0 +1,19 @@
+package users
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNS)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "domain").
+			Prefix("/ns/users").
+			Post("/options", new(OptionsAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/ns/users/options.go

@@ -0,0 +1,34 @@
+package users
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{
+		Offset: 0,
+		Size:   10000, // TODO 改进 <ns-user-selector> 组件
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	userMaps := []maps.Map{}
+	for _, user := range usersResp.Users {
+		userMaps = append(userMaps, maps.Map{
+			"id":       user.Id,
+			"fullname": user.Fullname,
+			"username": user.Username,
+		})
+	}
+	this.Data["users"] = userMaps
+
+	this.Success()
+}

internal/web/actions/default/users/index.go

@@ -27,7 +27,11 @@ func (this *IndexAction) RunGet(params struct {
 	page := this.NewPage(count)
 	this.Data["page"] = page.AsHTML()
 
-	usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{Keyword: params.Keyword})
+	usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/helpers/user_must_auth.go

@@ -220,7 +220,7 @@ func (this *userMustAuth) modules(adminId int64) []maps.Map {
 		{
 			"code":     "ns",
 			"module":   configloaders.AdminModuleCodeNS,
-			"name":     "域名服务器",
+			"name":     "域名服务",
 			"subtitle": "域名列表",
 			"icon":     "cubes",
 			"isOn":     teaconst.IsPlus,
@@ -232,7 +232,7 @@ func (this *userMustAuth) modules(adminId int64) []maps.Map {
 				},
 				{
 					"name": "节点日志",
-					"url":  "/ns/logs",
+					"url":  "/ns/clusters/logs",
 					"code": "log",
 				},
 			},

internal/web/import.go

@@ -37,6 +37,8 @@ import (
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/cluster"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/cluster/settings"
+	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/logs"
+	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/users"
 
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs"