From 14d9884bbaf6bd397ff88381329bd2a878327ae8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 21 Mar 2024 17:09:34 +0800
Subject: [PATCH] 1

---
 server/imserver_new/common/types.go         |  1 -
 server/imserver_new/cs/cs.auto_gen.go       |  8 +++++++-
 server/imserver_new/listener/wsplistener.go |  5 -----
 server/imserver_new/player/playermgr.go     | 21 ++++++++++++---------
 server/matchserver/player/playermgr.go      |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index 971bf6d4..0cf12718 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -33,7 +33,6 @@ type LoginRsp struct {
 type WspListener interface {
 	ProcessSSMMsg(*ss.SsNetMsgHandler, *f5.MsgHdr)
 	SendProxyMsg(net.Conn, uint16, proto.Message)
-	SendProxyErrMsg(net.Conn, uint16, proto.Message, int32, string)
 }
 
 type App interface {
diff --git a/server/imserver_new/cs/cs.auto_gen.go b/server/imserver_new/cs/cs.auto_gen.go
index a14e4366..41b19634 100644
--- a/server/imserver_new/cs/cs.auto_gen.go
+++ b/server/imserver_new/cs/cs.auto_gen.go
@@ -10,6 +10,12 @@ type CsNetMsgHandler f5.NetMsgHandler[MsgHandler];
 type MsgHandlerImpl struct {
 }
 
+func (this *SMLogin) Err(errCode int32, errMsg string) *SMLogin {
+	this.Errcode = proto.Int32(errCode)
+	this.Errmsg = proto.String(errMsg)
+	return nil
+}
+
 var handlers [2000]*CsNetMsgHandler
 
 func GetNetMsgHandler(msgId uint16) *CsNetMsgHandler {
@@ -979,4 +985,4 @@ func init() {
                 },
         }
 
-}
\ No newline at end of file
+}
diff --git a/server/imserver_new/listener/wsplistener.go b/server/imserver_new/listener/wsplistener.go
index 0b16847b..e7cba2c5 100644
--- a/server/imserver_new/listener/wsplistener.go
+++ b/server/imserver_new/listener/wsplistener.go
@@ -180,8 +180,3 @@ func (this *WSPListener) SendProxyMsg(conn net.Conn, socketHandle uint16, msg pr
 	copy(buff[f5.WSPROXYPACKHEAD_S_SIZE:], msgData[:])
 	conn.Write(buff)
 }
-
-func (this *WSPListener) SendProxyErrMsg(conn net.Conn, socketHandle, uint16, msg proto.Message,
-	errCode int32, errMsg string) {
-
-}
diff --git a/server/imserver_new/player/playermgr.go b/server/imserver_new/player/playermgr.go
index 0aacc0e2..f6744d8a 100644
--- a/server/imserver_new/player/playermgr.go
+++ b/server/imserver_new/player/playermgr.go
@@ -137,22 +137,25 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, reqId int64,
 
 	rspMsg := cs.SMLogin{}
 	if rsp.GetErr() != nil {
-		GetWspListener().SendProxyErrMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle, &rspMsg,
-			2,
-			"server internal error")
+		GetWspListener().SendProxyMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle,
+			rspMsg.Err(
+				2,
+				"server internal error"))
 		f5.GetSysLog().Info("Api服务器JSON 解析错误1\n")
 		return
 	}
 	if !rsp.JsonParseOk() {
-		GetWspListener().SendProxyErrMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle, &rspMsg,
-			2,
-			"server internal error")
+		GetWspListener().SendProxyMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle,
+			rspMsg.Err(
+				2,
+				"server internal error"))
 		return
 	}
 	if rspObj.Errcode != 0 {
-		GetWspListener().SendProxyErrMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle, &rspMsg,
-			1,
-			"invalid session_id")
+		GetWspListener().SendProxyMsg(pendingReq.hdr.Conn, pendingReq.hdr.SocketHandle,
+			rspMsg.Err(
+				2,
+				"invalid session_id"))
 		f5.GetSysLog().Error("Api服务器errcode:%d", rspObj.Errcode)
 		return
 	}
diff --git a/server/matchserver/player/playermgr.go b/server/matchserver/player/playermgr.go
index d3fe648c..a67f8af8 100644
--- a/server/matchserver/player/playermgr.go
+++ b/server/matchserver/player/playermgr.go
@@ -24,9 +24,9 @@ type pendingLoginRequest struct {
 
 type playerMgr struct {
 	cs.MsgHandlerImpl
-	socketHash       map[f5.WspCliConn]*player
+	socketHash map[f5.WspCliConn]*player
 	pendingLoginHash map[string]*pendingLoginRequest
-	currReqId        int64
+	currReqId int64
 }
 
 func (this *playerMgr) Init() {