From a713c88d51ccc7ff3526b931ab274d25acdd2625 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 7 Feb 2021 09:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=9B=86=E7=BE=A4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/rpc/services/service_server.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go
index 523ca845..969c9cbc 100644
--- a/internal/rpc/services/service_server.go
+++ b/internal/rpc/services/service_server.go
@@ -1148,12 +1148,21 @@ func (this *ServerService) FindEnabledUserServerBasic(ctx context.Context, req *
 		return &pb.FindEnabledUserServerBasicResponse{Server: nil}, nil
 	}
 
+	clusterName, err := models.SharedNodeClusterDAO.FindNodeClusterName(tx, int64(server.ClusterId))
+	if err != nil {
+		return nil, err
+	}
+
 	return &pb.FindEnabledUserServerBasicResponse{Server: &pb.Server{
 		Id:          int64(server.Id),
 		Name:        server.Name,
 		Description: server.Description,
 		IsOn:        server.IsOn == 1,
 		Type:        server.Type,
+		NodeCluster: &pb.NodeCluster{
+			Id:   int64(server.ClusterId),
+			Name: clusterName,
+		},
 	}}, nil
 }