Skip to content

Commit fdaf7e4

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #9 from libxengine/develop
V2.1 Released
2 parents 289cdf5 + f02cbc2 commit fdaf7e4

File tree

55 files changed

+1434
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1434
-309
lines changed

‎README.en.md‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ feature list:
2424
9. supprot task start and end proxy forwarding
2525
10. support p2p
2626
11. bt(planning)
27-
12. data distributed(planning)
27+
12. data distributed
2828
13. support second pass
2929
14. support nginx upload module proxy_pass
3030
15. support upload and download Redirect
@@ -33,7 +33,7 @@ feature list:
3333

3434
#### Requirements
3535
support system above windows 7sp1 and linux(ubuntu20.04,centos8)
36-
XEngine need V7.17 or above
36+
XEngine need V7.18 or above
3737
vcpkg need 2021.05.11 or above
3838

3939
#### Windows
@@ -86,10 +86,11 @@ upload file second pass is first check the HASH file is on the server, if has fi
8686
The realization of downloading second transmission is to first query the local file save path through HASH, and download it directly if it exists.
8787

8888
## directory struct
89-
- XEngine_Docment docment directory
90-
- XEngine_Release install directory
91-
- XEngine_Source code directory
92-
- XEngine_APPClient client code dir
89+
- XEngine_Docment docment directory
90+
- XEngine_Release install directory
91+
- XEngine_Source code directory
92+
- XEngine_APPClient client code dir
93+
- XEngine_SQLFile database sql file
9394

9495
## now task
9596
expand management interface
@@ -105,6 +106,9 @@ You can refer to the document under the docment directory. It contains API proto
105106
3. Submit the code
106107
4. New Pull Request
107108

109+
## Follow us
110+
If you think this software is helpful to you, please give us a START
111+
108112
## post issues
109113

110114
if you have eny quest.post issues...

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ c c++ file storage service
2323
9. 支持任务开始结束代理转发
2424
10. 支持P2P
2525
11. BT(规划中)
26-
12. 数据分发(规划中)
26+
12. 数据分发
2727
13. 支持秒传
2828
14. 支持NGINX UPLOAD MODULE上传代理
2929
15. 支持上传和下载重定向
@@ -32,7 +32,7 @@ c c++ file storage service
3232

3333
#### 版本需求
3434
支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统
35-
XEngine版本需要V7.17或者以上版本
35+
XEngine版本需要V7.18或者以上版本
3636
vcpkg 需要2021.05.11以上版本
3737

3838
#### Windows
@@ -82,6 +82,7 @@ make FLAGS=CleanAll 清理编译
8282
- XEngine_Release 安装目录结构
8383
- XEngine_Source 源代目录结构
8484
- XEngine_APPClient 客户端演示代码
85+
- XEngine_SQLFile 数据库脚本文件
8586

8687

8788
## 秒传实现
@@ -103,6 +104,9 @@ make FLAGS=CleanAll 清理编译
103104
3. 提交代码
104105
4. 新建 Pull Request
105106

107+
## 关注我们
108+
如果你觉得这个软件对你有帮助,请你给我们一个START吧
109+
106110
## 提交问题
107111

108-
如果你有问题,可以在issues中提交
112+
如果你有问题或者发现程序有BUG和意见,可以在issues中提交

‎XEngine_APPClient/APPClient_Download/APPClient_Download.cpp‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#ifdef _WINDOWS
2+
#include <windows.h>
3+
#include <tchar.h>
4+
#else
5+
#endif
6+
#include <json/json.h>
7+
#include <XEngine_Include/XEngine_CommHdr.h>
8+
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
9+
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
10+
#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
11+
#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
12+
13+
#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib")
14+
#pragma comment(lib,"x86/XEngine_NetHelp/NetHelp_APIHelp")
15+
#pragma comment(lib,"Ws2_32")
16+
17+
18+
int main()
19+
{
20+
WSADATA st_WSAData;
21+
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
22+
23+
int nHTTPCode = 0;
24+
int nBodyLen = 2048;
25+
TCHAR *ptszMsgBody = NULL;
26+
//请求分布式存储文件所有位置
27+
LPCTSTR lpszUrl = _T("http://192.168.1.7:5100/EC9B9B75A04F3B323EFD348F9B795539");
28+
if (!APIHelp_HttpRequest_Get(lpszUrl, &ptszMsgBody, &nBodyLen, &nHTTPCode))
29+
{
30+
return -1;
31+
}
32+
printf("%s\n", ptszMsgBody);
33+
34+
BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBody);
35+
WSACleanup();
36+
return 0;
37+
}

‎XEngine_APPClient/APPClient_Download/APPClient_Download.vcxproj‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>16.0</VCProjectVersion>
23+
<Keyword>Win32Proj</Keyword>
24+
<ProjectGuid>{16608d17-1839-48d8-a455-21aaf0257e36}</ProjectGuid>
25+
<RootNamespace>APPClientDownload</RootNamespace>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
27+
</PropertyGroup>
28+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
30+
<ConfigurationType>Application</ConfigurationType>
31+
<UseDebugLibraries>true</UseDebugLibraries>
32+
<PlatformToolset>v142</PlatformToolset>
33+
<CharacterSet>MultiByte</CharacterSet>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<UseDebugLibraries>false</UseDebugLibraries>
38+
<PlatformToolset>v142</PlatformToolset>
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
40+
<CharacterSet>Unicode</CharacterSet>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43+
<ConfigurationType>Application</ConfigurationType>
44+
<UseDebugLibraries>true</UseDebugLibraries>
45+
<PlatformToolset>v142</PlatformToolset>
46+
<CharacterSet>Unicode</CharacterSet>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
49+
<ConfigurationType>Application</ConfigurationType>
50+
<UseDebugLibraries>false</UseDebugLibraries>
51+
<PlatformToolset>v142</PlatformToolset>
52+
<WholeProgramOptimization>true</WholeProgramOptimization>
53+
<CharacterSet>Unicode</CharacterSet>
54+
</PropertyGroup>
55+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56+
<ImportGroup Label="ExtensionSettings">
57+
</ImportGroup>
58+
<ImportGroup Label="Shared">
59+
</ImportGroup>
60+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62+
</ImportGroup>
63+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<PropertyGroup Label="UserMacros" />
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74+
<LinkIncremental>true</LinkIncremental>
75+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
76+
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79+
<LinkIncremental>false</LinkIncremental>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
82+
<LinkIncremental>true</LinkIncremental>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
85+
<LinkIncremental>false</LinkIncremental>
86+
</PropertyGroup>
87+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
88+
<ClCompile>
89+
<WarningLevel>Level3</WarningLevel>
90+
<SDLCheck>true</SDLCheck>
91+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92+
<ConformanceMode>true</ConformanceMode>
93+
</ClCompile>
94+
<Link>
95+
<SubSystem>Console</SubSystem>
96+
<GenerateDebugInformation>true</GenerateDebugInformation>
97+
</Link>
98+
</ItemDefinitionGroup>
99+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
100+
<ClCompile>
101+
<WarningLevel>Level3</WarningLevel>
102+
<FunctionLevelLinking>true</FunctionLevelLinking>
103+
<IntrinsicFunctions>true</IntrinsicFunctions>
104+
<SDLCheck>true</SDLCheck>
105+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106+
<ConformanceMode>true</ConformanceMode>
107+
</ClCompile>
108+
<Link>
109+
<SubSystem>Console</SubSystem>
110+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
111+
<OptimizeReferences>true</OptimizeReferences>
112+
<GenerateDebugInformation>true</GenerateDebugInformation>
113+
</Link>
114+
</ItemDefinitionGroup>
115+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
116+
<ClCompile>
117+
<WarningLevel>Level3</WarningLevel>
118+
<SDLCheck>true</SDLCheck>
119+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120+
<ConformanceMode>true</ConformanceMode>
121+
</ClCompile>
122+
<Link>
123+
<SubSystem>Console</SubSystem>
124+
<GenerateDebugInformation>true</GenerateDebugInformation>
125+
</Link>
126+
</ItemDefinitionGroup>
127+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
128+
<ClCompile>
129+
<WarningLevel>Level3</WarningLevel>
130+
<FunctionLevelLinking>true</FunctionLevelLinking>
131+
<IntrinsicFunctions>true</IntrinsicFunctions>
132+
<SDLCheck>true</SDLCheck>
133+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134+
<ConformanceMode>true</ConformanceMode>
135+
</ClCompile>
136+
<Link>
137+
<SubSystem>Console</SubSystem>
138+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
139+
<OptimizeReferences>true</OptimizeReferences>
140+
<GenerateDebugInformation>true</GenerateDebugInformation>
141+
</Link>
142+
</ItemDefinitionGroup>
143+
<ItemGroup>
144+
<ClCompile Include="APPClient_Download.cpp" />
145+
</ItemGroup>
146+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
147+
<ImportGroup Label="ExtensionTargets">
148+
</ImportGroup>
149+
</Project>

‎XEngine_APPClient/APPClient_Download/APPClient_Download.vcxproj.filters‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="源文件">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="头文件">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="资源文件">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="APPClient_Download.cpp">
19+
<Filter>源文件</Filter>
20+
</ClCompile>
21+
</ItemGroup>
22+
</Project>

‎XEngine_APPClient/APPClient_Download/APPClient_Download.vcxproj.user‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎XEngine_APPClient/XEngine_APPClient.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31410.357
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APPClient_P2XPClient", "APPClient_P2XPClient\APPClient_P2XPClient.vcxproj", "{6A38A644-AB6E-43D1-ADFF-DD963239ED39}"
77
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APPClient_Download", "APPClient_Download\APPClient_Download.vcxproj", "{16608D17-1839-48D8-A455-21AAF0257E36}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|x64 = Debug|x64
@@ -21,6 +23,14 @@ Global
2123
{6A38A644-AB6E-43D1-ADFF-DD963239ED39}.Release|x64.Build.0 = Release|x64
2224
{6A38A644-AB6E-43D1-ADFF-DD963239ED39}.Release|x86.ActiveCfg = Release|Win32
2325
{6A38A644-AB6E-43D1-ADFF-DD963239ED39}.Release|x86.Build.0 = Release|Win32
26+
{16608D17-1839-48D8-A455-21AAF0257E36}.Debug|x64.ActiveCfg = Debug|x64
27+
{16608D17-1839-48D8-A455-21AAF0257E36}.Debug|x64.Build.0 = Debug|x64
28+
{16608D17-1839-48D8-A455-21AAF0257E36}.Debug|x86.ActiveCfg = Debug|Win32
29+
{16608D17-1839-48D8-A455-21AAF0257E36}.Debug|x86.Build.0 = Debug|Win32
30+
{16608D17-1839-48D8-A455-21AAF0257E36}.Release|x64.ActiveCfg = Release|x64
31+
{16608D17-1839-48D8-A455-21AAF0257E36}.Release|x64.Build.0 = Release|x64
32+
{16608D17-1839-48D8-A455-21AAF0257E36}.Release|x86.ActiveCfg = Release|Win32
33+
{16608D17-1839-48D8-A455-21AAF0257E36}.Release|x86.Build.0 = Release|Win32
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

‎XEngine_Docment/Docment_en.docx‎

76 KB
Binary file not shown.

‎XEngine_Docment/Docment_zh.docx‎

75.9 KB
Binary file not shown.

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"tszIPAddr": "127.0.0.1",
2+
"tszIPAddr": "192.168.1.7",
33
"bDeamon": 0,
44
"nCenterPort": 5100,
55
"nStorageDLPort": 5101,
@@ -58,10 +58,15 @@
5858
"nMaxDNLoad": 1024000
5959
},
6060
"XP2xp": {
61+
"nMode": 0,
62+
"nTime": 2,
63+
"nSDPort": 15000,
64+
"nRVPort": 15001,
6165
"tszQQWryFile": "./XEngine_SQL/qqwry.dat"
6266
},
6367
"XVer": {
6468
"StorageVersion": [
69+
"2.1.0.1001 Build20210805",
6570
"2.0.0.1001 Build20210723",
6671
"1.5.0.1001 Build20210716",
6772
"1.4.0.1001 Build20210702",
@@ -71,4 +76,4 @@
7176
"1.0.0.1001 Build20210501"
7277
]
7378
}
74-
}
79+
}

0 commit comments

Comments
 (0)