server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-28 19:49:27 +08:00
parent 36f6ae00ba
commit 25b3d9f5c1
25 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
server/imserver/groupmgr.cc
View File

@ -25,53 +25,53 @@ void GroupMgr::_SS_MS_LoadGroup(f8::MsgHdr& hdr, const ss::SS_MS_LoadGroup& msg)
void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg) void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg)
{ {
switch (hdr.msgid) { switch (hdr.msgid) {
case cs::CMMessageId_e::_CMGroupCreate: case cs::CMMessageId_e::_CMTeamCreate:
{ {
cs::CMGroupCreate cmmsg; cs::CMTeamCreate cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupCreate(msg.context(), cmmsg); _CMTeamCreate(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupJoin: case cs::CMMessageId_e::_CMTeamJoin:
{ {
cs::CMGroupJoin cmmsg; cs::CMTeamJoin cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupJoin(msg.context(), cmmsg); _CMTeamJoin(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupAgree: case cs::CMMessageId_e::_CMTeamAgree:
{ {
cs::CMGroupAgree cmmsg; cs::CMTeamAgree cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupAgree(msg.context(), cmmsg); _CMTeamAgree(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupKick: case cs::CMMessageId_e::_CMTeamKick:
{ {
cs::CMGroupKick cmmsg; cs::CMTeamKick cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupKick(msg.context(), cmmsg); _CMTeamKick(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupQuit: case cs::CMMessageId_e::_CMTeamQuit:
{ {
cs::CMGroupQuit cmmsg; cs::CMTeamQuit cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupQuit(msg.context(), cmmsg); _CMTeamQuit(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupDismiss: case cs::CMMessageId_e::_CMTeamDismiss:
{ {
cs::CMGroupDismiss cmmsg; cs::CMTeamDismiss cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupDismiss(msg.context(), cmmsg); _CMTeamDismiss(msg.context(), cmmsg);
} }
break; break;
case cs::CMMessageId_e::_CMGroupRename: case cs::CMMessageId_e::_CMTeamRename:
{ {
cs::CMGroupRename cmmsg; cs::CMTeamRename cmmsg;
cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size()); cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
_CMGroupRename(msg.context(), cmmsg); _CMTeamRename(msg.context(), cmmsg);
} }
break; break;
default: default:
@ -81,12 +81,12 @@ void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_Forward
} }
} }
void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGroupCreate& msg) void GroupMgr::_CMTeamCreate(const ss::MFIMMsgConext& context, const cs::CMTeamCreate& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
if (group) { if (group) {
cs::SMGroupCreate respmsg; cs::SMTeamCreate respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("群id已经存在"); respmsg.set_errmsg("群id已经存在");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
@ -95,12 +95,12 @@ void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGrou
#endif #endif
} }
void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJoin& msg) void GroupMgr::_CMTeamJoin(const ss::MFIMMsgConext& context, const cs::CMTeamJoin& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(msg.group_id()); Group* group = GetGroup(msg.group_id());
if (!group) { if (!group) {
cs::SMGroupJoin respmsg; cs::SMTeamJoin respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("群id已经存在"); respmsg.set_errmsg("群id已经存在");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
@ -108,12 +108,12 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ
} }
GroupMember* member = group->GetMember(context.account_id()); GroupMember* member = group->GetMember(context.account_id());
if (member) { if (member) {
cs::SMGroupJoin respmsg; cs::SMTeamJoin respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
if (group->IsFull()) { if (group->IsFull()) {
cs::SMGroupJoin respmsg; cs::SMTeamJoin respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("群已满"); respmsg.set_errmsg("群已满");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
@ -131,7 +131,7 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ
#endif #endif
} }
void GroupMgr::_CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroupAgree& msg) void GroupMgr::_CMTeamAgree(const ss::MFIMMsgConext& context, const cs::CMTeamAgree& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
@ -141,52 +141,52 @@ void GroupMgr::_CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroup
#endif #endif
} }
void GroupMgr::_CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupKick& msg) void GroupMgr::_CMTeamKick(const ss::MFIMMsgConext& context, const cs::CMTeamKick& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
if (!group) { if (!group) {
cs::SMGroupKick respmsg; cs::SMTeamKick respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("群id错误"); respmsg.set_errmsg("群id错误");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
if (!group->GetMember(msg.account_id())) { if (!group->GetMember(msg.account_id())) {
cs::SMGroupKick respmsg; cs::SMTeamKick respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
group->RemoveMember(msg.account_id()); group->RemoveMember(msg.account_id());
cs::SMGroupKick respmsg; cs::SMTeamKick respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
#endif #endif
} }
void GroupMgr::_CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQuit& msg) void GroupMgr::_CMTeamQuit(const ss::MFIMMsgConext& context, const cs::CMTeamQuit& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
if (!group) { if (!group) {
cs::SMGroupQuit respmsg; cs::SMTeamQuit respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("群id错误"); respmsg.set_errmsg("群id错误");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
if (!group->GetMember(context.account_id())) { if (!group->GetMember(context.account_id())) {
cs::SMGroupQuit respmsg; cs::SMTeamQuit respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
group->RemoveMember(context.account_id()); group->RemoveMember(context.account_id());
cs::SMGroupQuit respmsg; cs::SMTeamQuit respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
#endif #endif
} }
void GroupMgr::_CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGroupDismiss& msg) void GroupMgr::_CMTeamDismiss(const ss::MFIMMsgConext& context, const cs::CMTeamDismiss& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
@ -196,12 +196,12 @@ void GroupMgr::_CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGro
#endif #endif
} }
void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGroupRename& msg) void GroupMgr::_CMTeamRename(const ss::MFIMMsgConext& context, const cs::CMTeamRename& msg)
{ {
#if 0 #if 0
Group* group = GetGroup(context.group_id()); Group* group = GetGroup(context.group_id());
if (!group) { if (!group) {
cs::SMGroupRename respmsg; cs::SMTeamRename respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("群id错误"); respmsg.set_errmsg("群id错误");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
@ -209,14 +209,14 @@ void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGrou
} }
GroupMember* member = group->GetMember(context.account_id()); GroupMember* member = group->GetMember(context.account_id());
if (!member) { if (!member) {
cs::SMGroupRename respmsg; cs::SMTeamRename respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("没有权限"); respmsg.set_errmsg("没有权限");
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
return; return;
} }
group->RemoveMember(msg.new_group_name()); group->RemoveMember(msg.new_group_name());
cs::SMGroupRename respmsg; cs::SMTeamRename respmsg;
ForwardGroupSMMsg(context, respmsg); ForwardGroupSMMsg(context, respmsg);
#endif #endif
} }

28
server/imserver/groupmgr.h
View File

@ -2,13 +2,13 @@
namespace cs namespace cs
{ {
class CMGroupCreate; class CMTeamCreate;
class CMGroupJoin; class CMTeamJoin;
class CMGroupAgree; class CMTeamAgree;
class CMGroupKick; class CMTeamKick;
class CMGroupQuit; class CMTeamQuit;
class CMGroupDismiss; class CMTeamDismiss;
class CMGroupRename; class CMTeamRename;
} }
namespace ss namespace ss
@ -44,13 +44,13 @@ class GroupMgr : public a8::Singleton<GroupMgr>
void _SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg); void _SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg);
private: private:
void _CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGroupCreate& msg); void _CMTeamCreate(const ss::MFIMMsgConext& context, const cs::CMTeamCreate& msg);
void _CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJoin& msg); void _CMTeamJoin(const ss::MFIMMsgConext& context, const cs::CMTeamJoin& msg);
void _CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroupAgree& msg); void _CMTeamAgree(const ss::MFIMMsgConext& context, const cs::CMTeamAgree& msg);
void _CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupKick& msg); void _CMTeamKick(const ss::MFIMMsgConext& context, const cs::CMTeamKick& msg);
void _CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQuit& msg); void _CMTeamQuit(const ss::MFIMMsgConext& context, const cs::CMTeamQuit& msg);
void _CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGroupDismiss& msg); void _CMTeamDismiss(const ss::MFIMMsgConext& context, const cs::CMTeamDismiss& msg);
void _CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGroupRename& msg); void _CMTeamRename(const ss::MFIMMsgConext& context, const cs::CMTeamRename& msg);
Group* GetGroup(long long group_id); Group* GetGroup(long long group_id);
void ForwardGroupSMMsg(const ss::MFIMMsgConext& context, void ForwardGroupSMMsg(const ss::MFIMMsgConext& context,

14
server/imserver/handlermgr.cc
View File

@ -92,13 +92,13 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendChatMsg); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendChatMsg);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendCustomMsg); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendCustomMsg);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupCreate); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamCreate);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupJoin); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamJoin);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupAgree); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamAgree);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupKick); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamKick);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupQuit); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamQuit);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupDismiss); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamDismiss);
RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupRename); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamRename);
RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildCMMsg); RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildCMMsg);
RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildSMMsg); RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildSMMsg);

