From a4f425bd69b93a511f6c2675b3006062befc5514 Mon Sep 17 00:00:00 2001
From: orgin <boyce.duan@gmail.com>
Date: Tue, 31 May 2022 10:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5jsonprocessor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 network/processor/jsonprocessor.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/network/processor/jsonprocessor.go b/network/processor/jsonprocessor.go
index 33ea6c5..7d32912 100644
--- a/network/processor/jsonprocessor.go
+++ b/network/processor/jsonprocessor.go
@@ -44,18 +44,18 @@ func (jsonProcessor *JsonProcessor) SetByteOrder(littleEndian bool) {
 }
 
 // must goroutine safe
-func (jsonProcessor *JsonProcessor ) MsgRoute(msg interface{},userdata interface{}) error{
+func (jsonProcessor *JsonProcessor ) MsgRoute(clientId uint64,msg interface{}) error{
 	pPackInfo := msg.(*JsonPackInfo)
 	v,ok := jsonProcessor.mapMsg[pPackInfo.typ]
 	if ok == false {
 		return fmt.Errorf("cannot find msgtype %d is register!",pPackInfo.typ)
 	}
 
-	v.msgHandler(userdata.(uint64),pPackInfo.msg)
+	v.msgHandler(clientId,pPackInfo.msg)
 	return nil
 }
 
-func (jsonProcessor *JsonProcessor) Unmarshal(data []byte) (interface{}, error) {
+func (jsonProcessor *JsonProcessor) Unmarshal(clientId uint64,data []byte) (interface{}, error) {
 	typeStruct := struct {Type int `json:"typ"`}{}
 	defer jsonProcessor.ReleaseByteSlice(data)
 	err := json.Unmarshal(data, &typeStruct)
@@ -78,7 +78,7 @@ func (jsonProcessor *JsonProcessor) Unmarshal(data []byte) (interface{}, error)
 	return &JsonPackInfo{typ:msgType,msg:msgData},nil
 }
 
-func (jsonProcessor *JsonProcessor) Marshal(msg interface{}) ([]byte, error) {
+func (jsonProcessor *JsonProcessor) Marshal(clientId uint64,msg interface{}) ([]byte, error) {
 	rawMsg,err := json.Marshal(msg)
 	if err != nil {
 		return nil,err
@@ -103,16 +103,16 @@ func (jsonProcessor *JsonProcessor) MakeRawMsg(msgType uint16,msg []byte) *JsonP
 	return &JsonPackInfo{typ:msgType,rawMsg:msg}
 }
 
-func (jsonProcessor *JsonProcessor) UnknownMsgRoute(msg interface{}, userData interface{}){
-	jsonProcessor.unknownMessageHandler(userData.(uint64),msg.([]byte))
+func (jsonProcessor *JsonProcessor) UnknownMsgRoute(clientId uint64,msg interface{}){
+	jsonProcessor.unknownMessageHandler(clientId,msg.([]byte))
 }
 
-func (jsonProcessor *JsonProcessor) ConnectedRoute(userData interface{}){
-	jsonProcessor.connectHandler(userData.(uint64))
+func (jsonProcessor *JsonProcessor) ConnectedRoute(clientId uint64){
+	jsonProcessor.connectHandler(clientId)
 }
 
-func (jsonProcessor *JsonProcessor) DisConnectedRoute(userData interface{}){
-	jsonProcessor.disconnectHandler(userData.(uint64))
+func (jsonProcessor *JsonProcessor) DisConnectedRoute(clientId uint64){
+	jsonProcessor.disconnectHandler(clientId)
 }
 
 func (jsonProcessor *JsonProcessor) RegisterUnknownMsg(unknownMessageHandler UnknownMessageJsonHandler){