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

将全局设置的TCP相关设置移到“集群设置--网站设置”中

Browse Source
This commit is contained in:
刘祥超
2023-09-18 16:55:45 +08:00
parent 94b95beadf
commit 31a69ecb12
4 changed files with 17 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -963,15 +963,21 @@ func (this *NodeClusterService) FindFreePortInNodeCluster(ctx context.Context, r
}
var tx = this.NullTx()
globalConfig, err := models.SharedSysSettingDAO.ReadGlobalConfig(tx)
// 检查端口
globalServerConfig, err := models.SharedNodeClusterDAO.FindClusterGlobalServerConfig(tx, req.NodeClusterId)
if err != nil {
return nil, err
}
// 检查端口
portMin := globalConfig.TCPAll.PortRangeMin
portMax := globalConfig.TCPAll.PortRangeMax
denyPorts := globalConfig.TCPAll.DenyPorts
var portMin, portMax int
var denyPorts []int
if globalServerConfig != nil {
portMin = globalServerConfig.TCPAll.PortRangeMin
portMax = globalServerConfig.TCPAll.PortRangeMax
denyPorts = globalServerConfig.TCPAll.DenyPorts
}
if portMin == 0 && portMax == 0 {
portMin = 10_000