Skip to content

Commit f4975b5

Browse files
xengine-qytxengine-qyt
committed
fix:linux build error.
other:Adjust the directory structure
1 parent fa24104 commit f4975b5

File tree

13 files changed

+45
-31
lines changed

13 files changed

+45
-31
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ P2XP_PROTOCOL_PATH = ./XEngine_P2XPComponents/XEngine_P2XPProtocol
1010

1111
BASE_CONFIG_PATH = ./StorageModule_Config
1212
BASE_SESSION_PATH = ./StorageModule_Session
13+
BASE_APIHELP_PATH = ./StorageModule_APIHelp
1314

1415
APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
1516

1617
NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_Protocol.so \
1718
libXEngine_P2XPPeer.so libXEngine_P2XPProtocol.so \
18-
libStorageModule_Config.so libStorageModule_Session.so \
19+
libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so \
1920
XEngine_StorageApp.exe
2021

2122
.PHONY:MakeAll
@@ -35,6 +36,8 @@ libStorageModule_Config.so:
3536
make -C $(BASE_CONFIG_PATH) $(FLAGS)
3637
libStorageModule_Session.so:
3738
make -C $(BASE_SESSION_PATH) $(FLAGS)
39+
libStorageModule_APIHelp.so:
40+
make -C $(BASE_APIHELP_PATH) $(FLAGS)
3841

3942
XEngine_StorageApp.exe:
4043
make -C $(APPSERVICE_STORAGE_PATH) $(FLAGS)

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_Li
4040

