From 51e37f0c52a427efb45f1308e68228083af21842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 3 Jan 2022 16:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=9C=A8firewalld=E4=B8=AD=E5=BC=80=E6=94=BE=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_cluster_dao.go | 5 +++-- internal/db/models/node_cluster_model.go | 2 ++ internal/db/models/node_dao.go | 1 + internal/rpc/services/service_node_cluster.go | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index 96c17d51..4c12db35 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -178,7 +178,7 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string } // UpdateCluster 修改集群 -func (this *NodeClusterDAO) UpdateCluster(tx *dbs.Tx, clusterId int64, name string, grantId int64, installDir string, timezone string, nodeMaxThreads int32, nodeTCPMaxConnections int32) error { +func (this *NodeClusterDAO) UpdateCluster(tx *dbs.Tx, clusterId int64, name string, grantId int64, installDir string, timezone string, nodeMaxThreads int32, nodeTCPMaxConnections int32, autoOpenPorts bool) error { if clusterId <= 0 { return errors.New("invalid clusterId") } @@ -198,6 +198,7 @@ func (this *NodeClusterDAO) UpdateCluster(tx *dbs.Tx, clusterId int64, name stri nodeTCPMaxConnections = 0 } op.NodeTCPMaxConnections = nodeTCPMaxConnections + op.AutoOpenPorts = autoOpenPorts err := this.Save(tx, op) if err != nil { @@ -887,7 +888,7 @@ func (this *NodeClusterDAO) FindClusterBasicInfo(tx *dbs.Tx, clusterId int64, ca cluster, err := this.Query(tx). Pk(clusterId). - Result("timeZone", "nodeMaxThreads", "nodeTCPMaxConnections", "cachePolicyId", "httpFirewallPolicyId"). + Result("timeZone", "nodeMaxThreads", "nodeTCPMaxConnections", "cachePolicyId", "httpFirewallPolicyId", "autoOpenPorts"). Find() if err != nil || cluster == nil { return nil, err diff --git a/internal/db/models/node_cluster_model.go b/internal/db/models/node_cluster_model.go index a22c5aa7..e835db24 100644 --- a/internal/db/models/node_cluster_model.go +++ b/internal/db/models/node_cluster_model.go @@ -29,6 +29,7 @@ type NodeCluster struct { TimeZone string `field:"timeZone"` // 时区 NodeMaxThreads uint32 `field:"nodeMaxThreads"` // 节点最大线程数 NodeTCPMaxConnections uint32 `field:"nodeTCPMaxConnections"` // TCP最大连接数 + AutoOpenPorts uint8 `field:"autoOpenPorts"` // 是否自动尝试开放端口 } type NodeClusterOperator struct { @@ -59,6 +60,7 @@ type NodeClusterOperator struct { TimeZone interface{} // 时区 NodeMaxThreads interface{} // 节点最大线程数 NodeTCPMaxConnections interface{} // TCP最大连接数 + AutoOpenPorts interface{} // 是否自动尝试开放端口 } func NewNodeClusterOperator() *NodeClusterOperator { diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index 94f6c230..5463905c 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -827,6 +827,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, cacheMap *utils if clusterIndex == 0 { config.MaxThreads = int(nodeCluster.NodeMaxThreads) config.TCPMaxConnections = int(nodeCluster.NodeTCPMaxConnections) + config.AutoOpenPorts = nodeCluster.AutoOpenPorts == 1 } clusterIndex++ diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index 77306c11..4e2fd70b 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -83,7 +83,7 @@ func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.U tx := this.NullTx() - err = models.SharedNodeClusterDAO.UpdateCluster(tx, req.NodeClusterId, req.Name, req.NodeGrantId, req.InstallDir, req.TimeZone, req.NodeMaxThreads, req.NodeTCPMaxConnections) + err = models.SharedNodeClusterDAO.UpdateCluster(tx, req.NodeClusterId, req.Name, req.NodeGrantId, req.InstallDir, req.TimeZone, req.NodeMaxThreads, req.NodeTCPMaxConnections, req.AutoOpenPorts) if err != nil { return nil, err } @@ -163,6 +163,7 @@ func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req TimeZone: cluster.TimeZone, NodeMaxThreads: int32(cluster.NodeMaxThreads), NodeTCPMaxConnections: int32(cluster.NodeTCPMaxConnections), + AutoOpenPorts: cluster.AutoOpenPorts == 1, }}, nil }