28
server/imserver/player.cc
View File

@ -515,11 +515,11 @@ void Player::_CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg)
} }
} }
void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg) void Player::_CMTeamCreate(f8::MsgHdr& hdr, const cs::CMTeamCreate& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id != 0) { if (myself.base_data.group_id != 0) {
cs::SMGroupCreate respmsg; cs::SMTeamCreate respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有群"); respmsg.set_errmsg("你已经有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -529,11 +529,11 @@ void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
#endif #endif
} }
void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg) void Player::_CMTeamJoin(f8::MsgHdr& hdr, const cs::CMTeamJoin& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id != 0) { if (myself.base_data.group_id != 0) {
cs::SMGroupJoin respmsg; cs::SMTeamJoin respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有群"); respmsg.set_errmsg("你已经有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -543,11 +543,11 @@ void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
#endif #endif
} }
void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg) void Player::_CMTeamAgree(f8::MsgHdr& hdr, const cs::CMTeamAgree& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupAgree respmsg; cs::SMTeamAgree respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -557,11 +557,11 @@ void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
#endif #endif
} }
void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg) void Player::_CMTeamKick(f8::MsgHdr& hdr, const cs::CMTeamKick& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupKick respmsg; cs::SMTeamKick respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -571,11 +571,11 @@ void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
#endif #endif
} }
void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg) void Player::_CMTeamQuit(f8::MsgHdr& hdr, const cs::CMTeamQuit& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupQuit respmsg; cs::SMTeamQuit respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -585,11 +585,11 @@ void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
#endif #endif
} }
void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg) void Player::_CMTeamDismiss(f8::MsgHdr& hdr, const cs::CMTeamDismiss& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupQuit respmsg; cs::SMTeamQuit respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
@ -599,11 +599,11 @@ void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
#endif #endif
} }
void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg) void Player::_CMTeamRename(f8::MsgHdr& hdr, const cs::CMTeamRename& msg)
{ {
#if 0 #if 0
if (myself.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupRename respmsg; cs::SMTeamRename respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);

14
server/imserver/player.h
View File

@ -87,13 +87,13 @@ class Player
void _CMSendChatMsg(f8::MsgHdr& hdr, const cs::CMSendChatMsg& msg); void _CMSendChatMsg(f8::MsgHdr& hdr, const cs::CMSendChatMsg& msg);
void _CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg); void _CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg);
void _CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg); void _CMTeamCreate(f8::MsgHdr& hdr, const cs::CMTeamCreate& msg);
void _CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg); void _CMTeamJoin(f8::MsgHdr& hdr, const cs::CMTeamJoin& msg);
void _CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg); void _CMTeamAgree(f8::MsgHdr& hdr, const cs::CMTeamAgree& msg);
void _CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg); void _CMTeamKick(f8::MsgHdr& hdr, const cs::CMTeamKick& msg);
void _CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg); void _CMTeamQuit(f8::MsgHdr& hdr, const cs::CMTeamQuit& msg);
void _CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg); void _CMTeamDismiss(f8::MsgHdr& hdr, const cs::CMTeamDismiss& msg);
void _CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg); void _CMTeamRename(f8::MsgHdr& hdr, const cs::CMTeamRename& msg);
void _CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg); void _CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg);
void _CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg); void _CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg);

