diff --git a/server/imserver/groupmgr.cc b/server/imserver/groupmgr.cc index 63a6b57..334ff3c 100644 --- a/server/imserver/groupmgr.cc +++ b/server/imserver/groupmgr.cc @@ -15,6 +15,11 @@ void GroupMgr::UnInit() } +void GroupMgr::_SS_MS_LoadGroup(f8::MsgHdr& hdr, const ss::SS_MS_LoadGroup& msg) +{ + +} + void GroupMgr::_SS_MS_ForwardGroupMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupMsg& msg) { switch (hdr.msgid) { diff --git a/server/imserver/groupmgr.h b/server/imserver/groupmgr.h index 5a29f3a..ba939ac 100644 --- a/server/imserver/groupmgr.h +++ b/server/imserver/groupmgr.h @@ -14,6 +14,7 @@ namespace cs namespace ss { class MFIMMsgConext; + class SS_MS_LoadGroup; class SS_MS_ForwardGroupMsg; } @@ -31,6 +32,7 @@ class GroupMgr : public a8::Singleton void Init(); void UnInit(); + void _SS_MS_LoadGroup(f8::MsgHdr& hdr, const ss::SS_MS_LoadGroup& msg); void _SS_MS_ForwardGroupMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupMsg& msg); private: diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index 6febd18..a341e1e 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -37,6 +37,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&immsghandler, &IMListener::_SS_Ping); RegisterNetMsgHandler(&mscmsghandler, &PlayerMgr::_SS_MS_PushUserList); + RegisterNetMsgHandler(&mscmsghandler, &GroupMgr::_SS_MS_LoadGroup); RegisterNetMsgHandler(&mscmsghandler, &GroupMgr::_SS_MS_ForwardGroupMsg); RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_SendChatMsg); diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index fa347f0..8e972a3 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -81,6 +81,11 @@ message SS_MS_ForwardGroupMsg optional bytes payload = 2; } +message SS_MS_LoadGroup +{ + optional int64 group_id = 1; +} + message SS_IM_UserOnline { optional string account_id = 1; diff --git a/sql/relationdb_n.sql b/sql/relationdb_n.sql index 8e5bbdb..fd9dc24 100644 --- a/sql/relationdb_n.sql +++ b/sql/relationdb_n.sql @@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `version`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `version` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `version` int(11) NOT NULL DEFAULT '0' COMMENT '版本号', PRIMARY KEY (`idx`), UNIQUE KEY `version` (`version`) @@ -37,7 +37,7 @@ DROP TABLE IF EXISTS `user`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', `nickname` tinyblob COMMENT 'nickname', `avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', @@ -49,22 +49,23 @@ CREATE TABLE `user` ( `registertime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `last_logintime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`idx`), - UNIQUE KEY `account_id` (`account_id`), - KEY `nickname` (`nickname`), + UNIQUE KEY `account_id` (`account_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; --- Table structure for table `group_info` +-- Table structure for table `group` -- -DROP TABLE IF EXISTS `group_info`; +DROP TABLE IF EXISTS `group`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `group_info` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', +CREATE TABLE `group` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `group_id` bigint NOT NULL COMMENT 'group_id', - `owner_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `owner_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '群主', + `creator_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '群创建者', + `group_data` mediumblob COMMENT '群数据', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), @@ -74,44 +75,20 @@ CREATE TABLE `group_info` ( /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; --- Table structure for table `group_member` +-- Table structure for table `friend` -- -DROP TABLE IF EXISTS `group_member`; +DROP TABLE IF EXISTS `friend`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `group_member` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', - `group_id` bigint NOT NULL COMMENT 'group_id', - `member_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'member_id', +CREATE TABLE `friend` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `friend_data` mediumblob COMMENT '群数据', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), - KEY `group_id` (`group_id`), - KEY `member_id` (`member_id`) -) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - --- Table structure for table `friend_relationship` --- - -DROP TABLE IF EXISTS `friend_relationship`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `friend_relationship` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', - `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', - `friend_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', - `friend_nickname` tinyblob COMMENT 'nickname', - `friend_avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', - `friend_sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex', - `friend_data_version1` int(11) NOT NULL DEFAULT '0' COMMENT 'data_version1', - `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', - PRIMARY KEY (`idx`), - UNIQUE KEY `account_id_friend_id` (`account_id`, `friend_id`), - KEY `account_id` (`account_id`), - KEY `friend_id` (`friend_id`) + KEY `account_id` (`account_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -123,7 +100,7 @@ DROP TABLE IF EXISTS `friend_apply`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `friend_apply` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `applyid` bigint NOT NULL COMMENT 'applyid', `target_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'target', `sender_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'sender',