diff --git a/internal/nodes/api_node_services.go b/internal/nodes/api_node_services.go index be885eaa..09520762 100644 --- a/internal/nodes/api_node_services.go +++ b/internal/nodes/api_node_services.go @@ -4,6 +4,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services/clients" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services/users" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "google.golang.org/grpc" @@ -404,12 +405,12 @@ func (this *APINode) registerServices(server *grpc.Server) { this.rest(instance) } { - var instance = this.serviceInstance(&services.FormalClientSystemService{}).(*services.FormalClientSystemService) + var instance = this.serviceInstance(&clients.FormalClientSystemService{}).(*clients.FormalClientSystemService) pb.RegisterFormalClientSystemServiceServer(server, instance) this.rest(instance) } { - var instance = this.serviceInstance(&services.FormalClientBrowserService{}).(*services.FormalClientBrowserService) + var instance = this.serviceInstance(&clients.FormalClientBrowserService{}).(*clients.FormalClientBrowserService) pb.RegisterFormalClientBrowserServiceServer(server, instance) this.rest(instance) } diff --git a/internal/rpc/services/service_formal_client_browser.go b/internal/rpc/services/clients/service_formal_client_browser.go similarity index 97% rename from internal/rpc/services/service_formal_client_browser.go rename to internal/rpc/services/clients/service_formal_client_browser.go index ea026682..a8d903aa 100644 --- a/internal/rpc/services/service_formal_client_browser.go +++ b/internal/rpc/services/clients/service_formal_client_browser.go @@ -1,18 +1,19 @@ // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . -package services +package clients import ( "context" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/errors" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" ) // FormalClientBrowserService 浏览器信息库服务 type FormalClientBrowserService struct { - BaseService + services.BaseService } // CreateFormalClientBrowser 创建浏览器信息 diff --git a/internal/rpc/services/service_formal_client_system.go b/internal/rpc/services/clients/service_formal_client_system.go similarity index 97% rename from internal/rpc/services/service_formal_client_system.go rename to internal/rpc/services/clients/service_formal_client_system.go index 2ff84a85..d2d15908 100644 --- a/internal/rpc/services/service_formal_client_system.go +++ b/internal/rpc/services/clients/service_formal_client_system.go @@ -1,18 +1,19 @@ // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . -package services +package clients import ( "context" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/errors" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" ) // FormalClientSystemService 操作系统信息库服务 type FormalClientSystemService struct { - BaseService + services.BaseService } // CreateFormalClientSystem 创建操作系统信息