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

优化TOA相关代码

Browse Source
This commit is contained in:
GoEdgeLab
2023-07-24 15:33:44 +08:00
parent c48cedd30c
commit 2d8228996f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/models/node_cluster_dao.go
View File

@@ -647,10 +647,10 @@ func (this *NodeClusterDAO) FindClusterTOAConfig(tx *dbs.Tx, clusterId int64, ca
return nil, err return nil, err
} }
if !IsNotNull([]byte(toa)) { 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) err = json.Unmarshal([]byte(toa), config)
if err != nil { if err != nil {
return nil, err return nil, err

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

@@ -1102,7 +1102,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Con
// toa // toa
if models.IsNotNull(cluster.Toa) { if models.IsNotNull(cluster.Toa) {
var toaConfig = &nodeconfigs.TOAConfig{} var toaConfig = nodeconfigs.NewTOAConfig()
err = json.Unmarshal(cluster.Toa, toaConfig) err = json.Unmarshal(cluster.Toa, toaConfig)
if err != nil { if err != nil {
return nil, err return nil, err