Skip to content

Commit 861f755

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #19 from libxengine/develop
V3.3.0.1001 Merge
2 parents 822e615 + 6001efc commit 861f755

File tree

78 files changed

+1342
-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.

78 files changed

+1342
-309
lines changed

‎CHANGELOG‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
XEngine_APIService V3.3.0.1001
2+
3+
增加:行政区域ID转换支持
4+
增加:天气信息查询支持
5+
增加:图像质量和压缩级别设置支持
6+
增加:日志表枚举支持
7+
更新:匹配XEngine V8.25版本
8+
修改:后台下载服务不需要等待完成即可返回消息了
9+
修改:后台上传服务不需要等待完成即可返回消息了
10+
修改:在进入HTTPTask_TastPost_Handle函数就进行解码了
11+
修复:创建日志表错误的问题
12+
修复:日志表字符集不正确的问题
13+
修复:日志协议删除表协议错误
14+
15+
added:id region convert supported
16+
added:weather info query supported
17+
added:image quality and compress level set supported
18+
added:list xlog database table supported
19+
update:match xengine v8.25
20+
modify:does not wait completed reply msg for download of back service
21+
modify:does not wait completed reply msg for upload of back service
22+
modify:after entering the HTTPTask_TastPost_Handle function, the url encoding starts to be processed.
23+
fixed:create log table is incorrect
24+
fixed:log table charsets is incorrect
25+
fixed:log protocol delete table is incorrect
26+
======================================================================================
127
XEngine_APIService V3.2.0.1001
228

329
增加:编译开关日志提示

‎README.en.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Support privatization deployment, free, safe, open source, controllable
2323
2. support ip address location information query
2424
3. support ID verification and information query
2525
4. support phone number information query
26-
5. Weather forecast (planned)
26+
5. Weather forecast
2727
6. Lunar calendar conversion (planning)
2828
7. News headlines (planned)
2929
8. Standard height and weight
@@ -49,7 +49,7 @@ Support privatization deployment, free, safe, open source, controllable
4949
28. remote control(back management)
5050
29. Image Process
5151
30. process deamon
52-
52+
31. Region ID Convert
5353
## install
5454

5555
#### XEngine Evn

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ c c++ interface api service
2222
2. 支持IP地址位置信息查询
2323
3. 支持身份证校验与信息查询
2424
4. 支持手机号信息归属查询
25-
5. 天气预报(计划中)
25+
5. 天气预报
2626
6. 农历公历转换(计划中)
2727
7. 新闻头条(计划中)
2828
8. 标准身高体重
@@ -48,6 +48,7 @@ c c++ interface api service
4848
28. 远程控制(后台管理)
4949
29. 图像处理
5050
30. 进程守护
51+
31. 行政区域ID转换
5152

5253
## 安装教程
5354

@@ -123,6 +124,9 @@ make FLAGS=CleanAll 清理编译
123124
## 其他问题
124125
你可以参考docment目录下的文档.里面包含了API协议和服务说明.
125126

127+
## 视频教程
128+
你也可以观看视频教程来了解我们的代码框架情况:https://www.bilibili.com/video/BV13z421d7W8
129+
126130
## 测试服务器
127131
地址:app.xyry.org,端口:5501
128132

‎XEngine_APPClient/APPClient_BackExample/APPClient_BackExample.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"jsoncpp")
66
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
7-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
7+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
88
#endif
99
#include <stdio.h>
1010
#include <stdlib.h>
@@ -16,13 +16,12 @@
1616
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1717
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1818
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
19-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
20-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
19+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
20+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2121

2222
//需要优先配置XEngine
2323
//WINDOWS支持VS2022 x64 debug 编译调试
24-
//linux::g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
25-
//macos::g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -lXEngine_BaseLib -lNetHelp_APIClient
24+
//g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -lXEngine_BaseLib -lXClient_APIHelp
2625

2726

2827
int test_query()

