From d4ab89adfbefd6bd4b01495b3c133df15ced626f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 12 Dec 2019 17:04:21 +0800
Subject: [PATCH] 1

---
 server/wsproxy/gameclientmgr.cc | 4 ++--
 server/wsproxy/mastersvrmgr.cc  | 2 +-
 server/wsproxy/types.h          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/wsproxy/gameclientmgr.cc b/server/wsproxy/gameclientmgr.cc
index f6bf793..2b54a09 100644
--- a/server/wsproxy/gameclientmgr.cc
+++ b/server/wsproxy/gameclientmgr.cc
@@ -108,13 +108,13 @@ void GameClientMgr::AddPendingAccount(const std::string& account_id, int socket_
                                                                              [] (const a8::XParams& param)
                                                                              {
                                                                                  GameClientMgr::Instance()->pending_account_hash_.erase(param.sender);
-                                                                                 App::Instance()->perf.max_join_time = std::max(1000 * 10, App::Instance()->perf.max_join_time);
+                                                                                 App::Instance()->perf.max_join_time = std::max((long long)1000 * 10, App::Instance()->perf.max_join_time);
                                                                              },
                                                                              &timer_attacher_.timer_list_
                                                                              );
         pending_account_hash_[socket_handle] = std::make_tuple(
                                                                account_id,
-                                                               socket_handle,
+                                                               req_tick,
                                                                timer
                                                                );
     }
diff --git a/server/wsproxy/mastersvrmgr.cc b/server/wsproxy/mastersvrmgr.cc
index 5b5d5d4..7eb5521 100644
--- a/server/wsproxy/mastersvrmgr.cc
+++ b/server/wsproxy/mastersvrmgr.cc
@@ -136,7 +136,7 @@ void MasterSvrMgr::RequestTargetServer(f8::MsgHdr& hdr, const std::string& team_
                 if (req_handle_time > App::Instance()->perf.max_login_time) {
                     App::Instance()->perf.max_login_time = req_handle_time;
                 }
-                GameClientMgr::Instance()->AddPendingAccount(param.param2, param.param1, param.param3);
+                GameClientMgr::Instance()->AddPendingAccount(param.param2.GetString(), param.param1, param.param3);
             };
         a8::Timer::Instance()->AddDeadLineTimerAndAttach(1000 * 10,
                                                          a8::XParams()
diff --git a/server/wsproxy/types.h b/server/wsproxy/types.h
index f4e1303..a6061ab 100644
--- a/server/wsproxy/types.h
+++ b/server/wsproxy/types.h
@@ -5,8 +5,8 @@ struct PerfMonitor
     int max_run_delay_time = 0;
     int max_dispatchmsg_time = 0;
     int max_timer_idle = 0;
-    int max_login_time = 0;
-    int max_join_time = 0;
+    long long max_login_time = 0;
+    long long max_join_time = 0;
     long long out_data_size = 0;
     long long in_data_size = 0;
     long long read_count = 0;