Skip to content

Commit b2ecf40

Browse files
xengine-qytxengine-qyt
committed
added:proxy pass added to http method
fix:windows x64 complie
1 parent 7eedfa0 commit b2ecf40

File tree

13 files changed

+56
-36
lines changed

13 files changed

+56
-36
lines changed

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"LogLeave": 32
2626
},
2727
"XSql": {
28-
"SQLType": 1,
28+
"SQLType": 0,
2929
"SQLFile": "./XEngine_SQL/SQLFile.db",
3030
"SQLAddr": "192.168.1.9",
3131
"SQLPort": 3306,

‎XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v142</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>Unicode</CharacterSet>
53+
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">
@@ -78,12 +78,15 @@
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
8080
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
8182
</PropertyGroup>
8283
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8384
<LinkIncremental>true</LinkIncremental>
8485
</PropertyGroup>
8586
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8687
<LinkIncremental>false</LinkIncremental>
88+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
8790
</PropertyGroup>
8891
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8992
<ClCompile>
@@ -146,10 +149,12 @@
146149
<FunctionLevelLinking>true</FunctionLevelLinking>
147150
<IntrinsicFunctions>true</IntrinsicFunctions>
148151
<SDLCheck>true</SDLCheck>
149-
<PreprocessorDefinitions>NDEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>NDEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150153
<ConformanceMode>true</ConformanceMode>
151154
<PrecompiledHeader>Use</PrecompiledHeader>
152155
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
156+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
157+
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
153158
</ClCompile>
154159
<Link>
155160
<SubSystem>Windows</SubSystem>

‎XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPPeer/XEngine_P2XPPeer.vcxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,16 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
8082
</PropertyGroup>
8183
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8284
<LinkIncremental>true</LinkIncremental>
8385
</PropertyGroup>
8486
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8587
<LinkIncremental>false</LinkIncremental>
88+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
8690
</PropertyGroup>
8791
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8892
<ClCompile>
@@ -165,8 +169,8 @@
165169
<ModuleDefinitionFile>XEngine_P2XPPeer.def</ModuleDefinitionFile>
166170
</Link>
167171
<PostBuildEvent>
168-
<Command>copy "$(SolutionDir)x64\Release\XEngine_P2XPPeer.lib" "../../../XEngine_Release/XEngine_Windows/x64/XEngine_P2xp/XEngine_P2XPPeer.lib"
169-
copy "$(SolutionDir)x64\Release\XEngine_P2XPPeer.dll" "../../../XEngine_Release/XEngine_Windows/x64/XEngine_P2xp/XEngine_P2XPPeer.dll"</Command>
172+
<Command>
173+
</Command>
170174
</PostBuildEvent>
171175
</ItemDefinitionGroup>
172176
<ItemGroup>

‎XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPProtocol/XEngine_P2XPProtocol.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80-
<IncludePath>../../../../WIN_Env/jsoncpp/include;$(IncludePath)</IncludePath>
81-
<LibraryPath>../../../../WIN_Env/jsoncpp/lib_json/Release;$(LibraryPath)</LibraryPath>
80+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
81+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
8585
</PropertyGroup>
8686
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8787
<LinkIncremental>false</LinkIncremental>
88-
<IncludePath>../../../../WIN_Env/jsoncpp/include;$(IncludePath)</IncludePath>
89-
<LibraryPath>../../../../WIN_Env/jsoncpp/lib_json/x64/Release;$(LibraryPath)</LibraryPath>
88+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
89+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
9090
</PropertyGroup>
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<ClCompile>
@@ -169,8 +169,8 @@
169169
<ModuleDefinitionFile>XEngine_P2XPProtocol.def</ModuleDefinitionFile>
170170
</Link>
171171
<PostBuildEvent>
172-
<Command>copy "$(SolutionDir)x64\Release\XEngine_P2XPProtocol.lib" "../../../XEngine_Release/XEngine_Windows/x64/XEngine_P2xp/XEngine_P2XPProtocol.lib"
173-
copy "$(SolutionDir)x64\Release\XEngine_P2XPProtocol.dll" "../../../XEngine_Release/XEngine_Windows/x64/XEngine_P2xp/XEngine_P2XPProtocol.dll"</Command>
172+
<Command>
173+
</Command>
174174
</PostBuildEvent>
175175
</ItemDefinitionGroup>
176176
<ItemGroup>

‎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_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
69+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodName, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
7070
{
7171
return FALSE;
7272
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp‎

Lines changed: 3 additions & 3 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_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
129+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodGet, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPDOWNLOAD))
130130
{
131131
return FALSE;
132132
}
@@ -181,12 +181,12 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
181181
st_HDRParam.st_Range.nPosEnd = nPosEnd;
182182
st_HDRParam.st_Range.nPosCount = ullCount;
183183
st_HDRParam.nHttpCode = 206;
184-
st_HDRParam.bIsClose = FALSE;
184+
st_HDRParam.bIsClose = TRUE;
185185
}
186186
else
187187
{
188188
st_HDRParam.nHttpCode = 200;
189-
st_HDRParam.bIsClose = FALSE;
189+
st_HDRParam.bIsClose = TRUE;
190190
}
191191
_tcscpy(st_HDRParam.tszMimeType, _T("bin"));
192192
RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, ullSize);

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 1 addition & 1 deletion
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_APPHelp_ProxyAuth(lpszClientAddr, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER))
65+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodGet, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER))
6666
{
6767
return FALSE;
6868
}

