This commit is contained in:
aozhiwei 2018-09-03 14:11:31 +08:00
parent 461fceb651
commit cc68af56df
8 changed files with 10 additions and 9 deletions

View File

@ -12,7 +12,7 @@ include_directories(
/usr/include/jsoncpp
/usr/include/python3.4m
/usr/include/hiredis
../../third_party/framework/cpp
../../third_party
)
link_directories(
@ -64,4 +64,5 @@ target_link_libraries(
jsoncpp
curl
hiredis
tinyxml2
)

View File

@ -4,7 +4,7 @@
#include <a8/websocketsession.h>
#include <a8/tcplistener.h>
#include "netmsghandler.h"
#include "framework/cpp/netmsghandler.h"
#include "app.h"
#include "GCListener.h"
@ -102,7 +102,7 @@ void GCListener::ForwardTargetConnMsg(MsgHdr& hdr)
head->msgid = hdr.msgid;
head->seqid = hdr.seqid;
head->magic_code = MAGIC_CODE;
head->reserved = 0;
head->rpc_error_code = 0;
if (hdr.buflen > 0) {
memmove(buff + sizeof(PackHead), hdr.buf, hdr.buflen);
}

View File

@ -9,7 +9,7 @@
#include <a8/timer.h>
#include <a8/uuid.h>
#include "netmsghandler.h"
#include "framework/cpp/netmsghandler.h"
#include "app.h"
#include "GCListener.h"

View File

@ -2,7 +2,7 @@
#include <a8/basehttpsession.h>
#include "netmsghandler.h"
#include "framework/cpp/netmsghandler.h"
namespace a8
{

View File

@ -15,4 +15,4 @@ namespace google
}
}
#include "protoutils.h"
#include "framework/cpp/protoutils.h"

View File

@ -1,6 +1,6 @@
#pragma once
#include "protoutils.h"
#include "framework/cpp/protoutils.h"
namespace a8
{

@ -1 +1 @@
Subproject commit 74814af7d2cdbaa4b9e82fa0d8859a8807c70e77
Subproject commit 37202ecc44e3b5029055caebfb117d2e74583b09

@ -1 +1 @@
Subproject commit 1625d6a86b382b36d627a604440a59a09f3c688d
Subproject commit 3f1b7f95973d2740a1805eca55cee9071607036c