From 03c077fca75d49bb29f949f8bed5e374600b507c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Jun 2020 19:29:27 +0800 Subject: [PATCH] 1 --- server/imserver/CMakeLists.txt | 6 ++++-- server/imserver/constant.h | 1 + server/imserver/jsondatamgr.cc | 6 ++++-- server/imserver/typeconvert.cc | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server/imserver/CMakeLists.txt b/server/imserver/CMakeLists.txt index e08b04c..c0cfaed 100644 --- a/server/imserver/CMakeLists.txt +++ b/server/imserver/CMakeLists.txt @@ -1,6 +1,8 @@ project(friend_imserver) cmake_minimum_required(VERSION 2.8) +set(GAME_ID 9003) + if (${RELEASE}) set(CMAKE_BUILD_TYPE "Release") message("release mode") @@ -8,8 +10,8 @@ else() set(CMAKE_BUILD_TYPE "Debug") message("debug mode") endif() -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG -DGAME_ID=${GAME_ID} ") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG -DGAME_ID=${GAME_ID} ") include_directories( AFTER diff --git a/server/imserver/constant.h b/server/imserver/constant.h index 7510560..bb9bc9b 100644 --- a/server/imserver/constant.h +++ b/server/imserver/constant.h @@ -39,3 +39,4 @@ const char* const PROJ_ROOT_FMT = "/data/logs/%s"; const char* const EVENT_FRIEND_DELETE = "friend.delete"; const int MAX_INSTANCE_ID = 1023; + diff --git a/server/imserver/jsondatamgr.cc b/server/imserver/jsondatamgr.cc index dc97aa2..2c58049 100644 --- a/server/imserver/jsondatamgr.cc +++ b/server/imserver/jsondatamgr.cc @@ -9,13 +9,15 @@ void JsonDataMgr::Init() { if (!f8::IsOnlineEnv()) { if (f8::IsTestEnv()) { - work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/imserver.test", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/imserver.test", { + GAME_ID, App::Instance()->instance_id, }); } else { - work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/imserver.dev", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/imserver.dev", { + GAME_ID, App::Instance()->instance_id, }); } diff --git a/server/imserver/typeconvert.cc b/server/imserver/typeconvert.cc index 8703f07..6362daa 100644 --- a/server/imserver/typeconvert.cc +++ b/server/imserver/typeconvert.cc @@ -19,9 +19,9 @@ void TypeConvert::Convert(const FriendApply& apply, cs::MFFriendApply& apply_pb) apply_pb.set_idx(apply.idx); apply_pb.set_applyid(apply.applyid); apply_pb.set_account_id(apply.sender_id); - apply_pb.set_nickname(apply.nickname); - apply_pb.set_avatar_url(apply.avatar_url); - apply_pb.set_sex(apply.sex); + apply_pb.set_nickname(apply.sender_nickname); + apply_pb.set_avatar_url(apply.sender_avatar_url); + apply_pb.set_sex(apply.sender_sex); } void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb)