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

internal/rpc/services/nameservers/service_ns_cluster.go

@@ -1,16 +1,17 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package services
+package nameservers
 
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
 // NSClusterService 域名服务集群相关服务
 type NSClusterService struct {
-	BaseService
+	services.BaseService
 }
 
 // CreateNSCluster 创建集群

internal/rpc/services/nameservers/service_ns_domain.go

@@ -0,0 +1,191 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nameservers
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// NSDomainService 域名相关服务
+type NSDomainService struct {
+	services.BaseService
+}
+
+// CreateNSDomain 创建域名
+func (this *NSDomainService) CreateNSDomain(ctx context.Context, req *pb.CreateNSDomainRequest) (*pb.CreateNSDomainResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	domainId, err := nameservers.SharedNSDomainDAO.CreateDomain(tx, req.NsClusterId, req.UserId, req.Name)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CreateNSDomainResponse{NsDomainId: domainId}, nil
+}
+
+// UpdateNSDomain 修改域名
+func (this *NSDomainService) UpdateNSDomain(ctx context.Context, req *pb.UpdateNSDomainRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = nameservers.SharedNSDomainDAO.UpdateDomain(tx, req.NsDomainId, req.NsClusterId, req.UserId, req.Name, req.IsOn)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// DeleteNSDomain 删除域名
+func (this *NSDomainService) DeleteNSDomain(ctx context.Context, req *pb.DeleteNSDomainRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = nameservers.SharedNSDomainDAO.DisableNSDomain(tx, req.NsDomainId)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// FindEnabledNSDomain 查找单个域名
+func (this *NSDomainService) FindEnabledNSDomain(ctx context.Context, req *pb.FindEnabledNSDomainRequest) (*pb.FindEnabledNSDomainResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	domain, err := nameservers.SharedNSDomainDAO.FindEnabledNSDomain(tx, req.NsDomainId)
+	if err != nil {
+		return nil, err
+	}
+	if domain == nil {
+		return &pb.FindEnabledNSDomainResponse{NsDomain: nil}, nil
+	}
+
+	// 集群
+	cluster, err := nameservers.SharedNSClusterDAO.FindEnabledNSCluster(tx, int64(domain.ClusterId))
+	if err != nil {
+		return nil, err
+	}
+	if cluster == nil {
+		return &pb.FindEnabledNSDomainResponse{NsDomain: nil}, nil
+	}
+
+	// 用户
+	var pbUser *pb.User
+	if domain.UserId > 0 {
+		user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId))
+		if err != nil {
+			return nil, err
+		}
+		if user == nil {
+			return &pb.FindEnabledNSDomainResponse{NsDomain: nil}, nil
+		}
+		pbUser = &pb.User{
+			Id:       int64(user.Id),
+			Username: user.Username,
+			Fullname: user.Fullname,
+		}
+	}
+
+	return &pb.FindEnabledNSDomainResponse{
+		NsDomain: &pb.NSDomain{
+			Id:        int64(domain.Id),
+			Name:      domain.Name,
+			IsOn:      domain.IsOn == 1,
+			CreatedAt: int64(domain.CreatedAt),
+			NsCluster: &pb.NSCluster{
+				Id:   int64(cluster.Id),
+				IsOn: cluster.IsOn == 1,
+				Name: cluster.Name,
+			},
+			User: pbUser,
+		},
+	}, nil
+}
+
+// CountAllEnabledNSDomains 计算域名数量
+func (this *NSDomainService) CountAllEnabledNSDomains(ctx context.Context, req *pb.CountAllEnabledNSDomainsRequest) (*pb.RPCCountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	count, err := nameservers.SharedNSDomainDAO.CountAllEnabledDomains(tx, req.NsClusterId, req.UserId, req.Keyword)
+	if err != nil {
+		return nil, err
+	}
+	return this.SuccessCount(count)
+}
+
+// ListEnabledNSDomains 列出单页域名
+func (this *NSDomainService) ListEnabledNSDomains(ctx context.Context, req *pb.ListEnabledNSDomainsRequest) (*pb.ListEnabledNSDomainsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	domains, err := nameservers.SharedNSDomainDAO.ListEnabledDomains(tx, req.NsClusterId, req.UserId, req.Keyword, req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	pbDomains := []*pb.NSDomain{}
+	for _, domain := range domains {
+		// 集群
+		cluster, err := nameservers.SharedNSClusterDAO.FindEnabledNSCluster(tx, int64(domain.ClusterId))
+		if err != nil {
+			return nil, err
+		}
+		if cluster == nil {
+			continue
+		}
+
+		// 用户
+		var pbUser *pb.User
+		if domain.UserId > 0 {
+			user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId))
+			if err != nil {
+				return nil, err
+			}
+			if user == nil {
+				continue
+			}
+			pbUser = &pb.User{
+				Id:       int64(user.Id),
+				Username: user.Username,
+				Fullname: user.Fullname,
+			}
+		}
+
+		pbDomains = append(pbDomains, &pb.NSDomain{
+			Id:        int64(domain.Id),
+			Name:      domain.Name,
+			IsOn:      domain.IsOn == 1,
+			CreatedAt: int64(domain.CreatedAt),
+			NsCluster: &pb.NSCluster{
+				Id:   int64(cluster.Id),
+				IsOn: cluster.IsOn == 1,
+				Name: cluster.Name,
+			},
+			User: pbUser,
+		})
+	}
+
+	return &pb.ListEnabledNSDomainsResponse{NsDomains: pbDomains}, nil
+}

