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

pkg/nodeconfigs/node_config.go

@@ -74,7 +74,6 @@ type NodeConfig struct {
 	ParentNodes map[int64][]*ParentNodeConfig `yaml:"parentNodes" json:"parentNodes"` // clusterId => []*ParentNodeConfig
 
 	// 全局配置
-	GlobalConfig       *serverconfigs.GlobalConfig       `yaml:"globalConfig" json:"globalConfig"`             // 全局配置
 	GlobalServerConfig *serverconfigs.GlobalServerConfig `yaml:"globalServerConfig" json:"globalServerConfig"` // 服务全局配置，用来替代 GlobalConfig
 	ProductConfig      *ProductConfig                    `yaml:"productConfig" json:"productConfig"`
 
@@ -263,14 +262,6 @@ func (this *NodeConfig) Init(ctx context.Context) (err error, serverErrors []*Se
 		}
 	}
 
-	// global config
-	if this.GlobalConfig != nil {
-		err = this.GlobalConfig.Init()
-		if err != nil {
-			return
-		}
-	}
-
 	// cache policy
 	if len(this.HTTPCachePolicies) > 0 {
 		for _, policy := range this.HTTPCachePolicies {
@@ -774,4 +765,4 @@ func (this *NodeConfig) SecretHash() string {
 // HasConnTimeoutSettings 检查是否有连接超时设置
 func (this *NodeConfig) HasConnTimeoutSettings() bool {
 	return this.GlobalServerConfig != nil && (this.GlobalServerConfig.Performance.AutoReadTimeout || this.GlobalServerConfig.Performance.AutoWriteTimeout)
-}
+}

pkg/rpc/dao/sys_setting_dao.go

@@ -1,41 +0,0 @@
-package dao
-
-import (
-	"context"
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-)
-
-type SettingCode = string
-
-const (
-	SettingCodeServerGlobalConfig  SettingCode = "serverGlobalConfig"  // 服务相关全局设置
-	SettingCodeNodeMonitor         SettingCode = "nodeMonitor"         // 监控节点状态
-	SettingCodeClusterHealthCheck  SettingCode = "clusterHealthCheck"  // 集群健康检查
-	SettingCodeIPListVersion       SettingCode = "ipListVersion"       // IP名单的版本号
-	SettingCodeAdminSecurityConfig SettingCode = "adminSecurityConfig" // 管理员安全设置
-)
-
-var SharedSysSettingDAO = new(SysSettingDAO)
-
-type SysSettingDAO struct {
-	BaseDAO
-}
-
-// 读取服务全局配置
-func (this *SysSettingDAO) ReadGlobalConfig(ctx context.Context) (*serverconfigs.GlobalConfig, error) {
-	globalConfigResp, err := this.RPC().SysSettingRPC().ReadSysSetting(ctx, &pb.ReadSysSettingRequest{Code: SettingCodeServerGlobalConfig})
-	if err != nil {
-		return nil, err
-	}
-	if len(globalConfigResp.ValueJSON) == 0 {
-		return nil, nil
-	}
-	globalConfig := &serverconfigs.GlobalConfig{}
-	err = json.Unmarshal(globalConfigResp.ValueJSON, globalConfig)
-	if err != nil {
-		return nil, err
-	}
-	return globalConfig, nil
-}

pkg/serverconfigs/global_config.go

@@ -1,25 +0,0 @@
-package serverconfigs
-
-// GlobalConfig 服务相关的全局设置
-// Deprecated
-type GlobalConfig struct {
-	// HTTP & HTTPS相关配置
-	HTTPAll struct {
-		//MatchDomainStrictly  bool                  `yaml:"matchDomainStrictly" json:"matchDomainStrictly"`   // 是否严格匹配域名
-		//AllowMismatchDomains []string              `yaml:"allowMismatchDomains" json:"allowMismatchDomains"` // 允许的不匹配的域名
-		//DefaultDomain        string                `yaml:"defaultDomain" json:"defaultDomain"`               // 默认的域名
-		//DomainMismatchAction *DomainMismatchAction `yaml:"domainMismatchAction" json:"domainMismatchAction"` // 不匹配时采取的动作
-		//DomainAuditingIsOn   bool   `yaml:"domainAuditingIsOn" json:"domainAuditingIsOn"`     // 域名是否需要审核
-		//DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核的提示
-	} `yaml:"httpAll" json:"httpAll"`
-
-	TCPAll struct {
-		PortRangeMin int   `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口
-		PortRangeMax int   `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口
-		DenyPorts    []int `yaml:"denyPorts" json:"denyPorts"`       // 禁止使用的端口
-	} `yaml:"tcpAll" json:"tcpAll"`
-}
-
-func (this *GlobalConfig) Init() error {
-	return nil
-}

pkg/serverconfigs/global_server_config.go

@@ -61,6 +61,12 @@ type GlobalServerConfig struct {
 		DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核的提示
 	} `yaml:"httpAll" json:"httpAll"` // HTTP统一配置
 
+	TCPAll struct {
+		PortRangeMin int   `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口
+		PortRangeMax int   `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口
+		DenyPorts    []int `yaml:"denyPorts" json:"denyPorts"`       // 禁止使用的端口
+	} `yaml:"tcpAll" json:"tcpAll"`
+
 	HTTPAccessLog struct {
 		IsOn                     bool `yaml:"isOn" json:"isOn"`                                         // 是否启用此功能
 		EnableRequestHeaders     bool `yaml:"enableRequestHeaders" json:"enableRequestHeaders"`         // 记录请求Header

pkg/systemconfigs/settings.go

@@ -3,7 +3,6 @@ package systemconfigs
 type SettingCode = string
 
 const (
-	SettingCodeServerGlobalConfig    SettingCode = "serverGlobalConfig"  // Deprecated 服务相关全局设置
 	SettingCodeNodeMonitor           SettingCode = "nodeMonitor"         // 监控节点状态
 	SettingCodeClusterHealthCheck    SettingCode = "clusterHealthCheck"  // 集群健康检查
 	SettingCodeIPListVersion         SettingCode = "ipListVersion"       // IP名单的版本号