1
This commit is contained in:
parent
2f564278ee
commit
03c077fca7
@ -1,6 +1,8 @@
|
|||||||
project(friend_imserver)
|
project(friend_imserver)
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
|
set(GAME_ID 9003)
|
||||||
|
|
||||||
if (${RELEASE})
|
if (${RELEASE})
|
||||||
set(CMAKE_BUILD_TYPE "Release")
|
set(CMAKE_BUILD_TYPE "Release")
|
||||||
message("release mode")
|
message("release mode")
|
||||||
@ -8,8 +10,8 @@ else()
|
|||||||
set(CMAKE_BUILD_TYPE "Debug")
|
set(CMAKE_BUILD_TYPE "Debug")
|
||||||
message("debug mode")
|
message("debug mode")
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG")
|
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")
|
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG -DGAME_ID=${GAME_ID} ")
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
AFTER
|
AFTER
|
||||||
|
@ -39,3 +39,4 @@ const char* const PROJ_ROOT_FMT = "/data/logs/%s";
|
|||||||
const char* const EVENT_FRIEND_DELETE = "friend.delete";
|
const char* const EVENT_FRIEND_DELETE = "friend.delete";
|
||||||
|
|
||||||
const int MAX_INSTANCE_ID = 1023;
|
const int MAX_INSTANCE_ID = 1023;
|
||||||
|
|
||||||
|
@ -9,13 +9,15 @@ void JsonDataMgr::Init()
|
|||||||
{
|
{
|
||||||
if (!f8::IsOnlineEnv()) {
|
if (!f8::IsOnlineEnv()) {
|
||||||
if (f8::IsTestEnv()) {
|
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,
|
App::Instance()->instance_id,
|
||||||
});
|
});
|
||||||
} else {
|
} 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,
|
App::Instance()->instance_id,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -19,9 +19,9 @@ void TypeConvert::Convert(const FriendApply& apply, cs::MFFriendApply& apply_pb)
|
|||||||
apply_pb.set_idx(apply.idx);
|
apply_pb.set_idx(apply.idx);
|
||||||
apply_pb.set_applyid(apply.applyid);
|
apply_pb.set_applyid(apply.applyid);
|
||||||
apply_pb.set_account_id(apply.sender_id);
|
apply_pb.set_account_id(apply.sender_id);
|
||||||
apply_pb.set_nickname(apply.nickname);
|
apply_pb.set_nickname(apply.sender_nickname);
|
||||||
apply_pb.set_avatar_url(apply.avatar_url);
|
apply_pb.set_avatar_url(apply.sender_avatar_url);
|
||||||
apply_pb.set_sex(apply.sex);
|
apply_pb.set_sex(apply.sender_sex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb)
|
void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user