From d768d468549f7ba4463e4db6c4e2b7d0ceaa24c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Fri, 20 Aug 2021 11:27:16 +0800 Subject: [PATCH] =?UTF-8?q?DNS=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8C=B9=E9=85=8D=E7=9A=84=E7=BA=BF=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nameservers/service_ns_access_log.go | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/internal/rpc/services/nameservers/service_ns_access_log.go b/internal/rpc/services/nameservers/service_ns_access_log.go index 487c9a49..ba4ca5d0 100644 --- a/internal/rpc/services/nameservers/service_ns_access_log.go +++ b/internal/rpc/services/nameservers/service_ns_access_log.go @@ -3,9 +3,11 @@ package nameservers import ( "context" "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/types" ) // NSAccessLogService 访问日志相关服务 @@ -61,6 +63,27 @@ func (this *NSAccessLogService) ListNSAccessLogs(ctx context.Context, req *pb.Li if err != nil { return nil, err } + + // 线路 + if len(a.NsRouteCodes) > 0 { + for _, routeCode := range a.NsRouteCodes { + route, err := nameservers.SharedNSRouteDAO.FindEnabledRouteWithCode(nil, routeCode) + if err != nil { + return nil, err + } + if route != nil { + a.NsRoutes = append(a.NsRoutes, &pb.NSRoute{ + Id: types.Int64(route.Id), + IsOn: route.IsOn == 1, + Name: route.Name, + Code: routeCode, + NsCluster: nil, + NsDomain: nil, + }) + } + } + } + result = append(result, a) }