TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-06 18:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

创建集群的时候可以设置DNS记录的默认TTL

Browse Source
This commit is contained in:
刘祥超
2022-09-08 11:02:26 +08:00
parent c271cadabd
commit a25b0e6c9d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/db/models/node_cluster_dao.go
View File

@@ -125,13 +125,13 @@ func (this *NodeClusterDAO) FindAllEnableClusterIds(tx *dbs.Tx) (result []int64,
} }
// CreateCluster 创建集群 // CreateCluster 创建集群
func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string, grantId int64, installDir string, dnsDomainId int64, dnsName string, cachePolicyId int64, httpFirewallPolicyId int64, systemServices map[string]maps.Map) (clusterId int64, err error) { func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string, grantId int64, installDir string, dnsDomainId int64, dnsName string, dnsTTL int32, cachePolicyId int64, httpFirewallPolicyId int64, systemServices map[string]maps.Map) (clusterId int64, err error) {
uniqueId, err := this.GenUniqueId(tx) uniqueId, err := this.GenUniqueId(tx)
if err != nil { if err != nil {
return 0, err return 0, err
} }
secret := rands.String(32) var secret = rands.String(32)
err = SharedApiTokenDAO.CreateAPIToken(tx, uniqueId, secret, nodeconfigs.NodeRoleCluster) err = SharedApiTokenDAO.CreateAPIToken(tx, uniqueId, secret, nodeconfigs.NodeRoleCluster)
if err != nil { if err != nil {
return 0, err return 0, err
@@ -151,7 +151,7 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string
ServersAutoSync: true, ServersAutoSync: true,
CNameRecords: []string{}, CNameRecords: []string{},
CNameAsDomain: true, CNameAsDomain: true,
TTL: 0, TTL: dnsTTL,
IncludingLnNodes: true, IncludingLnNodes: true,
} }
dnsJSON, err := json.Marshal(dnsConfig) dnsJSON, err := json.Marshal(dnsConfig)

9
internal/rpc/services/service_node_cluster.go
View File

@@ -33,7 +33,7 @@ func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.C
} }
// 系统服务 // 系统服务
systemServices := map[string]maps.Map{} var systemServices = map[string]maps.Map{}
if len(req.SystemServicesJSON) > 0 { if len(req.SystemServicesJSON) > 0 {
err = json.Unmarshal(req.SystemServicesJSON, &systemServices) err = json.Unmarshal(req.SystemServicesJSON, &systemServices)
if err != nil { if err != nil {
@@ -61,7 +61,12 @@ func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.C
req.HttpFirewallPolicyId = policyId req.HttpFirewallPolicyId = policyId
} }
clusterId, err = models.SharedNodeClusterDAO.CreateCluster(tx, adminId, req.Name, req.NodeGrantId, req.InstallDir, req.DnsDomainId, req.DnsName, req.HttpCachePolicyId, req.HttpFirewallPolicyId, systemServices) // DNS
if req.DnsTTL < 0 {
req.DnsTTL = 0
}
clusterId, err = models.SharedNodeClusterDAO.CreateCluster(tx, adminId, req.Name, req.NodeGrantId, req.InstallDir, req.DnsDomainId, req.DnsName, req.DnsTTL, req.HttpCachePolicyId, req.HttpFirewallPolicyId, systemServices)
if err != nil { if err != nil {
return err return err
} }