‎XEngine_APPClient/APPClient_BankExample/APPClient_BankExample.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#endif
88
#include <stdio.h>
99
#include <stdlib.h>
@@ -13,13 +13,13 @@
1313
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1414
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1515
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
16-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
17-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
16+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
17+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
1818

1919
//需要优先配置XEngine
2020
//WINDOWS支持VS2022 x64 debug 编译调试
2121
//linux使用下面的命令编译
22-
//g++ -std=c++17 -Wall -g APPClient_BankExample.cpp -o APPClient_BankExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
22+
//g++ -std=c++17 -Wall -g APPClient_BankExample.cpp -o APPClient_BankExample.exe -lXEngine_BaseLib -lXClient_APIHelp
2323

2424
int main()
2525
{
@@ -29,9 +29,9 @@ int main()
2929
#endif
3030
int nLen = 0;
3131
XCHAR* ptszMsgBuffer = NULL;
32-
LPCXSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=bank&params1=6214111100184841&params2=0");
32+
LPCXSTR lpszUrl = _X("http://127.0.0.1:5501/api?function=bank&params1=6214111100184841&params2=0");
3333

34-
if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
34+
if (!APIClient_Http_Request(_X("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
3535
{
3636
printf("发送投递失败！\n");
3737
return 0;

‎XEngine_APPClient/APPClient_DTestExample/APPClient_DTestExample.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#endif
88
#include <stdio.h>
99
#include <stdlib.h>
@@ -13,13 +13,13 @@
1313
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1414
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1515
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
16-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
17-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
16+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
17+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
1818

1919
//需要优先配置XEngine
2020
//WINDOWS支持VS2022 x64 debug 编译调试
2121
//linux使用下面的命令编译
22-
//g++ -std=c++17 -Wall -g APPClient_DTestExample.cpp -o APPClient_DTestExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
22+
//g++ -std=c++17 -Wall -g APPClient_DTestExample.cpp -o APPClient_DTestExample.exe -lXEngine_BaseLib -lXClient_APIHelp
2323

2424
int main()
2525
{
@@ -29,9 +29,9 @@ int main()
2929
#endif
3030
int nLen = 0;
3131
XCHAR* ptszMsgBuffer = NULL;
32-
LPCXSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=dtest&params1=0");
32+
LPCXSTR lpszUrl = _X("http://127.0.0.1:5501/api?function=dtest&params1=0");
3333

34-
if (!APIClient_Http_Request(_T("POST"), lpszUrl, "hello", NULL, &ptszMsgBuffer, &nLen))
34+
if (!APIClient_Http_Request(_X("POST"), lpszUrl, "hello", NULL, &ptszMsgBuffer, &nLen))
3535
{
3636
printf("发送投递失败！\n");
3737
return 0;

‎XEngine_APPClient/APPClient_DeamonExample/APPClient_DeamonExample.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"jsoncpp")
66
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
7-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
7+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
88
#endif
99
#include <stdio.h>
1010
#include <stdlib.h>
@@ -16,13 +16,12 @@
1616
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1717
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1818
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
19-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
20-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
19+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
20+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2121

2222
//需要优先配置XEngine
2323
//WINDOWS支持VS2022 x64 debug 编译调试
24-
//linux::g++ -std=c++17 -Wall -g APPClient_DeamonExample.cpp -o APPClient_DeamonExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp
25-
//macos::g++ -std=c++17 -Wall -g APPClient_DeamonExample.cpp -o APPClient_DeamonExample.exe -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp
24+
//g++ -std=c++17 -Wall -g APPClient_DeamonExample.cpp -o APPClient_DeamonExample.exe -lXEngine_BaseLib -lXClient_APIHelp -ljsoncpp
2625

2726

2827
int test_insert()
@@ -35,8 +34,8 @@ int test_insert()
3534
Json::Value st_JsonRoot;
3635
st_JsonRoot["bEnable"] = true;
3736
st_JsonRoot["nRetime"] = 3;
38-
st_JsonRoot["tszAPPName"] = "1.exe";
39-
st_JsonRoot["tszAPPPath"] = "D:\\path\\";
37+
st_JsonRoot["tszAPPName"] = "Fairdell_HexCmp2.exe";
38+
st_JsonRoot["tszAPPPath"] = "D:\\";
4039

4140
if (!APIClient_Http_Request(_X("POST"), lpszAPIUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
4241
{

‎XEngine_APPClient/APPClient_IDExample/APPClient_IDExample.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#endif
88
#include <stdio.h>
99
#include <stdlib.h>
@@ -13,13 +13,13 @@
1313
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1414
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1515
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
16-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
17-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
16+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
17+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
1818

1919
//需要优先配置XEngine
2020
//WINDOWS支持VS2022 x64 debug 编译调试
2121
//linux使用下面的命令编译
22-
//g++ -std=c++17 -Wall -g APPClient_IDExample.cpp -o APPClient_IDExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
22+
//g++ -std=c++17 -Wall -g APPClient_IDExample.cpp -o APPClient_IDExample.exe -lXEngine_BaseLib -lXClient_APIHelp
2323

2424
int main()
2525
{
@@ -29,9 +29,9 @@ int main()
2929
#endif
3030
int nLen = 0;
3131
XCHAR* ptszMsgBuffer = NULL;
32-
LPCXSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=id&params1=511025191101018792&params2=0");
32+
LPCXSTR lpszUrl = _X("http://127.0.0.1:5501/api?function=id&params1=511025191101018792&params2=0");
3333

34-
if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
34+
if (!APIClient_Http_Request(_X("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
3535
{
3636
printf("发送投递失败！\n");
3737
return 0;

‎XEngine_APPClient/APPClient_IPExample/APPClient_IPExample.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#endif
88
#include <stdio.h>
99
#include <stdlib.h>
@@ -13,13 +13,13 @@
1313
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1414
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1515
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
16-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
17-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
16+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
17+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
1818

1919
//需要优先配置XEngine
2020
//WINDOWS支持VS2022 x64 debug 编译调试
2121
//linux使用下面的命令编译
22-
//g++ -std=c++17 -Wall -g APPClient_IPExample.cpp -o APPClient_IPExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
22+
//g++ -std=c++17 -Wall -g APPClient_IPExample.cpp -o APPClient_IPExample.exe -lXEngine_BaseLib -lXClient_APIHelp
2323

2424
int main()
2525
{
@@ -29,9 +29,9 @@ int main()
2929
#endif
3030
int nLen = 0;
3131
XCHAR* ptszMsgBuffer = NULL;
32-
LPCXSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=ip&params1=1.29.164.255&params2=0");
32+
LPCXSTR lpszUrl = _X("http://127.0.0.1:5501/api?function=ip&params1=1.29.164.255&params2=0");
3333

34-
if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
34+
if (!APIClient_Http_Request(_X("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
3535
{
3636
printf("发送投递失败！\n");
3737
return 0;

‎XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma comment(lib,"Ws2_32")
55
#pragma comment(lib,"jsoncpp")
66
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
7-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
7+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
88
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
99
#endif
1010
#include <stdio.h>
@@ -17,16 +17,15 @@
1717
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1818
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1919
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
20-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
21-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
20+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
21+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2222
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
2323
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
2424
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
2525

2626
//需要优先配置XEngine
2727
//WINDOWS支持VS2022 x64 debug 编译调试
28-
//linux::g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
29-
//macos::g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -lXEngine_BaseLib -lNetHelp_APIClient
28+
//g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -lXEngine_BaseLib -lXClient_APIHelp
3029

3130

3231
bool APPClient_ImageExample_GetAttr(LPCXSTR lpszMsgBuffer, int nMsgLen, int* pInt_Width, int* pInt_Height)

0 commit comments

Comments
 (0)