‎XEngine_Source/XEngine_StorageApp/Storage_APPHelp/Storage_APPHelp.cpp‎

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

3-
BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
3+
BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszMethod, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType)
44
{
55
int nSDLen = 1024;
66
int nAuthType = 0;
@@ -58,7 +58,7 @@ BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHA
5858
tstring m_StrBody;
5959
int nResponseCode = 0;
6060

61-
XStorageProtocol_Proxy_PacketBasicAuth(lpszPostUrl, lpszClientAddr, tszUserName, tszUserPass, tszSDBuffer, &nSDLen);
61+
XStorageProtocol_Proxy_PacketBasicAuth(lpszMethod, lpszPostUrl, lpszClientAddr, tszUserName, tszUserPass, tszSDBuffer, &nSDLen);
6262
APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyAuth.tszAuthProxy, tszSDBuffer, &nResponseCode, &m_StrBody);
6363

6464
if (200 != nResponseCode)

‎XEngine_Source/XEngine_StorageApp/Storage_APPHelp/Storage_APPHelp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
22

3-
BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType = STORAGE_NETTYPE_HTTPDOWNLOAD);
3+
BOOL XEngine_APPHelp_ProxyAuth(LPCTSTR lpszClientAddr, LPCTSTR lpszMethod, LPCTSTR lpszPostUrl, TCHAR** pptszListHdr, int nHdrCount, int nSDType = STORAGE_NETTYPE_HTTPDOWNLOAD);
44
BOOL XEngine_APPHelp_RangeFile(LPCTSTR lpszClientAddr, int* pInt_SPos, int* pInt_EPos, TCHAR** pptszListHdr, int nHdrCount, int nSDType = STORAGE_NETTYPE_HTTPDOWNLOAD);
55
BOOL XEngine_APPHelp_VerHash(LPCTSTR lpszClientAddr, LPCTSTR lpszFileName, LPCTSTR lpszFileHash, TCHAR** pptszListHdr, int nHdrCount);

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Define.h‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,37 @@ extern "C" DWORD XStorageProtocol_GetLastError(int *pInt_SysError = NULL);
2020
/********************************************************************
2121
函数名称：XStorageProtocol_Proxy_PacketBasicAuth
2222
函数功能：基本验证协议代理转发
23-
参数.一：lpszPostUrl
23+
参数.一：lpszMethod
24+
In/Out：In
25+
类型：常量字符指针
26+
可空：N
27+
意思：方法名称
28+
参数.二：lpszPostUrl
2429
In/Out：In
2530
类型：常量字符指针
2631
可空：N
2732
意思：用户提交的地址
28-
参数.二：lpszClientAddr
33+
参数.三：lpszClientAddr
2934
In/Out：In
3035
类型：常量字符指针
3136
可空：N
3237
意思：用户发送的客户端地址
33-
参数.三：lpszUser
38+
参数.四：lpszUser
3439
In/Out：In
3540
类型：常量字符指针
3641
可空：N
3742
意思：用户
38-
参数.四：lpszPass
43+
参数.五：lpszPass
3944
In/Out：In
4045
类型：常量字符指针
4146
可空：N
4247
意思：密码
43-
参数.五：ptszMsgBuffer
48+
参数.六：ptszMsgBuffer
4449
In/Out：Out
4550
类型：字符指针
4651
可空：N
4752
意思：转发数据包
48-
参数.六：pInt_MsgLen
53+
参数.七：pInt_MsgLen
4954
In/Out：Out
5055
类型：整数型
5156
可空：N
@@ -55,7 +60,7 @@ extern "C" DWORD XStorageProtocol_GetLastError(int *pInt_SysError = NULL);
5560
意思：是否成功
5661
备注：
5762
*********************************************************************/
58-
extern "C" BOOL XStorageProtocol_Proxy_PacketBasicAuth(LPCTSTR lpszPostUrl, LPCTSTR lpszClientAddr, LPCTSTR lpszUser, LPCTSTR lpszPass, TCHAR * ptszMsgBuffer, int* pInt_MsgLen);
63+
extern "C" BOOL XStorageProtocol_Proxy_PacketBasicAuth(LPCTSTR lpszMethod, LPCTSTR lpszPostUrl, LPCTSTR lpszClientAddr, LPCTSTR lpszUser, LPCTSTR lpszPass, TCHAR * ptszMsgBuffer, int* pInt_MsgLen);
5964
/********************************************************************
6065
函数名称：XStorageProtocol_Proxy_PacketUPDown
6166
函数功能：上传下载完成代理通知协议

0 commit comments

Comments
 (0)