internal/rpc/services/nameservers/service_ns_node.go

@@ -1,19 +1,20 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package services
+package nameservers
 
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/installers"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
 // NSNodeService 域名服务器节点服务
 type NSNodeService struct {
-	BaseService
+	services.BaseService
 }
 
 // FindAllEnabledNSNodesWithNSClusterId 根据集群查找所有节点

internal/rpc/services/nameservers/service_ns_record.go

@@ -0,0 +1,182 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nameservers
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/types"
+)
+
+// NSRecordService 域名记录相关服务
+type NSRecordService struct {
+	services.BaseService
+}
+
+// CreateNSRecord 创建记录
+func (this *NSRecordService) CreateNSRecord(ctx context.Context, req *pb.CreateNSRecordRequest) (*pb.CreateNSRecordResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	recordId, err := nameservers.SharedNSRecordDAO.CreateRecord(tx, req.NsDomainId, req.Description, req.Name, req.Type, req.Value, req.Ttl, req.NsRouteIds)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CreateNSRecordResponse{NsRecordId: recordId}, nil
+}
+
+// UpdateNSRecord 修改记录
+func (this *NSRecordService) UpdateNSRecord(ctx context.Context, req *pb.UpdateNSRecordRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = nameservers.SharedNSRecordDAO.UpdateRecord(tx, req.NsRecordId, req.Description, req.Name, req.Type, req.Value, req.Ttl, req.NsRouteIds)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// DeleteNSRecord 删除记录
+func (this *NSRecordService) DeleteNSRecord(ctx context.Context, req *pb.DeleteNSRecordRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = nameservers.SharedNSRecordDAO.DisableNSRecord(tx, req.NsRecordId)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// CountAllEnabledNSRecords 计算记录数量
+func (this *NSRecordService) CountAllEnabledNSRecords(ctx context.Context, req *pb.CountAllEnabledNSRecordsRequest) (*pb.RPCCountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	count, err := nameservers.SharedNSRecordDAO.CountAllEnabledRecords(tx, req.NsDomainId, req.Type, req.Keyword, req.NsRouteId)
+	if err != nil {
+		return nil, err
+	}
+	return this.SuccessCount(count)
+}
+
+// ListEnabledNSRecords 读取单页记录
+func (this *NSRecordService) ListEnabledNSRecords(ctx context.Context, req *pb.ListEnabledNSRecordsRequest) (*pb.ListEnabledNSRecordsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	records, err := nameservers.SharedNSRecordDAO.ListAllEnabledRecords(tx, req.NsDomainId, req.Type, req.Keyword, req.NsRouteId, req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	var pbRecords = []*pb.NSRecord{}
+	for _, record := range records {
+		// 线路
+		var pbRoutes = []*pb.NSRoute{}
+		for _, recordId := range record.DecodeRouteIds() {
+			route, err := nameservers.SharedNSRouteDAO.FindEnabledNSRoute(tx, recordId)
+			if err != nil {
+				return nil, err
+			}
+			if route == nil {
+				continue
+			}
+			pbRoutes = append(pbRoutes, &pb.NSRoute{
+				Id:   int64(route.Id),
+				Name: route.Name,
+			})
+		}
+
+		pbRecords = append(pbRecords, &pb.NSRecord{
+			Id:          int64(record.Id),
+			Description: record.Description,
+			Name:        record.Name,
+			Type:        record.Type,
+			Value:       record.Value,
+			Ttl:         types.Int32(record.Ttl),
+			Weight:      types.Int32(record.Weight),
+			CreatedAt:   int64(record.CreatedAt),
+			NsDomain:    nil,
+			NsRoutes:    pbRoutes,
+		})
+	}
+	return &pb.ListEnabledNSRecordsResponse{NsRecords: pbRecords}, nil
+}
+
+// FindEnabledNSRecord 查询单个记录信息
+func (this *NSRecordService) FindEnabledNSRecord(ctx context.Context, req *pb.FindEnabledNSRecordRequest) (*pb.FindEnabledNSRecordResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	record, err := nameservers.SharedNSRecordDAO.FindEnabledNSRecord(tx, req.NsRecordId)
+	if err != nil {
+		return nil, err
+	}
+	if record == nil {
+		return &pb.FindEnabledNSRecordResponse{NsRecord: nil}, nil
+	}
+
+	// 域名
+	domain, err := nameservers.SharedNSDomainDAO.FindEnabledNSDomain(tx, int64(record.DomainId))
+	if err != nil {
+		return nil, err
+	}
+	if domain == nil {
+		return &pb.FindEnabledNSRecordResponse{NsRecord: nil}, nil
+	}
+	var pbDomain = &pb.NSDomain{
+		Id:   int64(domain.Id),
+		Name: domain.Name,
+		IsOn: domain.IsOn == 1,
+	}
+
+	// 线路
+	var pbRoutes = []*pb.NSRoute{}
+	for _, recordId := range record.DecodeRouteIds() {
+		route, err := nameservers.SharedNSRouteDAO.FindEnabledNSRoute(tx, recordId)
+		if err != nil {
+			return nil, err
+		}
+		if route == nil {
+			continue
+		}
+		pbRoutes = append(pbRoutes, &pb.NSRoute{
+			Id:   int64(route.Id),
+			Name: route.Name,
+		})
+	}
+
+	return &pb.FindEnabledNSRecordResponse{NsRecord: &pb.NSRecord{
+		Id:          int64(record.Id),
+		Description: record.Description,
+		Name:        record.Name,
+		Type:        record.Type,
+		Value:       record.Value,
+		Ttl:         types.Int32(record.Ttl),
+		Weight:      types.Int32(record.Weight),
+		CreatedAt:   int64(record.CreatedAt),
+		NsDomain:    pbDomain,
+		NsRoutes:    pbRoutes,
+	}}, nil
+}

internal/rpc/services/service_user.go

@@ -12,12 +12,12 @@ import (
 	"time"
 )
 
-// 用户相关服务
+// UserService 用户相关服务
 type UserService struct {
 	BaseService
 }
 
-// 创建用户
+// CreateUser 创建用户
 func (this *UserService) CreateUser(ctx context.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -33,7 +33,7 @@ func (this *UserService) CreateUser(ctx context.Context, req *pb.CreateUserReque
 	return &pb.CreateUserResponse{UserId: userId}, nil
 }
 
-// 修改用户
+// UpdateUser 修改用户
 func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserRequest) (*pb.RPCSuccess, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -62,7 +62,7 @@ func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserReque
 	return this.Success()
 }
 
-// 删除用户
+// DeleteUser 删除用户
 func (this *UserService) DeleteUser(ctx context.Context, req *pb.DeleteUserRequest) (*pb.RPCSuccess, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -90,7 +90,7 @@ func (this *UserService) DeleteUser(ctx context.Context, req *pb.DeleteUserReque
 	return this.Success()
 }
 
-// 计算用户数量
+// CountAllEnabledUsers 计算用户数量
 func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.CountAllEnabledUsersRequest) (*pb.RPCCountResponse, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -106,7 +106,7 @@ func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.Count
 	return this.SuccessCount(count)
 }
 
-// 列出单页用户
+// ListEnabledUsers 列出单页用户
 func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabledUsersRequest) (*pb.ListEnabledUsersResponse, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -115,7 +115,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl
 
 	tx := this.NullTx()
 
-	users, err := models.SharedUserDAO.ListEnabledUsers(tx, req.Keyword)
+	users, err := models.SharedUserDAO.ListEnabledUsers(tx, req.Keyword, req.Offset, req.Size)
 	if err != nil {
 		return nil, err
 	}
@@ -152,7 +152,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl
 	return &pb.ListEnabledUsersResponse{Users: result}, nil
 }
 
-// 查询单个用户信息
+// FindEnabledUser 查询单个用户信息
 func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnabledUserRequest) (*pb.FindEnabledUserResponse, error) {
 	_, _, err := this.ValidateAdminAndUser(ctx, 0, 0)
 	if err != nil {
@@ -196,7 +196,7 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable
 	}}, nil
 }
 
