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-06-18 10:48:05 +08:00
parent 77fe6df9c0
commit 5c1eda4095
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/imserver/player.cc
View File

@ -155,8 +155,8 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
conn_info, conn_info,
"INSERT INTO `friend_apply`(applyid, target_id, sender_id, sender_nickname, " "INSERT INTO `friend_apply`(applyid, target_id, sender_id, sender_nickname, "
" sender_avatar_url, sender_sex, sender_data_version1, " " sender_avatar_url, sender_sex, sender_data_version1, "
" createtime, sender_user_value1, sender_user_value2, sender_user_value3, stauts)" " createtime, sender_user_value1, sender_user_value2, sender_user_value3, status)"
"VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, 0);", "VALUES(%d, '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, 0);",
{ {
App::Instance()->NewUUID(), App::Instance()->NewUUID(),
msg.friend_id(), msg.friend_id(),
@ -242,9 +242,9 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
( (
conn_info, conn_info,
"SELECT idx, applyid, target_id, sender_id, sender_nickname, " "SELECT idx, 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, "
" sender_user_value1, sender_user_value2, sender_user_value3, status " " sender_user_value1, sender_user_value2, sender_user_value3, status "
"FROM friend_apply WHERE idx > %d AND target_id='%s' AND stauts=0;", "FROM friend_apply WHERE idx > %d AND target_id='%s' AND status=0;",
{ {
last_apply_idx_, last_apply_idx_,
myself.base_data.account_id myself.base_data.account_id

2
server/tools/robot/virtualclient/virtualclient.py
View File

@ -73,7 +73,7 @@ class VirtualClient(object):
def sendFriendApply(self, conn): def sendFriendApply(self, conn):
msg = cs_proto_pb2.CMFriendApply() msg = cs_proto_pb2.CMFriendApply()
msg.friend_id = 'test0' msg.friend_id = 'test01'
msg.msg = 'hello' msg.msg = 'hello'
self.sendMsg(conn, msg) self.sendMsg(conn, msg)

6
sql/relationdb_n.sql
View File

@ -42,7 +42,6 @@ CREATE TABLE `user` (
`nickname` tinyblob COMMENT 'nickname', `nickname` tinyblob COMMENT 'nickname',
`avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', `avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '',
`sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex', `sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex',
`group_id` bigint NOT NULL COMMENT 'group_id',
`friend_data` mediumblob COMMENT '好友数据', `friend_data` mediumblob COMMENT '好友数据',
`data_version1` bigint NOT NULL DEFAULT '0' COMMENT 'data_version1', `data_version1` bigint NOT NULL DEFAULT '0' COMMENT 'data_version1',
`user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1', `user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1',
@ -94,8 +93,11 @@ CREATE TABLE `friend_apply` (
`sender_nickname` tinyblob COMMENT 'nickname', `sender_nickname` tinyblob COMMENT 'nickname',
`sender_avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '', `sender_avatar_url` varchar(256) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '',
`sender_sex` int(11) NOT NULL DEFAULT '0' COMMENT 'sex', `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_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 '创建时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
PRIMARY KEY (`idx`), PRIMARY KEY (`idx`),
UNIQUE KEY `applyid` (`applyid`), UNIQUE KEY `applyid` (`applyid`),