10
server/groupserver/CMakeLists.txt → server/teamserver/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project(friend_groupserver) project(friend_teamserver)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(GAME_ID 9003) set(GAME_ID 9003)
@ -74,7 +74,7 @@ set(EXECUTABLE_OUTPUT_PATH
) )
add_executable( add_executable(
friend_groupserver ${SRC_LIST} friend_teamserver ${SRC_LIST}
) )
add_custom_target(script_pb_protocol ALL) add_custom_target(script_pb_protocol ALL)
@ -82,12 +82,12 @@ add_custom_command(TARGET script_pb_protocol
PRE_BUILD PRE_BUILD
COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=ss_proto,ss_msgid,cs_msgid,cs_proto --python_out=../tools/robot/virtualclient COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=ss_proto,ss_msgid,cs_msgid,cs_proto --python_out=../tools/robot/virtualclient
) )
add_dependencies(friend_groupserver script_pb_protocol) add_dependencies(friend_teamserver script_pb_protocol)
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
target_link_libraries( target_link_libraries(
friend_groupserver friend_teamserver
pthread pthread
mysqlclient mysqlclient
protobuf protobuf
@ -105,7 +105,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
) )
else() else()
target_link_libraries( target_link_libraries(
friend_groupserver friend_teamserver
pthread pthread
mysqlclient mysqlclient
protobuf protobuf

0
server/groupserver/IMListener.cc → server/teamserver/IMListener.cc
View File

0
server/groupserver/IMListener.h → server/teamserver/IMListener.h
View File

0
server/groupserver/app.cc → server/teamserver/app.cc
View File

0
server/groupserver/app.h → server/teamserver/app.h
View File

0
server/groupserver/constant.h → server/teamserver/constant.h
View File

0
server/groupserver/handlermgr.cc → server/teamserver/handlermgr.cc
View File

0
server/groupserver/handlermgr.h → server/teamserver/handlermgr.h
View File

0
server/groupserver/jsondatamgr.cc → server/teamserver/jsondatamgr.cc
View File

0
server/groupserver/jsondatamgr.h → server/teamserver/jsondatamgr.h
View File

0
server/groupserver/main.cc → server/teamserver/main.cc
View File

0
server/groupserver/perfmonitor.cc → server/teamserver/perfmonitor.cc
View File

0
server/groupserver/perfmonitor.h → server/teamserver/perfmonitor.h
View File

0
server/groupserver/precompile.h → server/teamserver/precompile.h
View File

0
server/groupserver/typeconvert.cc → server/teamserver/typeconvert.cc
View File

0
server/groupserver/typeconvert.h → server/teamserver/typeconvert.h
View File

0
server/groupserver/types.cc → server/teamserver/types.cc
View File

0
server/groupserver/types.h → server/teamserver/types.h
View File

33
server/tools/protobuild/cs_msgid.proto
View File

@ -25,14 +25,6 @@ enum CMMessageId_e
_CMUpdateTempCustomData = 153; _CMUpdateTempCustomData = 153;
_CMUpdateUserInfo = 154; _CMUpdateUserInfo = 154;
_CMGroupCreate = 201;
_CMGroupJoin = 202;
_CMGroupAgree = 203;
_CMGroupKick = 204;
_CMGroupQuit = 205;
_CMGroupDismiss = 206;
_CMGroupRename = 207;
_CMGuildMsgBegin = 230; _CMGuildMsgBegin = 230;
_CMGuildCreate = 231; _CMGuildCreate = 231;
_CMGuildJoin = 232; _CMGuildJoin = 232;
@ -50,6 +42,15 @@ enum CMMessageId_e
_CMGuildMemberPromote = 244; _CMGuildMemberPromote = 244;
_CMGuildMemberFire = 245; _CMGuildMemberFire = 245;
_CMGuildMsgEnd = 270; _CMGuildMsgEnd = 270;
_CMTeamCreate = 301;
_CMTeamJoin = 302;
_CMTeamAgree = 303;
_CMTeamKick = 304;
_CMTeamQuit = 305;
_CMTeamDismiss = 306;
_CMTeamRename = 307;
} }
enum SMMessageId_e enum SMMessageId_e
@ -72,14 +73,6 @@ enum SMMessageId_e
_SMQueryUserStatus = 116; _SMQueryUserStatus = 116;
_SMRecommandFriend = 117; _SMRecommandFriend = 117;
_SMGroupCreate = 201;
_SMGroupJoin = 202;
_SMGroupAgree = 203;
_SMGroupKick = 204;
_SMGroupQuit = 205;
_SMGroupDismiss = 206;
_SMGroupRename = 207;
_SMGuildMsgBegin = 230; _SMGuildMsgBegin = 230;
_SMGuildCreate = 231; _SMGuildCreate = 231;
_SMGuildJoin = 232; _SMGuildJoin = 232;
@ -98,6 +91,14 @@ enum SMMessageId_e
_SMGuildMemberFire = 245; _SMGuildMemberFire = 245;
_SMGuildMsgEnd = 270; _SMGuildMsgEnd = 270;
_SMTeamCreate = 301;
_SMTeamJoin = 302;
_SMTeamAgree = 303;
_SMTeamKick = 304;
_SMTeamQuit = 305;
_SMTeamDismiss = 306;
_SMTeamRename = 307;
_SMUserStatusNotify = 501; _SMUserStatusNotify = 501;
_SMUserInfoUpdate = 502; _SMUserInfoUpdate = 502;
_SMCustomMsgNotify = 503; _SMCustomMsgNotify = 503;

