TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-12-27 21:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
GoEdgeLab
2020-12-17 17:35:38 +08:00
parent 41ac159e23
commit a208cbaa41
33 changed files with 92 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/web/actions/default/clusters/cluster/index.go
View File

@@ -139,8 +139,8 @@ func (this *IndexAction) RunGet(params struct {
"memUsageText": fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
},
"cluster": maps.Map{
"id": node.Cluster.Id,
"name": node.Cluster.Name,
"id": node.NodeCluster.Id,
"name": node.NodeCluster.Name,
},
"isSynced": isSynced,
"ipAddresses": ipAddresses,

4
internal/web/actions/default/clusters/cluster/installNodes.go
View File

@@ -26,12 +26,12 @@ func (this *InstallNodesAction) RunGet(params struct {
this.ErrorPage(err)
return
}
if clusterResp.Cluster == nil {
if clusterResp.NodeCluster == nil {
this.NotFound("nodeCluster", params.ClusterId)
return
}
cluster := clusterResp.Cluster
cluster := clusterResp.NodeCluster
clusterAPINodesResp, err := this.RPC().NodeClusterRPC().FindAPINodesWithNodeCluster(this.AdminContext(), &pb.FindAPINodesWithNodeClusterRequest{NodeClusterId: params.ClusterId})
if err != nil {

6
internal/web/actions/default/clusters/cluster/node/install.go
View File

@@ -51,14 +51,14 @@ func (this *InstallAction) RunGet(params struct {
// 集群
var clusterMap maps.Map = nil
if node.Cluster != nil {
clusterId := node.Cluster.Id
if node.NodeCluster != nil {
clusterId := node.NodeCluster.Id
clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
if err != nil {
this.ErrorPage(err)
return
}
cluster := clusterResp.Cluster
cluster := clusterResp.NodeCluster
if cluster != nil {
clusterMap = maps.Map{
"id": cluster.Id,

6
internal/web/actions/default/clusters/cluster/node/node.go
View File

@@ -37,14 +37,14 @@ func (this *NodeAction) RunGet(params struct {
}
var clusterMap maps.Map = nil
if node.Cluster != nil {
clusterId := node.Cluster.Id
if node.NodeCluster != nil {
clusterId := node.NodeCluster.Id
clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
if err != nil {
this.ErrorPage(err)
return
}
cluster := clusterResp.Cluster
cluster := clusterResp.NodeCluster
if cluster != nil {
clusterMap = maps.Map{
"id": cluster.Id,

8
internal/web/actions/default/clusters/cluster/node/update.go
View File

@@ -37,10 +37,10 @@ func (this *UpdateAction) RunGet(params struct {
}
var clusterMap maps.Map = nil
if node.Cluster != nil {
if node.NodeCluster != nil {
clusterMap = maps.Map{
"id": node.Cluster.Id,
"name": node.Cluster.Name,
"id": node.NodeCluster.Id,
"name": node.NodeCluster.Name,
}
}
@@ -178,7 +178,7 @@ func (this *UpdateAction) RunGet(params struct {
return
}
clusterMaps := []maps.Map{}
for _, cluster := range resp.Clusters {
for _, cluster := range resp.NodeClusters {
clusterMaps = append(clusterMaps, maps.Map{
"id": cluster.Id,
"name": cluster.Name,

2
internal/web/actions/default/clusters/cluster/settings/index.go
View File

@@ -26,7 +26,7 @@ func (this *IndexAction) RunGet(params struct {
this.ErrorPage(err)
return
}
cluster := clusterResp.Cluster
cluster := clusterResp.NodeCluster
if cluster == nil {
this.WriteString("not found cluster")
return