From 004512234f8799d653c377f5c78d85742be3f494 Mon Sep 17 00:00:00 2001
From: duanhf2012 <boyce@atbc.com>
Date: Wed, 1 Apr 2020 18:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=98=E9=87=8F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rpc/client.go | 11 +++++------
 rpc/server.go |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rpc/client.go b/rpc/client.go
index ea353b9..0eeed24 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -151,7 +151,7 @@ type RpcResponse struct {
 	Err *RpcError
 
 	//returns
-	Returns []byte
+	Reply []byte
 }
 
 
@@ -179,14 +179,15 @@ func (slf *Client) Run(){
 			delete(slf.pending,respone.Seq)
 			slf.pendingLock.Unlock()
 			v.Err = nil
-			//*****如果对方返回nil，测试跨node时，调用其他服务rpc不存在的情况
-			if len(respone.Returns) >0 {
-				err = processor.Unmarshal(respone.Returns,v.Reply)
+
+			if len(respone.Reply) >0 {
+				err = processor.Unmarshal(respone.Reply,v.Reply)
 				if err != nil {
 					log.Error("rpcClient Unmarshal body error,error:%+v",err)
 					v.Err = err
 				}
 			}
+
 			if respone.Err != nil {
 				v.Err= respone.Err
 			}
@@ -194,10 +195,8 @@ func (slf *Client) Run(){
 			if v.callback.IsValid() {
 				 v.rpcHandler.(*RpcHandler).callResponeCallBack<-v
 			}else{
-				//发送至接受者
 				v.done <- v
 			}
-
 		}
 	}
 }
diff --git a/rpc/server.go b/rpc/server.go
index 155536c..5483c92 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -84,8 +84,8 @@ func (agent *RpcAgent) WriteRespone(serviceMethod string,seq uint64,reply interf
 	rpcRespone.Err = err
 	var errM error
 	if reply!=nil {
-		rpcRespone.Returns,errM = processor.Marshal(reply)
-		if errM!= nil {
+		rpcRespone.Reply,errM = processor.Marshal(reply)
+		if errM != nil {
 			rpcRespone.Err = ConvertError(errM)
 		}
 	}