From 2d8228996fd9ce1c3822aec2fb68336b1251a9ad Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 24 Jul 2023 15:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96TOA=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_cluster_dao.go | 4 ++-- internal/rpc/services/service_node_cluster.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index 03be901b..ebf1a76e 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -647,10 +647,10 @@ func (this *NodeClusterDAO) FindClusterTOAConfig(tx *dbs.Tx, clusterId int64, ca return nil, err } if !IsNotNull([]byte(toa)) { - return nodeconfigs.DefaultTOAConfig(), nil + return nodeconfigs.NewTOAConfig(), nil } - config := &nodeconfigs.TOAConfig{} + var config = nodeconfigs.NewTOAConfig() err = json.Unmarshal([]byte(toa), config) if err != nil { return nil, err diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index 1ace02e3..d27ab499 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -1102,7 +1102,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Con // toa if models.IsNotNull(cluster.Toa) { - var toaConfig = &nodeconfigs.TOAConfig{} + var toaConfig = nodeconfigs.NewTOAConfig() err = json.Unmarshal(cluster.Toa, toaConfig) if err != nil { return nil, err