From 5c1eda4095ea70de1b54ae2f4aa5512a928e778e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 18 Jun 2020 10:48:05 +0800 Subject: [PATCH] 1 --- server/imserver/player.cc | 10 +++++----- server/tools/robot/virtualclient/virtualclient.py | 2 +- sql/relationdb_n.sql | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 3bac829..92a10ff 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -155,8 +155,8 @@ 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_data_version1, " - " createtime, sender_user_value1, sender_user_value2, sender_user_value3, stauts)" - "VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, 0);", + " createtime, sender_user_value1, sender_user_value2, sender_user_value3, status)" + "VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, 0);", { App::Instance()->NewUUID(), msg.friend_id(), @@ -242,9 +242,9 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms ( conn_info, "SELECT idx, applyid, target_id, sender_id, sender_nickname, " - " sender_avatar_url, sender_sex, sender_group_id, sender_data_version1, " - " sender_user_value1, sender_user_value2, sender_user_value3, status" - "FROM friend_apply WHERE idx > %d AND target_id='%s' AND stauts=0;", + " sender_avatar_url, sender_sex, sender_data_version1, " + " sender_user_value1, sender_user_value2, sender_user_value3, status " + "FROM friend_apply WHERE idx > %d AND target_id='%s' AND status=0;", { last_apply_idx_, myself.base_data.account_id diff --git a/server/tools/robot/virtualclient/virtualclient.py b/server/tools/robot/virtualclient/virtualclient.py index 3ad17ca..87cd153 100644 --- a/server/tools/robot/virtualclient/virtualclient.py +++ b/server/tools/robot/virtualclient/virtualclient.py @@ -73,7 +73,7 @@ class VirtualClient(object): def sendFriendApply(self, conn): msg = cs_proto_pb2.CMFriendApply() - msg.friend_id = 'test0' + msg.friend_id = 'test01' msg.msg = 'hello' self.sendMsg(conn, msg) diff --git a/sql/relationdb_n.sql b/sql/relationdb_n.sql index e5412f4..00e7937 100644 --- a/sql/relationdb_n.sql +++ b/sql/relationdb_n.sql @@ -42,7 +42,6 @@ CREATE TABLE `user` ( `nickname` tinyblob COMMENT 'nickname', `avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', `sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex', - `group_id` bigint NOT NULL COMMENT 'group_id', `friend_data` mediumblob COMMENT '好友数据', `data_version1` bigint NOT NULL DEFAULT '0' COMMENT 'data_version1', `user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1', @@ -94,8 +93,11 @@ CREATE TABLE `friend_apply` ( `sender_nickname` tinyblob COMMENT 'nickname', `sender_avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', `sender_sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex', - `sender_group_id` bigint NOT NULL COMMENT 'group_id', `sender_data_version1` int(11) NOT NULL DEFAULT '0' COMMENT 'data_version1', + `sender_user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1', + `sender_user_value2` bigint NOT NULL DEFAULT '0' COMMENT 'user_value2', + `sender_user_value3` bigint NOT NULL DEFAULT '0' COMMENT 'user_value3', + `status` int(11) NOT NULL DEFAULT '0' COMMENT '0:未处理 1:同意 2：拒绝 3：忽略', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`idx`), UNIQUE KEY `applyid` (`applyid`),