From 86633495a1436ba119942c1fb5c0c8cff0dc0b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=99=AB=E4=BA=8C?= Date: Fri, 14 Jul 2023 03:39:30 +0000 Subject: [PATCH 1/5] 2.x client --- model/instance.go | 2 +- v2/pb/internal_request.go | 19 ++++++--- v2/pb/naming_request.go | 90 +++++++++++++++++++++++++-------------- v2/pb/request.go | 74 +++++++------------------------- v2/pb/response.go | 32 ++++++++++---- v2/server.go | 26 ++++++----- v2/service.go | 43 +++++++++++++++++++ v2/subscribe.go | 3 +- 8 files changed, 171 insertions(+), 118 deletions(-) create mode 100644 v2/service.go diff --git a/model/instance.go b/model/instance.go index a3ee020..24b8b06 100644 --- a/model/instance.go +++ b/model/instance.go @@ -181,7 +181,7 @@ func ReplaceNacosService(service string) string { func BuildServiceName(svcName, groupName string) string { if groupName == DefaultServiceGroup { - groupName = "" + return svcName } return groupName + ReplaceNacosGroupConnectStr + svcName } diff --git a/v2/pb/internal_request.go b/v2/pb/internal_request.go index b2948a9..52aff2a 100644 --- a/v2/pb/internal_request.go +++ b/v2/pb/internal_request.go @@ -30,7 +30,8 @@ type InternalRequest struct { // NewInternalRequest . func NewInternalRequest() *InternalRequest { request := Request{ - Headers: make(map[string]string, 8), + Headers: make(map[string]string, 8), + RequestId: "", } return &InternalRequest{ Request: &request, @@ -51,7 +52,7 @@ func NewHealthCheckRequest() *HealthCheckRequest { } func (r *HealthCheckRequest) GetRequestType() string { - return "HealthCheckRequest" + return TypeHealthCheckRequest } // ConnectResetRequest @@ -61,8 +62,14 @@ type ConnectResetRequest struct { ServerPort string } +func NewConnectResetRequest() *ConnectResetRequest { + return &ConnectResetRequest{ + InternalRequest: NewInternalRequest(), + } +} + func (r *ConnectResetRequest) GetRequestType() string { - return "ConnectResetRequest" + return TypeConnectResetRequest } // ClientDetectionRequest @@ -77,7 +84,7 @@ func NewClientDetectionRequest() *ClientDetectionRequest { } func (r *ClientDetectionRequest) GetRequestType() string { - return "ClientDetectionRequest" + return TypeClientDetectionRequest } // ServerCheckRequest @@ -93,7 +100,7 @@ func NewServerCheckRequest() *ServerCheckRequest { } func (r *ServerCheckRequest) GetRequestType() string { - return "ServerCheckRequest" + return TypeServerCheckRequest } // ConnectionSetupRequest @@ -113,5 +120,5 @@ func NewConnectionSetupRequest() *ConnectionSetupRequest { } func (r *ConnectionSetupRequest) GetRequestType() string { - return "ConnectionSetupRequest" + return TypeConnectionSetupRequest } diff --git a/v2/pb/naming_request.go b/v2/pb/naming_request.go index 687b1dd..64936f8 100644 --- a/v2/pb/naming_request.go +++ b/v2/pb/naming_request.go @@ -35,12 +35,27 @@ type NamingRequest struct { } // NewNamingRequest -func NewNamingRequest(namespace, serviceName, groupName string) *NamingRequest { - request := Request{ - Headers: make(map[string]string, 8), +func NewNamingRequest() *NamingRequest { + request := &Request{ + Headers: make(map[string]string, 8), + RequestId: "", } return &NamingRequest{ - Request: &request, + Request: request, + Namespace: model.DefaultNacosNamespace, + ServiceName: "", + GroupName: model.DefaultServiceGroup, + Module: "naming", + } +} + +func NewBasicNamingRequest(requestId, namespace, serviceName, groupName string) *NamingRequest { + request := &Request{ + Headers: make(map[string]string, 8), + RequestId: requestId, + } + return &NamingRequest{ + Request: request, Namespace: namespace, ServiceName: serviceName, GroupName: groupName, @@ -64,17 +79,16 @@ type InstanceRequest struct { } // NewInstanceRequest -func NewInstanceRequest(namespace, serviceName, groupName, reqType string, - instance model.Instance) *InstanceRequest { +func NewInstanceRequest() *InstanceRequest { return &InstanceRequest{ - NamingRequest: NewNamingRequest(namespace, serviceName, groupName), - Type: reqType, - Instance: instance, + NamingRequest: NewNamingRequest(), + Type: TypeInstanceRequest, + Instance: model.Instance{}, } } func (r *InstanceRequest) GetRequestType() string { - return "InstanceRequest" + return TypeInstanceRequest } // BatchInstanceRequest . @@ -84,8 +98,16 @@ type BatchInstanceRequest struct { Instances []*model.Instance `json:"instances"` } +func NewBatchInstanceRequest() *BatchInstanceRequest { + return &BatchInstanceRequest{ + NamingRequest: NewNamingRequest(), + Type: TypeBatchInstanceRequest, + Instances: make([]*model.Instance, 0), + } +} + func (r *BatchInstanceRequest) GetRequestType() string { - return "BatchInstanceRequest" + return TypeBatchInstanceRequest } func (r *BatchInstanceRequest) Normalize() { @@ -103,8 +125,15 @@ type NotifySubscriberRequest struct { ServiceInfo *model.ServiceInfo `json:"serviceInfo"` } +func NewNotifySubscriberRequest() *NotifySubscriberRequest { + return &NotifySubscriberRequest{ + NamingRequest: NewNamingRequest(), + ServiceInfo: &model.ServiceInfo{}, + } +} + func (r *NotifySubscriberRequest) GetRequestType() string { - return "NotifySubscriberRequest" + return TypeNotifySubscriberRequest } // SubscribeServiceRequest @@ -115,17 +144,16 @@ type SubscribeServiceRequest struct { } // NewSubscribeServiceRequest . -func NewSubscribeServiceRequest(namespace, serviceName, groupName, clusters string, - subscribe bool) *SubscribeServiceRequest { +func NewSubscribeServiceRequest() *SubscribeServiceRequest { return &SubscribeServiceRequest{ - NamingRequest: NewNamingRequest(namespace, serviceName, groupName), - Subscribe: subscribe, - Clusters: clusters, + NamingRequest: NewNamingRequest(), + Subscribe: true, + Clusters: "", } } func (r *SubscribeServiceRequest) GetRequestType() string { - return "SubscribeServiceRequest" + return TypeSubscribeServiceRequest } // ServiceListRequest @@ -137,18 +165,17 @@ type ServiceListRequest struct { } // NewServiceListRequest . -func NewServiceListRequest(namespace, serviceName, groupName string, pageNo, - pageSize int, selector string) *ServiceListRequest { +func NewServiceListRequest() *ServiceListRequest { return &ServiceListRequest{ - NamingRequest: NewNamingRequest(namespace, serviceName, groupName), - PageNo: pageNo, - PageSize: pageSize, - Selector: selector, + NamingRequest: NewNamingRequest(), + PageNo: 0, + PageSize: 10, + Selector: "", } } func (r *ServiceListRequest) GetRequestType() string { - return "ServiceListRequest" + return TypeServiceListRequest } // ServiceQueryRequest @@ -160,16 +187,15 @@ type ServiceQueryRequest struct { } // NewServiceQueryRequest . -func NewServiceQueryRequest(namespace, serviceName, groupName, cluster string, healthyOnly bool, - udpPort int) *ServiceQueryRequest { +func NewServiceQueryRequest() *ServiceQueryRequest { return &ServiceQueryRequest{ - NamingRequest: NewNamingRequest(namespace, serviceName, groupName), - Cluster: cluster, - HealthyOnly: healthyOnly, - UdpPort: udpPort, + NamingRequest: NewNamingRequest(), + Cluster: "", + HealthyOnly: false, + UdpPort: 0, } } func (r *ServiceQueryRequest) GetRequestType() string { - return "ServiceQueryRequest" + return TypeServiceQueryRequest } diff --git a/v2/pb/request.go b/v2/pb/request.go index 8965bba..0bd2235 100644 --- a/v2/pb/request.go +++ b/v2/pb/request.go @@ -21,65 +21,20 @@ import ( "encoding/json" ) -var ( - customerPayloadRegistry = map[string]func() BaseRequest{} -) - const ( - // TypeConnectionSetupRequest - TypeConnectionSetupRequest = "ConnectionSetupRequest" - // TypeServerCheckRequest - TypeServerCheckRequest = "ServerCheckRequest" - // TypeInstanceRequest - TypeInstanceRequest = "InstanceRequest" - // TypeBatchInstanceRequest - TypeBatchInstanceRequest = "BatchInstanceRequest" + TypeConnectionSetupRequest = "ConnectionSetupRequest" + TypeConnectResetRequest = "ConnectResetRequest" + TypeClientDetectionRequest = "ClientDetectionRequest" + TypeHealthCheckRequest = "HealthCheckRequest" + TypeServerCheckRequest = "ServerCheckRequest" + TypeInstanceRequest = "InstanceRequest" + TypeBatchInstanceRequest = "BatchInstanceRequest" + TypeNotifySubscriberRequest = "NotifySubscriberRequest" + TypeSubscribeServiceRequest = "SubscribeServiceRequest" + TypeServiceListRequest = "ServiceListRequest" + TypeServiceQueryRequest = "ServiceQueryRequest" ) -func init() { - // system - registryCustomerPayload(func() BaseRequest { - return &ConnectionSetupRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &ConnectResetRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &ServerCheckRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &ClientDetectionRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &HealthCheckRequest{} - }) - - // discovery - registryCustomerPayload(func() BaseRequest { - return &InstanceRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &BatchInstanceRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &NotifySubscriberRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &SubscribeServiceRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &ServiceListRequest{} - }) - registryCustomerPayload(func() BaseRequest { - return &ServiceQueryRequest{} - }) -} - -func registryCustomerPayload(builder func() BaseRequest) { - example := builder() - customerPayloadRegistry[example.GetRequestType()] = builder -} - // CustomerPayload type CustomerPayload interface{} @@ -108,6 +63,9 @@ type BaseRequest interface { } func (r *Request) PutAllHeaders(headers map[string]string) { + if r.Headers == nil { + r.Headers = make(map[string]string) + } for k, v := range headers { r.Headers[k] = v } @@ -118,8 +76,8 @@ func (r *Request) ClearHeaders() { } func (r *Request) GetHeaders() map[string]string { - if len(r.Headers) == 0 { - return map[string]string{} + if r.Headers == nil { + r.Headers = make(map[string]string) } return r.Headers } diff --git a/v2/pb/response.go b/v2/pb/response.go index 741e978..be0d2b4 100644 --- a/v2/pb/response.go +++ b/v2/pb/response.go @@ -23,6 +23,20 @@ import ( "github.com/polaris-contrib/apiserver-nacos/model" ) +const ( + TypeConnectResetResponse = "ConnectResetResponse" + TypeClientDetectionResponse = "ClientDetectionResponse" + TypeServerCheckResponse = "ServerCheckResponse" + TypeInstanceResponse = "InstanceResponse" + TypeBatchInstanceResponse = "BatchInstanceResponse" + TypeQueryServiceResponse = "QueryServiceResponse" + TypeSubscribeServiceResponse = "SubscribeServiceResponse" + TypeServiceListResponse = "ServiceListResponse" + TypeNotifySubscriberResponse = "NotifySubscriberResponse" + TypeHealthCheckResponse = "HealthCheckResponse" + TypeErrorResponse = "ErrorResponse" +) + // BaseResponse type BaseResponse interface { GetResponseType() string @@ -113,7 +127,7 @@ type ServerCheckResponse struct { } func (c *ServerCheckResponse) GetResponseType() string { - return "ServerCheckResponse" + return TypeServerCheckResponse } // InstanceResponse @@ -122,7 +136,7 @@ type InstanceResponse struct { } func (c *InstanceResponse) GetResponseType() string { - return "InstanceResponse" + return TypeInstanceResponse } // BatchInstanceResponse @@ -131,7 +145,7 @@ type BatchInstanceResponse struct { } func (c *BatchInstanceResponse) GetResponseType() string { - return "BatchInstanceResponse" + return TypeBatchInstanceResponse } // QueryServiceResponse @@ -141,7 +155,7 @@ type QueryServiceResponse struct { } func (c *QueryServiceResponse) GetResponseType() string { - return "QueryServiceResponse" + return TypeQueryServiceResponse } // SubscribeServiceResponse @@ -151,7 +165,7 @@ type SubscribeServiceResponse struct { } func (c *SubscribeServiceResponse) GetResponseType() string { - return "SubscribeServiceResponse" + return TypeSubscribeServiceResponse } // ServiceListResponse @@ -162,7 +176,7 @@ type ServiceListResponse struct { } func (c *ServiceListResponse) GetResponseType() string { - return "ServiceListResponse" + return TypeServiceListResponse } // NotifySubscriberResponse @@ -171,7 +185,7 @@ type NotifySubscriberResponse struct { } func (c *NotifySubscriberResponse) GetResponseType() string { - return "NotifySubscriberResponse" + return TypeNotifySubscriberResponse } // NewHealthCheckResponse @@ -193,7 +207,7 @@ type HealthCheckResponse struct { } func (c *HealthCheckResponse) GetResponseType() string { - return "HealthCheckResponse" + return TypeHealthCheckResponse } // ErrorResponse @@ -202,5 +216,5 @@ type ErrorResponse struct { } func (c *ErrorResponse) GetResponseType() string { - return "ErrorResponse" + return TypeErrorResponse } diff --git a/v2/server.go b/v2/server.go index 3c335d4..29c5b3b 100644 --- a/v2/server.go +++ b/v2/server.go @@ -147,54 +147,60 @@ func (h *NacosV2Server) Initialize(ctx context.Context, option map[string]interf func (h *NacosV2Server) initHandlers() { h.handleRegistry = map[string]*RequestHandlerWarrper{ // Request - (&nacospb.InstanceRequest{}).GetRequestType(): { + nacospb.TypeInstanceRequest: { Handler: h.handleInstanceRequest, PayloadBuilder: func() nacospb.CustomerPayload { - return &nacospb.InstanceRequest{} + return nacospb.NewInstanceRequest() }, }, - (&nacospb.BatchInstanceRequest{}).GetRequestType(): { + nacospb.TypeBatchInstanceRequest: { Handler: h.handleBatchInstanceRequest, PayloadBuilder: func() nacospb.CustomerPayload { return &nacospb.BatchInstanceRequest{} }, }, - (&nacospb.ServerCheckRequest{}).GetRequestType(): { + nacospb.TypeServerCheckRequest: { Handler: h.handleServerCheckRequest, PayloadBuilder: func() nacospb.CustomerPayload { return nacospb.NewServerCheckRequest() }, }, - (&nacospb.HealthCheckRequest{}).GetRequestType(): { + nacospb.TypeHealthCheckRequest: { Handler: h.handleHealthCheckRequest, PayloadBuilder: func() nacospb.CustomerPayload { return nacospb.NewHealthCheckRequest() }, }, - (&nacospb.SubscribeServiceRequest{}).GetRequestType(): { + nacospb.TypeSubscribeServiceRequest: { Handler: h.handleSubscribeServiceReques, PayloadBuilder: func() nacospb.CustomerPayload { return &nacospb.SubscribeServiceRequest{} }, }, - (&nacospb.ServiceListRequest{}).GetRequestType(): { + nacospb.TypeServiceListRequest: { Handler: h.handleServiceListRequest, PayloadBuilder: func() nacospb.CustomerPayload { return &nacospb.ServiceListRequest{} }, }, + nacospb.TypeServiceQueryRequest: { + Handler: h.handleServiceQueryRequest, + PayloadBuilder: func() nacospb.CustomerPayload { + return nacospb.NewServiceQueryRequest() + }, + }, // RequestBiStream - (&nacospb.ConnectionSetupRequest{}).GetRequestType(): { + nacospb.TypeConnectionSetupRequest: { PayloadBuilder: func() nacospb.CustomerPayload { return nacospb.NewConnectionSetupRequest() }, }, - (&nacospb.SubscribeServiceResponse{}).GetResponseType(): { + nacospb.TypeSubscribeServiceResponse: { PayloadBuilder: func() nacospb.CustomerPayload { return &nacospb.SubscribeServiceResponse{} }, }, - (&nacospb.NotifySubscriberResponse{}).GetResponseType(): { + nacospb.TypeNotifySubscriberResponse: { PayloadBuilder: func() nacospb.CustomerPayload { return &nacospb.NotifySubscriberResponse{} }, diff --git a/v2/service.go b/v2/service.go new file mode 100644 index 0000000..6033a4e --- /dev/null +++ b/v2/service.go @@ -0,0 +1,43 @@ +package v2 + +import ( + "context" + + "github.com/polaris-contrib/apiserver-nacos/model" + nacospb "github.com/polaris-contrib/apiserver-nacos/v2/pb" +) + +func (h *NacosV2Server) handleServiceQueryRequest(ctx context.Context, req nacospb.BaseRequest, + meta nacospb.RequestMeta) (nacospb.BaseResponse, error) { + svcQueryReq, ok := req.(*nacospb.ServiceQueryRequest) + if !ok { + return nil, ErrorInvalidRequestBodyType + } + resp := &nacospb.QueryServiceResponse{ + Response: &nacospb.Response{ + ResultCode: int(model.Response_Success.Code), + Success: true, + Message: "success", + }, + ServiceInfo: model.Service{ + Name: svcQueryReq.ServiceName, + GroupName: svcQueryReq.GroupName, + Hosts: make([]model.Instance, 0), + }, + } + namespace := model.ToPolarisNamespace(svcQueryReq.Namespace) + svc := h.discoverSvr.Cache().Service().GetServiceByName(svcQueryReq.ServiceName, namespace) + if svc == nil { + return resp, nil + } + insts := h.discoverSvr.Cache().Instance().GetInstancesByServiceID(svc.ID) + if insts == nil { + return resp, nil + } + for _, inst := range insts { + ins := model.Instance{} + ins.FromSpecInstance(inst) + resp.ServiceInfo.Hosts = append(resp.ServiceInfo.Hosts, ins) + } + return resp, nil +} diff --git a/v2/subscribe.go b/v2/subscribe.go index f2f4069..88a2e14 100644 --- a/v2/subscribe.go +++ b/v2/subscribe.go @@ -94,10 +94,9 @@ func (h *NacosV2Server) sendPushData(sub core.Subscriber, data *core.PushData) e watcher := sub svr := stream req := &nacospb.NotifySubscriberRequest{ - NamingRequest: nacospb.NewNamingRequest(namespace, data.ServiceInfo.Name, data.ServiceInfo.GroupName), + NamingRequest: nacospb.NewBasicNamingRequest(utils.NewUUID(), namespace, data.ServiceInfo.Name, data.ServiceInfo.GroupName), ServiceInfo: data.ServiceInfo, } - req.RequestId = utils.NewUUID() nacoslog.Info("[NACOS-V2][PushCenter] notify subscriber new service info", zap.String("conn-id", watcher.ConnID), zap.String("req-id", req.RequestId), zap.String("namespace", data.Service.Namespace), zap.String("svc", data.Service.Name)) From 8d1e783f1e149dfd76878f9cbfcf5201101e6c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=99=AB=E4=BA=8C?= Date: Fri, 14 Jul 2023 04:16:08 +0000 Subject: [PATCH 2/5] license and golangci-lint --- v2/service.go | 17 +++++++++++++++++ v2/subscribe.go | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/v2/service.go b/v2/service.go index 6033a4e..c0ba787 100644 --- a/v2/service.go +++ b/v2/service.go @@ -1,3 +1,20 @@ +/** + * Tencent is pleased to support the open source community by making Polaris available. + * + * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the BSD 3-Clause License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/BSD-3-Clause + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + package v2 import ( diff --git a/v2/subscribe.go b/v2/subscribe.go index 88a2e14..7b8bb4c 100644 --- a/v2/subscribe.go +++ b/v2/subscribe.go @@ -94,7 +94,8 @@ func (h *NacosV2Server) sendPushData(sub core.Subscriber, data *core.PushData) e watcher := sub svr := stream req := &nacospb.NotifySubscriberRequest{ - NamingRequest: nacospb.NewBasicNamingRequest(utils.NewUUID(), namespace, data.ServiceInfo.Name, data.ServiceInfo.GroupName), + NamingRequest: nacospb.NewBasicNamingRequest(utils.NewUUID(), namespace, data.ServiceInfo.Name, + data.ServiceInfo.GroupName), ServiceInfo: data.ServiceInfo, } nacoslog.Info("[NACOS-V2][PushCenter] notify subscriber new service info", zap.String("conn-id", watcher.ConnID), From dcd885d3f3a7c00ad0fb81ac0492652ed25c543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=99=AB=E4=BA=8C?= Date: Fri, 14 Jul 2023 04:23:23 +0000 Subject: [PATCH 3/5] golangci-lint --- v2/service.go | 2 +- v2/subscribe.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/v2/service.go b/v2/service.go index c0ba787..e90b0d7 100644 --- a/v2/service.go +++ b/v2/service.go @@ -14,7 +14,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ - + package v2 import ( diff --git a/v2/subscribe.go b/v2/subscribe.go index 7b8bb4c..ffdf0e3 100644 --- a/v2/subscribe.go +++ b/v2/subscribe.go @@ -96,7 +96,7 @@ func (h *NacosV2Server) sendPushData(sub core.Subscriber, data *core.PushData) e req := &nacospb.NotifySubscriberRequest{ NamingRequest: nacospb.NewBasicNamingRequest(utils.NewUUID(), namespace, data.ServiceInfo.Name, data.ServiceInfo.GroupName), - ServiceInfo: data.ServiceInfo, + ServiceInfo: data.ServiceInfo, } nacoslog.Info("[NACOS-V2][PushCenter] notify subscriber new service info", zap.String("conn-id", watcher.ConnID), zap.String("req-id", req.RequestId), From fcb7108ca228a6e48f7fef1cef6297ccd218e98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=99=AB=E4=BA=8C?= Date: Fri, 14 Jul 2023 04:35:50 +0000 Subject: [PATCH 4/5] some request --- v2/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/server.go b/v2/server.go index 29c5b3b..826f410 100644 --- a/v2/server.go +++ b/v2/server.go @@ -156,7 +156,7 @@ func (h *NacosV2Server) initHandlers() { nacospb.TypeBatchInstanceRequest: { Handler: h.handleBatchInstanceRequest, PayloadBuilder: func() nacospb.CustomerPayload { - return &nacospb.BatchInstanceRequest{} + return nacospb.NewBatchInstanceRequest() }, }, nacospb.TypeServerCheckRequest: { @@ -174,13 +174,13 @@ func (h *NacosV2Server) initHandlers() { nacospb.TypeSubscribeServiceRequest: { Handler: h.handleSubscribeServiceReques, PayloadBuilder: func() nacospb.CustomerPayload { - return &nacospb.SubscribeServiceRequest{} + return nacospb.NewSubscribeServiceRequest() }, }, nacospb.TypeServiceListRequest: { Handler: h.handleServiceListRequest, PayloadBuilder: func() nacospb.CustomerPayload { - return &nacospb.ServiceListRequest{} + return nacospb.NewServiceListRequest(); }, }, nacospb.TypeServiceQueryRequest: { From 2130719460fb5f829870599889d0207c94b29a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=99=AB=E4=BA=8C?= Date: Fri, 14 Jul 2023 04:39:18 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=9A=E4=BD=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/server.go b/v2/server.go index 826f410..66fb960 100644 --- a/v2/server.go +++ b/v2/server.go @@ -180,7 +180,7 @@ func (h *NacosV2Server) initHandlers() { nacospb.TypeServiceListRequest: { Handler: h.handleServiceListRequest, PayloadBuilder: func() nacospb.CustomerPayload { - return nacospb.NewServiceListRequest(); + return nacospb.NewServiceListRequest() }, }, nacospb.TypeServiceQueryRequest: {