From 1b70824e0d3096ea2a7446ca56f81cb41f357b1f Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 5 Jul 2023 15:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E9=9B=86=E7=BE=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=20--=20=E7=BD=91=E7=AB=99=E8=AE=BE=E7=BD=AE=E2=80=9D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=85=81=E8=AE=B8=E8=AE=B0=E5=BD=95=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E6=97=A5=E5=BF=97=E2=80=9D=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_cluster_dao.go | 6 +++--- internal/db/models/node_cluster_model_ext.go | 2 +- internal/rpc/services/service_node.go | 2 +- internal/rpc/services/service_node_cluster.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index 246186b6..4f04b21f 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -176,7 +176,7 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string // 全局服务配置 if globalServerConfig == nil { - globalServerConfig = serverconfigs.DefaultGlobalServerConfig() + globalServerConfig = serverconfigs.NewGlobalServerConfig() } globalServerConfigJSON, err := json.Marshal(globalServerConfig) if err != nil { @@ -1396,7 +1396,7 @@ func (this *NodeClusterDAO) FindClusterGlobalServerConfig(tx *dbs.Tx, clusterId return nil, err } - var config = serverconfigs.DefaultGlobalServerConfig() + var config = serverconfigs.NewGlobalServerConfig() if IsNull(configJSON) { return config, nil } @@ -1412,7 +1412,7 @@ func (this *NodeClusterDAO) FindClusterGlobalServerConfig(tx *dbs.Tx, clusterId // UpdateClusterGlobalServerConfig 修改全局服务配置 func (this *NodeClusterDAO) UpdateClusterGlobalServerConfig(tx *dbs.Tx, clusterId int64, config *serverconfigs.GlobalServerConfig) error { if config == nil { - config = serverconfigs.DefaultGlobalServerConfig() + config = serverconfigs.NewGlobalServerConfig() } configJSON, err := json.Marshal(config) if err != nil { diff --git a/internal/db/models/node_cluster_model_ext.go b/internal/db/models/node_cluster_model_ext.go index 25b7ad58..2b24a304 100644 --- a/internal/db/models/node_cluster_model_ext.go +++ b/internal/db/models/node_cluster_model_ext.go @@ -60,7 +60,7 @@ func (this *NodeCluster) DecodeClock() *nodeconfigs.ClockConfig { // DecodeGlobalServerConfig 解析全局服务配置 func (this *NodeCluster) DecodeGlobalServerConfig() *serverconfigs.GlobalServerConfig { - var config = serverconfigs.DefaultGlobalServerConfig() + var config = serverconfigs.NewGlobalServerConfig() if IsNotNull(this.GlobalServerConfig) { err := json.Unmarshal(this.GlobalServerConfig, config) if err != nil { diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index c47deee1..97104f18 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -2016,7 +2016,7 @@ func (this *NodeService) FindNodeGlobalServerConfig(ctx context.Context, req *pb } } if config == nil { - config = serverconfigs.DefaultGlobalServerConfig() + config = serverconfigs.NewGlobalServerConfig() } configJSON, err := json.Marshal(config) diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index 413edd04..1ace02e3 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -34,7 +34,7 @@ func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.C } // 全局服务配置 - var serverGlobalConfig = serverconfigs.DefaultGlobalServerConfig() + var serverGlobalConfig = serverconfigs.NewGlobalServerConfig() if len(req.GlobalServerConfigJSON) > 0 { err = json.Unmarshal(req.GlobalServerConfigJSON, serverGlobalConfig) if err != nil { @@ -1444,7 +1444,7 @@ func (this *NodeClusterService) UpdateNodeClusterGlobalServerConfig(ctx context. return nil, err } - var config = serverconfigs.DefaultGlobalServerConfig() + var config = serverconfigs.NewGlobalServerConfig() err = json.Unmarshal(req.GlobalServerConfigJSON, config) if err != nil { return nil, err