From fde05078e6e771cf696b069807e4f07ec606daa5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 Nov 2023 13:08:18 +0800 Subject: [PATCH] 1 --- server/gameserver/app.cc | 4 ++-- server/gameserver/app.h | 4 +--- server/gameserver/httpproxy.cc | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index 1eb83435..82bfa3db 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -251,9 +251,9 @@ void App::UnInit() msg_mutex_ = nullptr; } +#if 0 int App::Run() { - #if 0 int ret = 0; f8::UdpLog::Instance()->Info("gameserver running", {}); last_run_tick_ = a8::XGetTickCount(); @@ -271,8 +271,8 @@ int App::Run() delta_time = end_tick - begin_tick; } return ret; - #endif } +#endif void App::AddSocketMsg(SocketFrom_e sockfrom, int sockhandle, diff --git a/server/gameserver/app.h b/server/gameserver/app.h index e3a1c29f..bbabdd0c 100644 --- a/server/gameserver/app.h +++ b/server/gameserver/app.h @@ -19,10 +19,9 @@ public: virtual void Init() override; virtual void UnInit() override; virtual void Update() override; + virtual bool HasTask() override; virtual void DispatchSocketMsg(f8::MsgHdr* hdr) override; - int Run(); - void AddSocketMsg(SocketFrom_e sockfrom, int sockhandle, long ip_saddr, @@ -40,7 +39,6 @@ public: private: void QuickExecute(int delta_time); void SlowerExecute(int delta_time); - bool HasTask(); void DispatchMsg(); diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc index 09595716..463193b7 100644 --- a/server/gameserver/httpproxy.cc +++ b/server/gameserver/httpproxy.cc @@ -128,7 +128,7 @@ std::string HttpProxy::HttpGet( std::string HttpProxy::CreateRequestId() { - return request_prefix_ + a8::XValue(f8::App::Instance()->NewNodeUuid()).GetString(); + return request_prefix_ + f8::App::Instance()->NewGlobalUuid(); } std::shared_ptr HttpProxy::GetRequest(const std::string& req_id)