Merge pull request #10 from libxengine/develop

V2.7.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,27 @@
+XEngine_APIService V2.7.0.1001
+
+增加:日志信息操作API相关函数
+增加:时间信息获取lua脚本
+优化:扩展了HTTP参数缓存大小
+优化:HTTP请求函数
+修改:ip查询功能修改为模块插件
+修改:电话查询功能修改为模块插件
+修改:数据库从SQLITE改为MYSQL
+修正:id和银行查询打包中文不正确的问题
+删除:cdkey相关API函数库
+删除:SQLITE相关代码
+
+added:log info support
+added:time plugin of lua
+improved:extend http parament cache size
+improved:http request function
+modify:ipaddr query modify to plugin of module
+modify:phone number query modify to plugin of module
+modify:database to mysql from sqlite
+fixed:id and bank query packet chinese is incorrent
+delete:cdkey functions
+delete:sqlite db
+======================================================================================
 XEngine_APIService V2.6.1.1001
 
 修正:在linux系统下无法加载模块插件的问题

COPYRIGHT

@@ -1,4 +1,8 @@
                         the open source software depend on the following libraries, please note the copyright
 XEngine:https://gitee.com/xyry/libxengine or https://github.com/libxengine/xengine
 jsoncpp:https://github.com/open-source-parsers/jsoncpp
-opencc:https://github.com/BYVoid/OpenCC
+opencc:https://github.com/BYVoid/OpenCC
+
+data sources:
+IP:https://github.com/lionsoul2014/ip2region
+Phone:https://github.com/xluohome/phonedata

README.en.md

@@ -19,7 +19,7 @@ Support privatization deployment, free, safe, open source, controllable
 
 ## Software feature
 1. permission verication
-2. support ip address location information query(IPV4 and IPV6)
+2. support ip address location information query
 3. support ID verification and information query
 4. support phone number information query
 5. Weather forecast (planned)
@@ -40,10 +40,11 @@ Support privatization deployment, free, safe, open source, controllable
 20. Metering Conversion
 21. CDKey Creator
 22. Distributed lock
-23. short url creator
+23. short url creator(planned)
 24. local system time
 25. math Calculation
-26. log service(plan)
+26. log service
+27. Plugin hot reload(planned)
 
 ## install
 
@@ -58,13 +59,17 @@ window Exection XEngine_WINEnv.bat
 Linux Exection:sudo ./XEngine_LINEnv.sh -i 3  
 Macos Exection:./XEngine_LINEnv.sh -i 3
 
+#### Database Env
+MYSQL database version 8.0 or above is required. Create a table through CreateDatabase.sql, and then import the table with XEngine_APIInfo.sql  
+Modify the database configuration in XSQL in the configuration file to your  
+
 #### Windows
 need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua lua:x64-windows opencc opencc:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 
 #### Linux
-install opencc,ubuntu:sudo apt install libopencc-dev  
+ubuntu:sudo apt install libopencc-dev  
 centos:compile by self  
 use makefile compile,UBUNTU20.04 x64 or CENTOS8 x64  
 Run it on the terminal
@@ -111,41 +116,6 @@ You can refer to the document under the docment directory. It contains API proto
 Address:app.xyry.org,Port:5501  
 #### example
 For more information please refer to the documentation  
-phone information query  
-api:http://app.xyry.org:5501/api?function=phone&params1=13699439999
-```json
-{
-    "code":0,
-    "data":{
-        "nAreaCode":28,
-        "nPhoneNumber":13699439999,
-        "nZipCode":610000,
-        "tszCity":"成都",
-        "tszProvincer":"四川"
-    },
-    "msg":"success"
-}
-```
-ip address information  
-api:http://app.xyry.org:5501/api?function=ip&params1=1.29.164.255
-```json
-{
-    "code":0,
-    "data":{
-        "tszIPAddr":"1.29.164.255",
-        "tszIPAddress":"内蒙古通辽市霍林郭勒市",
-        "tszIPCity":"通辽市",
-        "tszIPCountry":"中国",
-        "tszIPCounty":"霍林郭勒市",
-        "tszIPEnd":"1.29.164.255",
-        "tszIPISP":"联通",
-        "tszIPProvince":"内蒙古",
-        "tszIPStart":"1.29.164.0",
-        "tszIPTime":"2021-11-03 07:33:50"
-    },
-    "msg":"success"
-}
-```
 id information query  
 api:http://app.xyry.org:5501/api?function=id&params1=511025198800000000
 ```json

README.md

@@ -19,7 +19,7 @@ c c++ interface api service
 
 ## 软件特性
 1. 权限验证
-2. 支持IP地址位置信息查询(IPV4和IPV6)
+2. 支持IP地址位置信息查询
 3. 支持身份证校验与信息查询
 4. 支持手机号信息归属查询
 5. 天气预报(计划中)
@@ -40,10 +40,11 @@ c c++ interface api service
 20. 计量转换
 21. CDKey创建支持
 22. 分布式锁API
-23. 短连接生成
+23. 短连接生成(计划中)
 24. 本地标准时间
 25. 数学计算
-26. 日志服务(计划中)
+26. 日志服务
+27. 插件脚本热重载(计划中)
 
 ## 安装教程
 
@@ -58,13 +59,17 @@ window执行XEngine_WINEnv.bat 脚本.
 Linux执行:sudo ./XEngine_LINEnv.sh -i 3  
 macos执行:./XEngine_LINEnv.sh -i 3  
 
+#### 数据库环境
+需要MYSQL数据库8.0以上版本.通过CreateDatabase.sql创建表,然后XEngine_APIInfo.sql导入表  
+修改配置文件里面XSQL里面的数据库配置为你的  
+
 #### Windows
 需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua lua:x64-windows opencc opencc:x64-windows  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可
 
 #### Linux
-安装opencc,ubuntu:sudo apt install liblua5.3-dev libopencc-dev  
+ubuntu:sudo apt install liblua5.3-dev libopencc-dev  
 centos:需要自己编译  
 Linux使用Makefile编译,UBUNTU20.04 x64或者CENTOS8 x64  
 在控制台运行
@@ -109,41 +114,6 @@ make FLAGS=CleanAll 清理编译
 
 #### 测试接口示例
 更多内容请参考文档  
-手机信息查询  
-接口:http://app.xyry.org:5501/api?function=phone&params1=13699439999
-```json
-{
-    "code":0,
-    "data":{
-        "nAreaCode":28,
-        "nPhoneNumber":13699439999,
-        "nZipCode":610000,
-        "tszCity":"成都",
-        "tszProvincer":"四川"
-    },
-    "msg":"success"
-}
-```
-IP地址查询  
-接口:http://app.xyry.org:5501/api?function=ip&params1=1.29.164.255
-```json
-{
-    "code":0,
-    "data":{
-        "tszIPAddr":"1.29.164.255",
-        "tszIPAddress":"内蒙古通辽市霍林郭勒市",
-        "tszIPCity":"通辽市",
-        "tszIPCountry":"中国",
-        "tszIPCounty":"霍林郭勒市",
-        "tszIPEnd":"1.29.164.255",
-        "tszIPISP":"联通",
-        "tszIPProvince":"内蒙古",
-        "tszIPStart":"1.29.164.0",
-        "tszIPTime":"2021-11-03 07:33:50"
-    },
-    "msg":"success"
-}
-```
 身份证查询  
 接口:http://app.xyry.org:5501/api?function=id&params1=511025198800000000
 ```json

