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

优化代码

Browse Source
This commit is contained in:
刘祥超
2023-07-03 17:12:24 +08:00
parent 74e909a501
commit 3f21b3148e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,11 +1135,12 @@ func (this *NodeClusterDAO) FindClusterUAMPolicy(tx *dbs.Tx, clusterId int64, ca
return nil, err return nil, err
} }
var policy = nodeconfigs.NewUAMPolicy()
if IsNull(uamJSON) { if IsNull(uamJSON) {
return nodeconfigs.DefaultUAMPolicy, nil return policy, nil
} }
var policy = &nodeconfigs.UAMPolicy{}
err = json.Unmarshal(uamJSON, policy) err = json.Unmarshal(uamJSON, policy)
if err != nil { if err != nil {
return nil, err return nil, err

2
internal/db/models/node_dao.go
View File

@@ -1174,7 +1174,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared
// UAM // UAM
if IsNotNull(nodeCluster.Uam) { if IsNotNull(nodeCluster.Uam) {
var uamPolicy = &nodeconfigs.UAMPolicy{} var uamPolicy = nodeconfigs.NewUAMPolicy()
err = json.Unmarshal(nodeCluster.Uam, uamPolicy) err = json.Unmarshal(nodeCluster.Uam, uamPolicy)
if err != nil { if err != nil {
return nil, err return nil, err

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

@@ -1130,15 +1130,15 @@ func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Con
} }
// UAM // UAM
var uamPolicy = nodeconfigs.NewUAMPolicy()
if models.IsNotNull(cluster.Uam) { if models.IsNotNull(cluster.Uam) {
var uamPolicy = &nodeconfigs.UAMPolicy{}
err = json.Unmarshal(cluster.Uam, uamPolicy) err = json.Unmarshal(cluster.Uam, uamPolicy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
result.UamIsOn = uamPolicy.IsOn result.UamIsOn = uamPolicy.IsOn
} else { } else {
result.UamIsOn = nodeconfigs.DefaultUAMPolicy.IsOn result.UamIsOn = uamPolicy.IsOn
} }
// HTTP CC // HTTP CC
@@ -1292,7 +1292,7 @@ func (this *NodeClusterService) UpdateNodeClusterUAMPolicy(ctx context.Context,
return nil, err return nil, err
} }
var uamPolicy = &nodeconfigs.UAMPolicy{} var uamPolicy = nodeconfigs.NewUAMPolicy()
err = json.Unmarshal(req.UamPolicyJSON, uamPolicy) err = json.Unmarshal(req.UamPolicyJSON, uamPolicy)
if err != nil { if err != nil {
return nil, err return nil, err