1

server/imserver/dbengine.cc

@@ -3,6 +3,7 @@
 #include <a8/openssl.h>
 
 #include "dbengine.h"
+#include "jsondatamgr.h"
 
 void DBEngine::Init()
 {
@@ -60,7 +61,11 @@ a8::XObject DBEngine::GetConnInfo(const std::string& data)
 
 a8::XObject DBEngine::GetConnInfo(long long data)
 {
-    a8::XObject conn_info;
+    std::shared_ptr<a8::XObject> mysql_cluster_conf = JsonDataMgr::Instance()->GetMysqlClusterConf();
+    if (mysql_cluster_conf->Size() <= 0) {
+        abort();
+    }
+    a8::XObject conn_info = *(mysql_cluster_conf->At(data % mysql_cluster_conf->Size()));
     return conn_info;
 }
 

server/imserver/jsondatamgr.cc

@@ -40,6 +40,7 @@ void JsonDataMgr::Init()
                                                 {
                                                  work_path_,
                                                 });
+    mysql_cluster_json_.ReadFromFile(mysql_cluster_json_file);
     imserver_cluster_json_.ReadFromFile(imserver_cluster_json_file);
     masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file);
 }
@@ -61,3 +62,8 @@ std::shared_ptr<a8::XObject> JsonDataMgr::GetMasterServerClusterConf()
 {
     return std::make_shared<a8::XObject>(masterserver_cluster_json_);
 }
+
+std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf()
+{
+    return std::make_shared<a8::XObject>(mysql_cluster_json_);
+}

server/imserver/jsondatamgr.h

@@ -12,6 +12,7 @@ class JsonDataMgr : public a8::Singleton<JsonDataMgr>
 
     std::shared_ptr<a8::XObject> GetConf();
     std::shared_ptr<a8::XObject> GetMasterServerClusterConf();
+    std::shared_ptr<a8::XObject> GetMysqlClusterConf();
 
  private:
     std::string work_path_ = "../config";

server/imserver/playermgr.cc

@@ -366,6 +366,12 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
         }
         pending_socket_hash_.erase(hdr->socket_handle);
         pending_account_hash_.erase(account_id);
+        {
+            cs::SMLogin respmsg;
+            respmsg.set_errcode(0);
+            respmsg.set_errmsg("ok");
+            hum->SendMsg(respmsg);
+        }
         f8::MsgHdr::Destroy(hdr);
     }
 }

server/masterserver/svrmgr.cc

@@ -17,7 +17,9 @@ void SvrMgr::Init()
          a8::XParams(),
          [] (const a8::XParams& param)
          {
+             #ifndef DEBUG
              SvrMgr::Instance()->ClearTimeOutNode();
+             #endif
          });
 }