From 1a6f1b5bece56d8c8f728b19448eda34914986c4 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 25 Jul 2021 15:46:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=A4=BE=E5=8C=BA=E7=89=88?= =?UTF-8?q?=E5=92=8C=E5=95=86=E4=B8=9A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + go.mod | 3 --- internal/nodes/api_node_services.go | 7 ++----- internal/nodes/api_node_services_hook.go | 9 +++++++++ ...ce_authority_key.go => service_authority_key_plus.go} | 1 + 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 internal/nodes/api_node_services_hook.go rename internal/rpc/services/{service_authority_key.go => service_authority_key_plus.go} (99%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..21efdc0b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*_plus.go \ No newline at end of file diff --git a/go.mod b/go.mod index 29045da9..617dd77f 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,9 @@ go 1.15 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon -replace github.com/TeaOSLab/EdgePlus => ../EdgePlus - require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000 - github.com/TeaOSLab/EdgePlus v0.0.0-00010101000000-000000000000 github.com/aliyun/alibaba-cloud-sdk-go v1.61.641 github.com/cespare/xxhash/v2 v2.1.1 github.com/go-acme/lego/v4 v4.1.2 diff --git a/internal/nodes/api_node_services.go b/internal/nodes/api_node_services.go index 9d774e32..7cf0e6da 100644 --- a/internal/nodes/api_node_services.go +++ b/internal/nodes/api_node_services.go @@ -393,11 +393,6 @@ func (this *APINode) registerServices(server *grpc.Server) { pb.RegisterMonitorNodeServiceServer(server, instance) this.rest(instance) } - { - instance := this.serviceInstance(&services.AuthorityKeyService{}).(*services.AuthorityKeyService) - pb.RegisterAuthorityKeyServiceServer(server, instance) - this.rest(instance) - } { instance := this.serviceInstance(&services.AuthorityNodeService{}).(*services.AuthorityNodeService) pb.RegisterAuthorityNodeServiceServer(server, instance) @@ -501,6 +496,8 @@ func (this *APINode) registerServices(server *grpc.Server) { this.rest(instance) } + APINodeServicesRegister(this, server) + // TODO check service names for serviceName := range server.GetServiceInfo() { index := strings.LastIndex(serviceName, ".") diff --git a/internal/nodes/api_node_services_hook.go b/internal/nodes/api_node_services_hook.go new file mode 100644 index 00000000..87a40499 --- /dev/null +++ b/internal/nodes/api_node_services_hook.go @@ -0,0 +1,9 @@ +// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +// +build community + +package nodes + +import "google.golang.org/grpc" + +func APINodeServicesRegister(node *APINode, server *grpc.Server) { +} diff --git a/internal/rpc/services/service_authority_key.go b/internal/rpc/services/service_authority_key_plus.go similarity index 99% rename from internal/rpc/services/service_authority_key.go rename to internal/rpc/services/service_authority_key_plus.go index af111731..dbf43783 100644 --- a/internal/rpc/services/service_authority_key.go +++ b/internal/rpc/services/service_authority_key_plus.go @@ -1,4 +1,5 @@ // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +// +build plus package services