1

server/imserver/player.cc

@@ -154,9 +154,9 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
             (
              conn_info,
              "INSERT INTO `friend_apply`(applyid, target_id, sender_id, sender_nickname, "
-             "   sender_avatar_url, sender_sex, sender_group_id, sender_data_version1, "
+             "   sender_avatar_url, sender_sex, sender_data_version1, "
              "   createtime, sender_user_value1, sender_user_value2, sender_user_value3, stauts)"
-             "VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0);",
+             "VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, 0);",
              {
               App::Instance()->NewUUID(),
               msg.friend_id(),
@@ -164,7 +164,6 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
               myself.base_data.nickname,
               myself.base_data.avatar_url,
               myself.base_data.sex,
-              myself.base_data.group_id,
               myself.base_data.base_data_version,
               myself.base_data.user_value1,
               myself.base_data.user_value2,
@@ -406,6 +405,7 @@ void Player::_CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg)
 
 void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
 {
+    #if 0
     if (myself.base_data.group_id != 0) {
         cs::SMGroupCreate respmsg;
         respmsg.set_errcode(1);
@@ -414,10 +414,12 @@ void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, App::Instance()->NewUUID());
+    #endif
 }
 
 void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
 {
+    #if 0
     if (myself.base_data.group_id != 0) {
         cs::SMGroupJoin respmsg;
         respmsg.set_errcode(1);
@@ -426,10 +428,12 @@ void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
 {
+    #if 0
     if (myself.base_data.group_id == 0) {
         cs::SMGroupAgree respmsg;
         respmsg.set_errcode(2);
@@ -438,10 +442,12 @@ void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
 {
+    #if 0
     if (myself.base_data.group_id == 0) {
         cs::SMGroupKick respmsg;
         respmsg.set_errcode(2);
@@ -450,10 +456,12 @@ void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
 {
+    #if 0
     if (myself.base_data.group_id == 0) {
         cs::SMGroupQuit respmsg;
         respmsg.set_errcode(2);
@@ -462,10 +470,12 @@ void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
 {
+    #if 0
     if (myself.base_data.group_id == 0) {
         cs::SMGroupQuit respmsg;
         respmsg.set_errcode(2);
@@ -474,10 +484,12 @@ void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg)
 {
+    #if 0
     if (myself.base_data.group_id == 0) {
         cs::SMGroupRename respmsg;
         respmsg.set_errcode(2);
@@ -486,6 +498,7 @@ void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg)
         return;
     }
     ForwardGroupCMMsg(hdr, myself.base_data.group_id);
+    #endif
 }
 
 void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg)
@@ -588,7 +601,7 @@ void Player::SaveToDB()
         ExecAsyncScript(
                         conn_info,
                         "UPDATE `user` SET friend_data='%s', modifytime=%d,  "
-                        "  nickname='%s', avatar_url='%s', sex=%d, group_id=%d, data_version1=%d "
+                        "  nickname='%s', avatar_url='%s', sex=%d, data_version1=%d "
                         "WHERE account_id='%s';",
                         {
                          friend_data,
@@ -596,7 +609,6 @@ void Player::SaveToDB()
                          myself.base_data.nickname,
                          myself.base_data.avatar_url,
                          myself.base_data.sex,
-                         myself.base_data.group_id,
                          myself.base_data.base_data_version,
                          myself.base_data.account_id
                         },

server/imserver/playermgr.cc

@@ -284,8 +284,7 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg)
                                                       a8::XValue(data_set->at(0).at(6)),
                                                       a8::XValue(data_set->at(0).at(5)),
                                                       a8::XValue(data_set->at(0).at(7)),
-                                                      a8::XValue(data_set->at(0).at(8)),
+                                                      a8::XValue(data_set->at(0).at(8))
-                                                      a8::XValue(data_set->at(0).at(9))
                                                       );
             }
             delete msg;
@@ -307,7 +306,7 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg)
     a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(msg.account_id());
     DBEngine::Instance()->ExecAsyncQuery
         (conn_info,
-         "SELECT account_id, nickname, avatar_url, sex, group_id, "
+         "SELECT account_id, nickname, avatar_url, sex, "
          " data_version1, friend_data, user_value1, user_value2, user_value3 "
          "FROM `user` WHERE account_id='%s';",
          {
@@ -326,7 +325,6 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
                                const std::string& nickname,
                                const std::string& avatar_url,
                                int sex,
-                               long long group_id,
                                const std::string& friend_data,
                                int data_version1,
                                long long user_value1,
@@ -350,11 +348,11 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
             hum->myself.base_data.nickname = nickname;
             hum->myself.base_data.avatar_url = avatar_url;
             hum->myself.base_data.sex = sex;
-            hum->myself.base_data.group_id = group_id;
             hum->myself.base_data.base_data_version = data_version1;
             hum->myself.base_data.user_value1 = user_value1;
             hum->myself.base_data.user_value2 = user_value2;
             hum->myself.base_data.user_value3 = user_value3;
+            hum->myself.base_data.online = true;
             hum->Init();
             {
                 ss::MFUserDB user_db;

server/imserver/playermgr.h

@@ -56,7 +56,6 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
                         const std::string& nickname,
                         const std::string& avatar_url,
                         int sex,
-                        long long group_id,
                         const std::string& friend_data,
                         int data_version1,
                         long long user_value1,

server/imserver/types.h

@@ -7,7 +7,9 @@ struct BaseUserData
     std::string avatar_url;
     int sex = 0;
     int online = 0;
-    long long group_id = 0;
+    std::vector<long long> group_ids;
+    long long guild_id = 0;
+    int last_login_time = 0;
 
     long long user_value1 = 0;
     long long user_value2 = 0;