diff --git a/go.mod b/go.mod index e8a2bb98..6485566b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.15 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon - require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000 @@ -15,7 +14,7 @@ require ( github.com/go-sql-driver/mysql v1.5.0 github.com/go-yaml/yaml v2.1.0+incompatible github.com/golang/protobuf v1.5.2 - github.com/iwind/TeaGo v0.0.0-20210806054428-5534da0db9d1 + github.com/iwind/TeaGo v0.0.0-20210809112119-a57ed0e84e34 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 github.com/json-iterator/go v1.1.11 // indirect github.com/lionsoul2014/ip2region v2.2.0-release+incompatible diff --git a/go.sum b/go.sum index 2927b6e5..3885e0c2 100644 --- a/go.sum +++ b/go.sum @@ -184,6 +184,8 @@ github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/go.mod h1:KU4mS7QNiZ7Q github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/iwind/TeaGo v0.0.0-20210806054428-5534da0db9d1 h1:AZKkwTNEZYrpyv62zIkxpLJsWhfOS7OEFovAcwd0aco= github.com/iwind/TeaGo v0.0.0-20210806054428-5534da0db9d1/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20210809112119-a57ed0e84e34 h1:ZCNQXLiGF5Z1cV3Pi03zCWzwwjPfsI5XhcrNhTvCFIU= +github.com/iwind/TeaGo v0.0.0-20210809112119-a57ed0e84e34/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c= github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= diff --git a/internal/const/const.go b/internal/const/const.go index 4e3ae280..14be7943 100644 --- a/internal/const/const.go +++ b/internal/const/const.go @@ -1,7 +1,7 @@ package teaconst const ( - Version = "0.2.9" + Version = "0.2.8.2" ProductName = "Edge API" ProcessName = "edge-api" @@ -18,7 +18,7 @@ const ( // 其他节点版本号,用来检测是否有需要升级的节点 - NodeVersion = "0.2.9" + NodeVersion = "0.2.8" UserNodeVersion = "0.0.10" AuthorityNodeVersion = "0.0.2" MonitorNodeVersion = "0.0.2" diff --git a/internal/rpc/services/service_http_access_log.go b/internal/rpc/services/service_http_access_log.go index d80a052f..1ac1b7cb 100644 --- a/internal/rpc/services/service_http_access_log.go +++ b/internal/rpc/services/service_http_access_log.go @@ -78,11 +78,50 @@ func (this *HTTPAccessLogService) ListHTTPAccessLogs(ctx context.Context, req *p } result := []*pb.HTTPAccessLog{} + var pbNodeMap = map[int64]*pb.Node{} + var pbClusterMap = map[int64]*pb.NodeCluster{} for _, accessLog := range accessLogs { a, err := accessLog.ToPB() if err != nil { return nil, err } + + // 节点 & 集群 + pbNode, ok := pbNodeMap[a.NodeId] + if ok { + a.Node = pbNode + } else { + node, err := models.SharedNodeDAO.FindEnabledNode(tx, a.NodeId) + if err != nil { + return nil, err + } + if node != nil { + pbNode = &pb.Node{Id: int64(node.Id), Name: node.Name} + + var clusterId = int64(node.ClusterId) + pbCluster, ok := pbClusterMap[clusterId] + if ok { + pbNode.NodeCluster = pbCluster + } else { + cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(tx, clusterId) + if err != nil { + return nil, err + } + if cluster != nil { + pbCluster = &pb.NodeCluster{ + Id: int64(cluster.Id), + Name: cluster.Name, + } + pbNode.NodeCluster = pbCluster + pbClusterMap[clusterId] = pbCluster + } + } + + pbNodeMap[a.NodeId] = pbNode + a.Node = pbNode + } + } + result = append(result, a) }