XEngine_APPClient/APPClient_BankExample/APPClient_BankExample.cpp

@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,13 +13,13 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
 //linux使用下面的命令编译
-//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_APIHelp
+//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
 
 int main()
 {
@@ -31,7 +31,7 @@ int main()
 	TCHAR* ptszMsgBuffer = NULL;
 	LPCTSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=bank&params1=6214111100184841&params2=0");
 
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;

XEngine_APPClient/APPClient_CDKeyExample/APPClient_CDKeyExample.cpp

@@ -5,7 +5,7 @@
 #pragma comment(lib,"jsoncpp")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_Authorize")
 #endif
 #include <stdio.h>
@@ -19,15 +19,15 @@
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
 #include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
 #include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/Authorize_Define.h>
 #include <XEngine_Include/XEngine_HelpComponents/Authorize_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
-//linux::g++ -std=c++17 -Wall -g APPClient_CDKeyExample.cpp -o APPClient_CDKeyExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIHelp -lHelpComponents_Authorize
-//macos::g++ -std=c++17 -Wall -g APPClient_CDKeyExample.cpp -o APPClient_CDKeyExample.exe -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIHelp -lHelpComponents_Authorize
+//linux::g++ -std=c++17 -Wall -g APPClient_CDKeyExample.cpp -o APPClient_CDKeyExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -lHelpComponents_Authorize
+//macos::g++ -std=c++17 -Wall -g APPClient_CDKeyExample.cpp -o APPClient_CDKeyExample.exe -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -lHelpComponents_Authorize
 
 int main()
 {
@@ -63,7 +63,7 @@ int main()
 
 	TCHAR* ptszCreateBuffer = NULL;
 	TCHAR* ptszAuthBuffer = NULL;
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszCreateUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszCreateBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszCreateUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszCreateBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;
@@ -77,7 +77,7 @@ int main()
 	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszCreateBuffer);
 
 	LPCTSTR lpszAuthUrl = _T("http://127.0.0.1:5501/api?function=cdkey&params1=1&params2=123123");
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszAuthUrl, tszMsgBuffer, &nCode, &ptszAuthBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszAuthUrl, tszMsgBuffer, &nCode, &ptszAuthBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;

XEngine_APPClient/APPClient_IDExample/APPClient_IDExample.cpp

@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,13 +13,13 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
 //linux使用下面的命令编译
-//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_APIHelp
+//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
 
 int main()
 {
@@ -31,7 +31,7 @@ int main()
 	TCHAR* ptszMsgBuffer = NULL;
 	LPCTSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=id&params1=511025191101018792&params2=0");
 
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;

XEngine_APPClient/APPClient_IPExample/APPClient_IPExample.cpp

@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,13 +13,13 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
 //linux使用下面的命令编译
-//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_APIHelp
+//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
 
 int main()
 {
@@ -31,7 +31,7 @@ int main()
 	TCHAR* ptszMsgBuffer = NULL;
 	LPCTSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=ip&params1=1.29.164.255&params2=0");
 
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;

XEngine_APPClient/APPClient_LanguageExample/APPClient_LanguageExample.cpp

@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,13 +13,13 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
 //linux使用下面的命令编译
-//g++ -std=c++17 -Wall -g APPClient_LanguageExample.cpp -o APPClient_LanguageExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIHelp
+//g++ -std=c++17 -Wall -g APPClient_LanguageExample.cpp -o APPClient_LanguageExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
 
 int main()
 {
@@ -31,7 +31,7 @@ int main()
 	TCHAR* ptszMsgBuffer = NULL;
 	LPCTSTR lpszUrl = _T("http://127.0.0.1:5501/api?function=language&params1=简体&params2=0&param3=1");
 
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;