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

添加guild_id字段

Browse Source
This commit is contained in:
aozhiwei 2020-09-15 09:30:44 +08:00
parent 662cdec589
commit 87151853cd
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/imserver/player.cc
View File

@ -853,7 +853,7 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO
conn_info, conn_info,
"UPDATE `user` SET friend_data='%s', modifytime=%d, " "UPDATE `user` SET friend_data='%s', modifytime=%d, "
" nickname='%s', avatar_url='%s', sex=%d, data_version1=%d, " " nickname='%s', avatar_url='%s', sex=%d, data_version1=%d, "
" user_value1=%d, user_value2=%d, user_value3=%d, last_logintime=%d " " user_value1=%d, user_value2=%d, user_value3=%d, guild_id=%d, last_logintime=%d "
"WHERE account_id='%s';", "WHERE account_id='%s';",
{ {
friend_data, friend_data,
@ -865,6 +865,7 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO
myself.base_data.user_value1, myself.base_data.user_value1,
myself.base_data.user_value2, myself.base_data.user_value2,
myself.base_data.user_value3, myself.base_data.user_value3,
myself.base_data.guild_id,
App::Instance()->nowtime, App::Instance()->nowtime,
myself.base_data.account_id myself.base_data.account_id
}, },

9
server/imserver/playermgr.cc
View File

@ -448,7 +448,8 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg)
data_set->at(0).at(5), //friend_data data_set->at(0).at(5), //friend_data
a8::XValue(data_set->at(0).at(6)), //user_value1 a8::XValue(data_set->at(0).at(6)), //user_value1
a8::XValue(data_set->at(0).at(7)), //user_value2 a8::XValue(data_set->at(0).at(7)), //user_value2
a8::XValue(data_set->at(0).at(8)) //user_value3 a8::XValue(data_set->at(0).at(8)), //user_value3
a8::XValue(data_set->at(0).at(9)) //guild_id
); );
} }
delete msg; delete msg;
@ -471,7 +472,7 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg)
DBEngine::Instance()->ExecAsyncQuery DBEngine::Instance()->ExecAsyncQuery
(conn_info, (conn_info,
"SELECT account_id, nickname, avatar_url, sex, " "SELECT account_id, nickname, avatar_url, sex, "
" data_version1, friend_data, user_value1, user_value2, user_value3 " " data_version1, friend_data, user_value1, user_value2, user_value3, guild_id "
"FROM `user` WHERE account_id='%s';", "FROM `user` WHERE account_id='%s';",
{ {
msg.account_id(), msg.account_id(),
@ -494,7 +495,8 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
const std::string& friend_data, const std::string& friend_data,
long long user_value1, long long user_value1,
long long user_value2, long long user_value2,
long long user_value3) long long user_value3,
long long guild_id)
{ {
f8::MsgHdr* hdr = GetHdrByAccountId(account_id); f8::MsgHdr* hdr = GetHdrByAccountId(account_id);
if (hdr) { if (hdr) {
@ -526,6 +528,7 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
hum->myself.base_data.user_value1 = user_value1; hum->myself.base_data.user_value1 = user_value1;
hum->myself.base_data.user_value2 = user_value2; hum->myself.base_data.user_value2 = user_value2;
hum->myself.base_data.user_value3 = user_value3; hum->myself.base_data.user_value3 = user_value3;
hum->myself.base_data.guild_id = guild_id;
hum->myself.base_data.online = true; hum->myself.base_data.online = true;
hum->myself.base_data.last_login_time = App::Instance()->nowtime; hum->myself.base_data.last_login_time = App::Instance()->nowtime;
hum->role_data.session_id = session_id; hum->role_data.session_id = session_id;

3
server/imserver/playermgr.h
View File

@ -83,7 +83,8 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
const std::string& friend_data, const std::string& friend_data,
long long user_value1, long long user_value1,
long long user_value2, long long user_value2,
long long user_value3); long long user_value3,
long long guild_id);
void AsyncLoginOnError(const std::string& account_id, void AsyncLoginOnError(const std::string& account_id,
int step, int step,
int error_code, int error_code,

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

@ -31,6 +31,7 @@ message MFBaseUserData
optional string avatar_url = 3; //头像 optional string avatar_url = 3; //头像
optional int32 sex = 4; //性别 1：男 2：女 0：未知 optional int32 sex = 4; //性别 1：男 2：女 0：未知
optional int32 last_login_time = 5; //最后登录时间 optional int32 last_login_time = 5; //最后登录时间
optional int64 guild_id = 6; //工会id
optional int64 user_value1 = 50; //用户字段1 optional int64 user_value1 = 50; //用户字段1
optional int64 user_value2 = 51; //用户字段2 optional int64 user_value2 = 51; //用户字段2

1
sql/relationdb_n.sql
View File

@ -47,6 +47,7 @@ CREATE TABLE `user` (
`user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1', `user_value1` bigint NOT NULL DEFAULT '0' COMMENT 'user_value1',
`user_value2` bigint NOT NULL DEFAULT '0' COMMENT 'user_value2', `user_value2` bigint NOT NULL DEFAULT '0' COMMENT 'user_value2',
`user_value3` bigint NOT NULL DEFAULT '0' COMMENT 'user_value3', `user_value3` bigint NOT NULL DEFAULT '0' COMMENT 'user_value3',
`guild_id` bigint NOT NULL COMMENT '工会id',
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
`registertime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `registertime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',