4141
BaseLib_OperatorHandle_Create(&xhToken, 1, pStl_ListAddr->size());
4242
list<tstring>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
43-
for (int i = 0; stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
43+
for (XNETHANDLE i = 0; stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
4444
{
4545
if (xhToken == i)
4646
{

‎XEngine_Source/StorageModule_APIHelp/pch.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
#endif
1515

1616
#endif //PCH_H
17+
#include <string.h>
1718
#include <list>
1819
#include <string>
1920
using namespace std;
2021
#include <XEngine_Include/XEngine_CommHdr.h>
22+
#include <XEngine_Include/XEngine_Types.h>
2123
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2224
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2325
/********************************************************************
@@ -34,8 +36,10 @@ using namespace std;
3436
extern BOOL APIHelp_IsErrorOccur;
3537
extern DWORD APIHelp_dwErrorCode;
3638

39+
#ifdef _WINDOWS
3740
#ifdef _WIN64
3841
#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib")
3942
#else
4043
#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib")
44+
#endif
4145
#endif

‎XEngine_Source/XEngine_StorageApp/Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CC = g++ -Wall
22
RELEASE = 0
33
UNICODE = 0
4-
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../XEngine_StorageComponents/XStorage_SQLPacket -L ../XEngine_StorageComponents/XStorage_Protocol -L ../StorageModule_Config -L ../StorageModule_Session
5-
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lHelpComponents_XLog -lXEngine_ProcSdk -lXEngine_SystemApi -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_Protocol -lStorageModule_Config -lStorageModule_Session
4+
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../XEngine_StorageComponents/XStorage_SQLPacket -L ../XEngine_StorageComponents/XStorage_Protocol -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp
5+
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lHelpComponents_XLog -lXEngine_ProcSdk -lXEngine_SystemApi -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_Protocol -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp
66
LIBEX = -static-libgcc -ldl -lrt -lpthread
77
LOADSO = -Wl,-rpath=./,--disable-new-dtags
8-
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_Task.o Storage_TaskEvent.o Storage_TaskPass.o Storage_TaskQuery.o Storage_TaskP2P.o XEngine_StorageApp.o
8+
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o Storage_APPHelp.o Storage_TaskEvent.o Storage_TaskPass.o Storage_TaskQuery.o Storage_TaskP2P.o XEngine_StorageApp.o
99

1010
ifeq ($(RELEASE),1)
1111
FLAGS = -c -O2
@@ -34,8 +34,9 @@ StorageApp_Center.o:./StorageApp_Center.cpp
3434
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_Center.cpp
3535
StorageApp_UPLoader.o:./StorageApp_UPLoader.cpp
3636
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_UPLoader.cpp
37-
StorageApp_Task.o:./StorageApp_Task.cpp
38-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_Task.cpp
37+
38+
Storage_APPHelp.o:./Storage_APPHelp/Storage_APPHelp.cpp
39+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPHelp/Storage_APPHelp.cpp
3940

4041
Storage_TaskEvent.o:./Storage_APPTask/Storage_TaskEvent.cpp
4142
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPTask/Storage_TaskEvent.cpp

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
6666
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,发送的方法不支持"), lpszClientAddr);
6767
return FALSE;
6868
}
69-
if (!XEngine_Task_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
69+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
7070
{
7171
return FALSE;
7272
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
126126
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,发送的方法不支持"), lpszClientAddr);
127127
return FALSE;
128128
}
129-
if (!XEngine_Task_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
129+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
130130
{
131131
return FALSE;
132132
}
@@ -158,7 +158,7 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
158158
BOOL bRange = FALSE;
159159
int nPosStart = 0;
160160
int nPosEnd = 0;
161-
if (XEngine_Task_RangeFile(lpszClientAddr, &nPosStart, &nPosEnd, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
161+
if (XEngine_APPHelp_RangeFile(lpszClientAddr, &nPosStart, &nPosEnd, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
162162
{
163163
bRange = TRUE;
164164
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
8282

8383
#include "StorageApp_Network.h"
8484
#include "StorageApp_Config.h"
85-
#include "StorageApp_Task.h"
8685
#include "StorageApp_Download.h"
8786
#include "StorageApp_UPLoader.h"
8887
#include "StorageApp_Center.h"
8988
#include "Storage_APPTask/Storage_TaskEvent.h"
9089
#include "Storage_APPTask/Storage_TaskPass.h"
9190
#include "Storage_APPTask/Storage_TaskQuery.h"
9291
#include "Storage_APPTask/Storage_TaskP2P.h"
92+
#include "Storage_APPHelp/Storage_APPHelp.h"
9393

9494
#ifdef _WINDOWS
9595
#pragma comment(lib,"Ws2_32.lib")

‎XEngine_Source/XEngine_StorageApp/StorageApp_Task.h‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
6262
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,发送的方法不支持"), lpszClientAddr);
6363
return FALSE;
6464
}
65-
if (!XEngine_Task_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER))
65+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER))
6666
{
6767
return FALSE;
6868
}
@@ -98,7 +98,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
9898
{
9999
int nPosStart = 0;
100100
int nPosEnd = 0;
101-
XEngine_Task_RangeFile(lpszClientAddr, &nPosStart, &nPosEnd, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER);
101+
XEngine_APPHelp_RangeFile(lpszClientAddr, &nPosStart, &nPosEnd, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER);
102102
RfcComponents_HttpServer_GetRecvModeEx(xhUPHttp, lpszClientAddr, &nRVMode, &nRVCount, &nHDSize);
103103

104104
_stprintf(tszFileDir, _T("%s%s"), st_ServiceCfg.st_XStorage.tszFileDir, pSt_HTTPParam->tszHttpUri);
@@ -136,7 +136,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
136136
OPenSsl_Api_Digest(tszFileDir, tszHashStr, NULL, TRUE, st_ServiceCfg.st_XStorage.nHashMode);
137137
BaseLib_OperatorString_StrToHex((char*)tszHashStr, 20, st_ProtocolFile.st_ProtocolFile.tszFileHash);
138138
//验证HASH值
139-
if (XEngine_Task_VerHash(lpszClientAddr, tszFileDir, st_ProtocolFile.st_ProtocolFile.tszFileHash, pptszListHdr, nHdrCount))
139+
if (XEngine_APPHelp_VerHash(lpszClientAddr, tszFileDir, st_ProtocolFile.st_ProtocolFile.tszFileHash, pptszListHdr, nHdrCount))
140140
{
141141
if (bIsSQL)
142142
{

XEngine_Source/XEngine_StorageApp/StorageApp_Task.cpp renamed to XEngine_Source/XEngine_StorageApp/Storage_APPHelp/Storage_APPHelp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "StorageApp_Hdr.h"
1+
#include "../StorageApp_Hdr.h"
22

3-
BOOL XEngine_Task_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
3+
BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
44
{
55
int nSDLen = 1024;
66
int nAuthType = 0;
@@ -103,7 +103,7 @@ BOOL XEngine_Task_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHAR**
103103
}
104104
return TRUE;
105105
}
106-
BOOL XEngine_Task_RangeFile(LPCTSTR lpszClientAddr, int* pInt_SPos, int* pInt_EPos, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
106+
BOOL XEngine_APPHelp_RangeFile(LPCTSTR lpszClientAddr, int* pInt_SPos, int* pInt_EPos, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
107107
{
108108
LPCTSTR lpszRange = _T("Range");
109109
LPCTSTR lpszClientType;
@@ -144,7 +144,7 @@ BOOL XEngine_Task_RangeFile(LPCTSTR lpszClientAddr, int* pInt_SPos, int* pInt_EP
144144
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("%s:%s,客户端的请求设置了数据范围:%s - %s"), lpszClientType, lpszClientAddr, tszKeyStr, tszValueStr);
145145
return TRUE;
146146
}
147-
BOOL XEngine_Task_VerHash(LPCTSTR lpszClientAddr ,LPCTSTR lpszFileName, LPCTSTR lpszFileHash, TCHAR** pptszListHdr, int nHdrCount)
147+
BOOL XEngine_APPHelp_VerHash(LPCTSTR lpszClientAddr ,LPCTSTR lpszFileName, LPCTSTR lpszFileHash, TCHAR** pptszListHdr, int nHdrCount)
148148
{
149149
LPCTSTR lpszKeyStr = _T("FileHash");
150150
TCHAR tszValueStr[MAX_PATH];

0 commit comments

Comments
 (0)