-// 检查用户名是否存在
+// CheckUserUsername 检查用户名是否存在
 func (this *UserService) CheckUserUsername(ctx context.Context, req *pb.CheckUserUsernameRequest) (*pb.CheckUserUsernameResponse, error) {
 	userType, userId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
 	if err != nil {
@@ -217,7 +217,7 @@ func (this *UserService) CheckUserUsername(ctx context.Context, req *pb.CheckUse
 	return &pb.CheckUserUsernameResponse{Exists: b}, nil
 }
 
-// 登录
+// LoginUser 登录
 func (this *UserService) LoginUser(ctx context.Context, req *pb.LoginUserRequest) (*pb.LoginUserResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx)
 	if err != nil {
@@ -254,7 +254,7 @@ func (this *UserService) LoginUser(ctx context.Context, req *pb.LoginUserRequest
 	}, nil
 }
 
-// 修改用户基本信息
+// UpdateUserInfo 修改用户基本信息
 func (this *UserService) UpdateUserInfo(ctx context.Context, req *pb.UpdateUserInfoRequest) (*pb.RPCSuccess, error) {
 	userId, err := this.ValidateUser(ctx)
 	if err != nil {
@@ -274,7 +274,7 @@ func (this *UserService) UpdateUserInfo(ctx context.Context, req *pb.UpdateUserI
 	return this.Success()
 }
 
-// 修改用户登录信息
+// UpdateUserLogin 修改用户登录信息
 func (this *UserService) UpdateUserLogin(ctx context.Context, req *pb.UpdateUserLoginRequest) (*pb.RPCSuccess, error) {
 	userId, err := this.ValidateUser(ctx)
 	if err != nil {
@@ -294,7 +294,7 @@ func (this *UserService) UpdateUserLogin(ctx context.Context, req *pb.UpdateUser
 	return this.Success()
 }
 
-// 取得用户Dashboard数据
+// ComposeUserDashboard 取得用户Dashboard数据
 func (this *UserService) ComposeUserDashboard(ctx context.Context, req *pb.ComposeUserDashboardRequest) (*pb.ComposeUserDashboardResponse, error) {
 	userId, err := this.ValidateUser(ctx)
 	if err != nil {
@@ -371,7 +371,7 @@ func (this *UserService) ComposeUserDashboard(ctx context.Context, req *pb.Compo
 	}, nil
 }
 
-// 获取用户所在的集群ID
+// FindUserNodeClusterId 获取用户所在的集群ID
 func (this *UserService) FindUserNodeClusterId(ctx context.Context, req *pb.FindUserNodeClusterIdRequest) (*pb.FindUserNodeClusterIdResponse, error) {
 	_, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
 	if err != nil {
@@ -387,7 +387,7 @@ func (this *UserService) FindUserNodeClusterId(ctx context.Context, req *pb.Find
 	return &pb.FindUserNodeClusterIdResponse{NodeClusterId: clusterId}, nil
 }
 
-// 设置用户能使用的功能
+// UpdateUserFeatures 设置用户能使用的功能
 func (this *UserService) UpdateUserFeatures(ctx context.Context, req *pb.UpdateUserFeaturesRequest) (*pb.RPCSuccess, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -408,7 +408,7 @@ func (this *UserService) UpdateUserFeatures(ctx context.Context, req *pb.UpdateU
 	return this.Success()
 }
 
-// 获取用户所有的功能列表
+// FindUserFeatures 获取用户所有的功能列表
 func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserFeaturesRequest) (*pb.FindUserFeaturesResponse, error) {
 	_, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
 	if err != nil {
@@ -435,7 +435,7 @@ func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserF
 	return &pb.FindUserFeaturesResponse{Features: result}, nil
 }
 
-// 获取所有的功能定义
+// FindAllUserFeatureDefinitions 获取所有的功能定义
 func (this *UserService) FindAllUserFeatureDefinitions(ctx context.Context, req *pb.FindAllUserFeatureDefinitionsRequest) (*pb.FindAllUserFeatureDefinitionsResponse, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {