Skip to content

Commit e9a3a76

Browse files
authored
Merge pull request #32 from libxengine/develop
V3.12.0.1001 Merge
2 parents e2ebb4d + acc91a7 commit e9a3a76

34 files changed

+683
-262
lines changed

CHANGELOG

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
XEngine_Storage V3.12.0.1001
2+
3+
增加:为P2P启用内存数据库支持
4+
修改:为P2P功能单独启用配置选项
5+
修改:http验证回调发送数据字段被填充了
6+
修改:WINDOWS宏定义
7+
修正:重载配置的错误
8+
修正:数据库时间处理不正确
9+
删除:业务分布式功能被删除
10+
删除:没有使用的配置代码
11+
12+
added:memory database supported for p2p
13+
modify:The configuration for enabling P2P is set up as a separate project.
14+
modify:http authorize callback send len is useful
15+
modify:windows macro define name
16+
fixed:reload configure is incorrent
17+
fixed:database thread time is incorrent
18+
delete:center Distributed function,it is useless
19+
delete:unuse configure field
20+
======================================================================================
121
XEngine_Storage V3.11.1.1001
222

323
更新:匹配XEngine V8.15版本

LICENSE

+21-165
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,21 @@
1-
GNU LESSER GENERAL PUBLIC LICENSE
2-
Version 3, 29 June 2007
3-
4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5-
Everyone is permitted to copy and distribute verbatim copies
6-
of this license document, but changing it is not allowed.
7-
8-
9-
This version of the GNU Lesser General Public License incorporates
10-
the terms and conditions of version 3 of the GNU General Public
11-
License, supplemented by the additional permissions listed below.
12-
13-
0. Additional Definitions.
14-
15-
As used herein, "this License" refers to version 3 of the GNU Lesser
16-
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17-
General Public License.
18-
19-
"The Library" refers to a covered work governed by this License,
20-
other than an Application or a Combined Work as defined below.
21-
22-
An "Application" is any work that makes use of an interface provided
23-
by the Library, but which is not otherwise based on the Library.
24-
Defining a subclass of a class defined by the Library is deemed a mode
25-
of using an interface provided by the Library.
26-
27-
A "Combined Work" is a work produced by combining or linking an
28-
Application with the Library. The particular version of the Library
29-
with which the Combined Work was made is also called the "Linked
30-
Version".
31-
32-
The "Minimal Corresponding Source" for a Combined Work means the
33-
Corresponding Source for the Combined Work, excluding any source code
34-
for portions of the Combined Work that, considered in isolation, are
35-
based on the Application, and not on the Linked Version.
36-
37-
The "Corresponding Application Code" for a Combined Work means the
38-
object code and/or source code for the Application, including any data
39-
and utility programs needed for reproducing the Combined Work from the
40-
Application, but excluding the System Libraries of the Combined Work.
41-
42-
1. Exception to Section 3 of the GNU GPL.
43-
44-
You may convey a covered work under sections 3 and 4 of this License
45-
without being bound by section 3 of the GNU GPL.
46-
47-
2. Conveying Modified Versions.
48-
49-
If you modify a copy of the Library, and, in your modifications, a
50-
facility refers to a function or data to be supplied by an Application
51-
that uses the facility (other than as an argument passed when the
52-
facility is invoked), then you may convey a copy of the modified
53-
version:
54-
55-
a) under this License, provided that you make a good faith effort to
56-
ensure that, in the event an Application does not supply the
57-
function or data, the facility still operates, and performs
58-
whatever part of its purpose remains meaningful, or
59-
60-
b) under the GNU GPL, with none of the additional permissions of
61-
this License applicable to that copy.
62-
63-
3. Object Code Incorporating Material from Library Header Files.
64-
65-
The object code form of an Application may incorporate material from
66-
a header file that is part of the Library. You may convey such object
67-
code under terms of your choice, provided that, if the incorporated
68-
material is not limited to numerical parameters, data structure
69-
layouts and accessors, or small macros, inline functions and templates
70-
(ten or fewer lines in length), you do both of the following:
71-
72-
a) Give prominent notice with each copy of the object code that the
73-
Library is used in it and that the Library and its use are
74-
covered by this License.
75-
76-
b) Accompany the object code with a copy of the GNU GPL and this license
77-
document.
78-
79-
4. Combined Works.
80-
81-
You may convey a Combined Work under terms of your choice that,
82-
taken together, effectively do not restrict modification of the
83-
portions of the Library contained in the Combined Work and reverse
84-
engineering for debugging such modifications, if you also do each of
85-
the following:
86-
87-
a) Give prominent notice with each copy of the Combined Work that
88-
the Library is used in it and that the Library and its use are
89-
covered by this License.
90-
91-
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92-
document.
93-
94-
c) For a Combined Work that displays copyright notices during
95-
execution, include the copyright notice for the Library among
96-
these notices, as well as a reference directing the user to the
97-
copies of the GNU GPL and this license document.
98-
99-
d) Do one of the following:
100-
101-
0) Convey the Minimal Corresponding Source under the terms of this
102-
License, and the Corresponding Application Code in a form
103-
suitable for, and under terms that permit, the user to
104-
recombine or relink the Application with a modified version of
105-
the Linked Version to produce a modified Combined Work, in the
106-
manner specified by section 6 of the GNU GPL for conveying
107-
Corresponding Source.
108-
109-
1) Use a suitable shared library mechanism for linking with the
110-
Library. A suitable mechanism is one that (a) uses at run time
111-
a copy of the Library already present on the user's computer
112-
system, and (b) will operate properly with a modified version
113-
of the Library that is interface-compatible with the Linked
114-
Version.
115-
116-
e) Provide Installation Information, but only if you would otherwise
117-
be required to provide such information under section 6 of the
118-
GNU GPL, and only to the extent that such information is
119-
necessary to install and execute a modified version of the
120-
Combined Work produced by recombining or relinking the
121-
Application with a modified version of the Linked Version. (If
122-
you use option 4d0, the Installation Information must accompany
123-
the Minimal Corresponding Source and Corresponding Application
124-
Code. If you use option 4d1, you must provide the Installation
125-
Information in the manner specified by section 6 of the GNU GPL
126-
for conveying Corresponding Source.)
127-
128-
5. Combined Libraries.
129-
130-
You may place library facilities that are a work based on the
131-
Library side by side in a single library together with other library
132-
facilities that are not Applications and are not covered by this
133-
License, and convey such a combined library under terms of your
134-
choice, if you do both of the following:
135-
136-
a) Accompany the combined library with a copy of the same work based
137-
on the Library, uncombined with any other library facilities,
138-
conveyed under the terms of this License.
139-
140-
b) Give prominent notice with the combined library that part of it
141-
is a work based on the Library, and explaining where to find the
142-
accompanying uncombined form of the same work.
143-
144-
6. Revised Versions of the GNU Lesser General Public License.
145-
146-
The Free Software Foundation may publish revised and/or new versions
147-
of the GNU Lesser General Public License from time to time. Such new
148-
versions will be similar in spirit to the present version, but may
149-
differ in detail to address new problems or concerns.
150-
151-
Each version is given a distinguishing version number. If the
152-
Library as you received it specifies that a certain numbered version
153-
of the GNU Lesser General Public License "or any later version"
154-
applies to it, you have the option of following the terms and
155-
conditions either of that published version or of any later version
156-
published by the Free Software Foundation. If the Library as you
157-
received it does not specify a version number of the GNU Lesser
158-
General Public License, you may choose any version of the GNU Lesser
159-
General Public License ever published by the Free Software Foundation.
160-
161-
If the Library as you received it specifies that a proxy can decide
162-
whether future versions of the GNU Lesser General Public License shall
163-
apply, that proxy's public statement of acceptance of any version is
164-
permanent authorization for you to choose that version for the
165-
Library.
1+
MIT License
2+
3+
Copyright (c) 2023 XEngine:www.xyry.org
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.en.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ c c++ file storage service
99
This is an api gateway for uploading and downloading.
1010
The service is for users who have business needs for upload and download services (such as developers who need to upload and download servers).
1111
This server is more inclined to storestorage transfer and API Manage interface,the service can be used upload and download management and network file shared and software update service.
12-
best storage service for http,batter than nginx and more convenient to manage,more concise code. On going maintenance
12+
best storage service for http,more concise code. On going maintenance
1313

1414
## Software feature
1515
The purpose of development and implementation based on libXEngine is a cross-platform network storage service
@@ -120,7 +120,9 @@ Port:HTTP Center Port 5100,Download 5101,UPLoad 5102
120120
4. New Pull Request
121121

122122
## Follow us
123-
If you think this software is helpful to you, please give us a START
123+
If you think this software is helpful to you, please give us a START
124+
and wechat qr scan to follow us
125+
![qrcode](https://www.xyry.org/qrcode.jpg)
124126

125127
## post issues
126128

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ c c++ file storage service
99
这是一个上传下载服务API网关,不是文件同步服务,也不是云存储.
1010
这个服务的主要目的是为了给有上传下载服务业务需求的用户使用(比如需要开发上传下载服务的开发人员).
1111
此服务器更偏向于存储传输与API接口管理,此服务可以用于上传下载的管理,网络文件共享或者软件更新服务.
12-
目前最好的HTTP存储服务,比NGINX更优秀,更方便管理,代码更简洁.持续维护中...
12+
目前最好的HTTP存储服务,更方便管理,代码更简洁.持续维护中...
1313

1414
## 软件特性
1515
基于libXEngine开发并实现的一套简洁高性能跨平台网络存储服务
@@ -120,7 +120,10 @@ jsoncpp模块在使用的时候编译运行时库选择必须一致.否则会崩
120120
4. 新建 Pull Request
121121

122122
## 关注我们
123-
如果你觉得这个软件对你有帮助,请你给我们一个START吧
123+
124+
如果你觉得这个软件对你有帮助,请你给我们一个START吧  
125+
也可以通过微信关注我们  
126+
![qrcode](https://www.xyry.org/qrcode.jpg)
124127

125128
## 提交问题
126129

XEngine_APPClient/APPClient_Download/APPClient_Download.cpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,15 @@ typedef struct
4848
void P2PParse_List(LPCXSTR lpszMsgBuffer, int nMsgLen, list<P2PFILE_INFO>* pStl_ListFile)
4949
{
5050
Json::Value st_JsonRoot;
51-
Json::CharReaderBuilder st_JsonBuild;
52-
Json::CharReader* pSt_JsonReader(st_JsonBuild.newCharReader());
53-
5451
JSONCPP_STRING st_JsonError;
52+
Json::CharReaderBuilder st_JsonBuilder;
53+
54+
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
5555
//解析JSON
5656
if (!pSt_JsonReader->parse(lpszMsgBuffer, lpszMsgBuffer + nMsgLen, &st_JsonRoot, &st_JsonError))
5757
{
5858
return;
5959
}
60-
delete pSt_JsonReader;
61-
pSt_JsonReader = NULL;
6260

6361
int nCount = st_JsonRoot["Count"].asInt();
6462
Json::Value st_JsonArray = st_JsonRoot["List"];
@@ -174,7 +172,7 @@ int main()
174172
st_JsonRoot["nMode"] = 1; //使用P2P下载
175173
st_JsonRoot["lpszBuckKey"] = "storagekey2";
176174
//st_JsonRoot["lpszFileName"] = "qq.exe";
177-
st_JsonRoot["lpszFileHash"] = "781E5E245D69B566979B86E28D23F2C7";
175+
st_JsonRoot["lpszFileHash"] = "E50A10E2C9414F0397FF85393A6F68C9";
178176

179177
if (!APIClient_Http_Request(_X("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nHTTPCode, &ptszMsgBody, &nBodyLen))
180178
{
@@ -185,6 +183,10 @@ int main()
185183
list<P2PFILE_INFO> stl_ListFile;
186184
P2PParse_List(ptszMsgBody, nBodyLen, &stl_ListFile);
187185

186+
if (stl_ListFile.empty())
187+
{
188+
return -1;
189+
}
188190
//创建稀疏文件(一个空白的文件)
189191
if (!SystemApi_File_CreateSparseFile(lpszFile, stl_ListFile.front().st_ProtocolFile.nFileSize))
190192
{

XEngine_APPClient/VSCopy_x64.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
66

77
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\zlib1.dll" "./"
88
copy /y "%XEngine_Lib64%\XEngine_LibEx\libcrypto-3-x64.dll" "./"
9-
copy /y "%XEngine_Lib64%\XEngine_LibEx\libssl-3.dll-x64" "./"
10-
copy /y "%XEngine_Lib64%\XEngine_LibEx\libcurl.dll" "./"
11-
copy /y "%XEngine_Lib64%\XEngine_LibEx\nghttp2.dll" "./"
9+
copy /y "%XEngine_Lib64%\XEngine_LibEx\libssl-3-x64.dll" "./"
10+
copy /y "%XEngine_Lib64%\XEngine_NetHelp\libcurl.dll" "./"
11+
copy /y "%XEngine_Lib64%\XEngine_NetHelp\nghttp2.dll" "./"

XEngine_APPClient/VSCopy_x86.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
77
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\zlib1.dll" "./"
88
copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
99
copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
10-
copy /y "%XEngine_Lib32%\XEngine_LibEx\libcurl.dll" "./"
11-
copy /y "%XEngine_Lib32%\XEngine_LibEx\nghttp2.dll" "./"
10+
copy /y "%XEngine_Lib32%\XEngine_NetHelp\libcurl.dll" "./"
11+
copy /y "%XEngine_Lib32%\XEngine_NetHelp\nghttp2.dll" "./"

XEngine_Docment/Docment_en.docx

159 Bytes
Binary file not shown.

XEngine_Docment/Docment_zh.docx

99 Bytes
Binary file not shown.

XEngine_Release/XEngine_Config/XEngine_Config.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"tszIPAddr":"192.168.1.8",
2+
"tszIPAddr":"10.0.1.88",
33
"bDeamon":0,
44
"nCenterPort":5100,
55
"nStorageDLPort":5101,
@@ -39,7 +39,7 @@
3939
"XAuth":{
4040
"bUPAuth":false,
4141
"bDLAuth":false,
42-
"bCHAuth":true,
42+
"bCHAuth":false,
4343
"tszUserList":"./XEngine_Config/UserList.txt"
4444
},
4545
"XProxy":{
@@ -58,6 +58,7 @@
5858
"nMaxDNConnect":2
5959
},
6060
"XP2xp":{
61+
"bEnable":true,
6162
"nTime":2,
6263
"nRVPort":15000,
6364
"nSDPort":15001
@@ -71,6 +72,7 @@
7172
"tszCertKey":"./XEngine_Cert/2_www.xyry.org.key"
7273
},
7374
"XVer":[
75+
"3.12.0.1001 Build20231025",
7476
"3.11.1.1001 Build20230804",
7577
"3.11.0.1001 Build20230421",
7678
"3.10.0.1001 Build20230210",

XEngine_Release/XEngine_Config/XEngine_LBConfig.json

-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
{
2-
"bDistributed":1,
32
"LBDistributed":{
4-
"nCenterMode":0,
53
"nUPLoadMode":0,
64
"nDownldMode":0,
75
"nStorageMode":0
86
},
97
"LBLocation":{
10-
"nCenterMode":0,
118
"nUPLoadMode":1,
129
"nDownldMode":0,
1310
"nStorageMode":0
1411
},
1512
"LoadBalance":{
16-
"CenterAddr":[
17-
"http://192.168.1.9:5100"
18-
],
1913
"DownloadAddr":[
2014
"http://192.168.1.9:5010"
2115
],

XEngine_Source/StorageModule_APIHelp/pch.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <tchar.h>
@@ -59,7 +59,7 @@ using namespace std;
5959
extern bool APIHelp_IsErrorOccur;
6060
extern XLONG APIHelp_dwErrorCode;
6161

62-
#ifdef _WINDOWS
62+
#ifdef _MSC_BUILD
6363
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6464
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
6565
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol")

0 commit comments

Comments
 (0)