28
server/tools/protobuild/cs_proto.proto
View File

@ -273,78 +273,78 @@ message SMFriendDeleteBlack
} }
//建群 //建群
message CMGroupCreate message CMTeamCreate
{ {
optional string group_name = 1; //群名称 optional string group_name = 1; //群名称
} }
//建群返回 //建群返回
message SMGroupCreate message SMTeamCreate
{ {
optional int32 errcode = 1; //1:群已存在 2: 你已经有群 optional int32 errcode = 1; //1:群已存在 2: 你已经有群
optional string errmsg = 2; //错误消息 optional string errmsg = 2; //错误消息
} }
//加群 //加群
message CMGroupJoin message CMTeamJoin
{ {
optional int64 group_id = 1; //群id optional int64 group_id = 1; //群id
} }
//加群返回 //加群返回
message SMGroupJoin message SMTeamJoin
{ {
optional int32 errcode = 1; //1:群id不存在 2:群已满 optional int32 errcode = 1; //1:群id不存在 2:群已满
optional string errmsg = 2; //错误消息 optional string errmsg = 2; //错误消息
} }
//同意加群 //同意加群
message CMGroupAgree message CMTeamAgree
{ {
} }
message SMGroupAgree message SMTeamAgree
{ {
optional int32 errcode = 1; optional int32 errcode = 1;
optional string errmsg = 2; optional string errmsg = 2;
} }
//踢人 //踢人
message CMGroupKick message CMTeamKick
{ {
optional string account_id = 1; optional string account_id = 1;
} }
//踢人回复 //踢人回复
message SMGroupKick message SMTeamKick
{ {
optional int32 errcode = 1; //1:群id错误 optional int32 errcode = 1; //1:群id错误
optional string errmsg = 2; //错误消息 optional string errmsg = 2; //错误消息
} }
//退群 //退群
message CMGroupQuit message CMTeamQuit
{ {
} }
message SMGroupQuit message SMTeamQuit
{ {
optional int32 errcode = 1; //错误码 optional int32 errcode = 1; //错误码
optional string errmsg = 2; //错误消息 optional string errmsg = 2; //错误消息
} }
//解散群 //解散群
message CMGroupDismiss message CMTeamDismiss
{ {
} }
message SMGroupDismiss message SMTeamDismiss
{ {
optional int32 errcode = 1; //错误码 optional int32 errcode = 1; //错误码
optional string errmsg = 2; //错误信息 optional string errmsg = 2; //错误信息
} }
//群改名 //群改名
message CMGroupRename message CMTeamRename
{ {
optional string new_group_name = 1; //新群名 optional string new_group_name = 1; //新群名
} }
message SMGroupRename message SMTeamRename
{ {
optional int32 errcode = 1; //错误码 optional int32 errcode = 1; //错误码
optional string errmsg = 2; //错误信息 optional string errmsg = 2; //错误信息