Merge pull request #11 from libxengine/develop

V2.8.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,15 @@
+XEngine_APIService V2.8.0.1001
+
+添加:二维码识别与创建功能
+添加:网络测试与数据验证功能
+修改:现在错误请求会响应
+修正:http请求的日志打印标记不正确
+
+added:qr code parse and create
+added:network test
+modify:reply failed requestion now
+fixed:http request log flag is incorrent
+======================================================================================
 XEngine_APIService V2.7.0.1001
 
 增加:日志信息操作API相关函数

README.en.md

@@ -33,12 +33,12 @@ Support privatization deployment, free, safe, open source, controllable
 13. Administrative zip code
 14. Bank card verification
 15. Exchange rate calculation (planned)
-16. QR code generation and parse (planned)
+16. QR code generation and parse
 17. Simplified and Traditional Conversion
 18. Twenty-four solar terms (planned)
 19. Xinhua Dictionary
 20. Metering Conversion
-21. CDKey Creator
+21. network test
 22. Distributed lock
 23. short url creator(planned)
 24. local system time
@@ -64,7 +64,7 @@ MYSQL database version 8.0 or above is required. Create a table through CreateDa
 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  
+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 opencv[contrib] libqrencode opencv[contrib]:x64-windows libqrencode:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 
@@ -176,29 +176,6 @@ api:http://app.xyry.org:5501/api?function=translation&params1=中国&params2=0
     "msg":"success"
 }
 ```
-Authorize CDKey  
-Api:http://app.xyry.org:5501/api?function=cdkey&params1=0
-```json
-{
-    "tszAddr":"服务器地址",
-    "nPort":5000,
-    "st_AuthAppInfo":{
-        "tszAppName":"自定义名称",
-        "tszAppVer":"自定义版本"
-    },
-    "st_AuthRegInfo":{
-        "tszHardware":"硬件吗",
-        "enSerialType":1,
-        "enRegType":1,
-        "enHWType":1
-    },
-    "st_AuthUserInfo":{
-        "tszUserName":"注册的用户名",
-        "tszUserContact":"联系方式",
-        "tszCustom":"自定义,可选参数"
-    }
-}
-```
 Distributed Lock  
 Api:http://app.xyry.org:5501/api?function=lock&params1=1000154321&params2=1
 ```json
@@ -210,6 +187,27 @@ Api:http://app.xyry.org:5501/api?function=lock&params1=1000154321&params2=1
     "msg":"success"
 }
 ```
+ZIPCode  
+Api:http://app.xyry.org:5501/api?function=zipcode&params1=0  
+```json
+{
+    "nZipCode":100010
+}
+```
+Log  
+Api:http://app.xyry.org:5501/api?function=log&params1=1  
+```json
+{
+    "tszTableName":"xengine",
+    "tszLogBuffer":"d12d",
+    "nLogSize":4,
+    "tszFileName":"file.cpp",
+    "tszFuncName":"xengine_file_insert",
+    "tszLogTimer":"2023-01-13 22:10:01",
+    "nLogLine":102,
+    "nLogLevel":4
+}
+```
 ## Participate in contribution
 I hope you will submit more code to participate in the contribution  
 

README.md

@@ -33,12 +33,12 @@ c c++ interface api service
 13. 行政邮编
 14. 银行卡验证
 15. 汇率计算(计划中)
-16. 二维码生成解析(计划中)
+16. 二维码生成解析
 17. 简繁转换
 18. 二十四节气(计划中)
 19. 新华词典
 20. 计量转换
-21. CDKey创建支持
+21. 网络测试
 22. 分布式锁API
 23. 短连接生成(计划中)
 24. 本地标准时间
@@ -64,12 +64,12 @@ macos执行:./XEngine_LINEnv.sh -i 3
 修改配置文件里面XSQL里面的数据库配置为你的  
 
 #### Windows
-需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua lua:x64-windows opencc opencc:x64-windows  
+需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua lua:x64-windows opencc opencc:x64-windows opencv[contrib] libqrencode opencv[contrib]:x64-windows libqrencode:x64-windows  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可
 
 #### Linux
-ubuntu:sudo apt install liblua5.3-dev libopencc-dev  
+ubuntu:sudo apt install liblua5.3-dev libopencc-dev libopencv-dev libopencv-contrib-dev libqrencode-dev  
 centos:需要自己编译  
 Linux使用Makefile编译,UBUNTU20.04 x64或者CENTOS8 x64  
 在控制台运行
@@ -174,29 +174,6 @@ make FLAGS=CleanAll 清理编译
     "msg":"success"
 }
 ```
-CDKey授权  
-接口:http://app.xyry.org:5501/api?function=cdkey&params1=0
-```json
-{
-    "tszAddr":"服务器地址",
-    "nPort":5000,
-    "st_AuthAppInfo":{
-        "tszAppName":"自定义名称",
-        "tszAppVer":"自定义版本"
-    },
-    "st_AuthRegInfo":{
-        "tszHardware":"硬件吗",
-        "enSerialType":1,
-        "enRegType":1,
-        "enHWType":1
-    },
-    "st_AuthUserInfo":{
-        "tszUserName":"注册的用户名",
-        "tszUserContact":"联系方式",
-        "tszCustom":"自定义,可选参数"
-    }
-}
-```
 分布式锁  
 接口:http://app.xyry.org:5501/api?function=lock&params1=1000154321&params2=1
 ```json
@@ -208,6 +185,27 @@ CDKey授权
     "msg":"success"
 }
 ```
+行政邮编  
+接口:http://app.xyry.org:5501/api?function=zipcode&params1=0  
+```json
+{
+    "nZipCode":100010
+}
+```
+日志操作  
+接口:http://app.xyry.org:5501/api?function=log&params1=1  
+```json
+{
+    "tszTableName":"xengine",
+    "tszLogBuffer":"d12d",
+    "nLogSize":4,
+    "tszFileName":"file.cpp",
+    "tszFuncName":"xengine_file_insert",
+    "tszLogTimer":"2023-01-13 22:10:01",
+    "nLogLine":102,
+    "nLogLevel":4
+}
+```
 ## 参与贡献
 希望大家多多提交代码参与贡献  
 

XEngine_APPClient/APPClient_CDKeyExample/APPClient_CDKeyExample.cpp

@@ -0,0 +1,95 @@
+#ifdef _MSC_BUILD
+#include <Windows.h>
+#include <tchar.h>
+#pragma comment(lib,"Ws2_32")
+#pragma comment(lib,"jsoncpp")
+#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <json/json.h>
+#include <XEngine_Include/XEngine_CommHdr.h>
+#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/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
+
+//需要优先配置XEngine
+//WINDOWS支持VS2022 x64 debug 编译调试
+//linux::g++ -std=c++17 -Wall -g APPClient_QRExample.cpp -o APPClient_QRExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient
+//macos::g++ -std=c++17 -Wall -g APPClient_QRExample.cpp -o APPClient_QRExample.exe -lXEngine_BaseLib -lNetHelp_APIClient
+
+#define QRCODE_BUFFER_SIZE 1024 * 1024 * 10
+
+LPCTSTR lpszFileName = _T("D:\\XEngine_APIService\\XEngine_APPClient\\x64\\Debug\\1.png");
+
+int test_create()
+{
+	int nLen = 0;
+	int nCode = 0;
+	LPCTSTR lpszAPIUrl = _T("http://127.0.0.1:5501/api?function=qrcode&params1=0");
+
+	Json::Value st_JsonRoot;
+	st_JsonRoot["tszMsgBuffer"] = lpszAPIUrl;
+	st_JsonRoot["tszFmtBuffer"] = ".png";
+
+	TCHAR* ptszMsgBuffer = NULL;
+	if (!APIClient_Http_Request(_T("POST"), lpszAPIUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	{
+		printf("发送投递失败！\n");
+		return 0;
+	}
+	FILE* pSt_File = fopen(lpszFileName, "wb");
+	if (NULL != pSt_File)
+	{
+		fwrite(ptszMsgBuffer, 1, nLen, pSt_File);
+		fclose(pSt_File);
+	}
+	printf("接受到数据,大小:%d,内容:%s\n", nLen, ptszMsgBuffer);
+	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+
+	return 0;
+}
+int test_parse()
+{
+	int nCode = 0;
+	TCHAR* ptszMsgBuffer = (TCHAR*)malloc(QRCODE_BUFFER_SIZE);
+
+	LPCTSTR lpszAPIUrl = _T("http://127.0.0.1:5501/api?function=qrcode&params1=1");
+	FILE* pSt_File = fopen(lpszFileName, "rb");
+	if (NULL != pSt_File)
+	{
+		LPCTSTR lpszCustomHdr = _T("Content-Type: image/png\r\n");
+		memset(ptszMsgBuffer, '\0', QRCODE_BUFFER_SIZE);
+		int nRet = fread(ptszMsgBuffer, 1, QRCODE_BUFFER_SIZE, pSt_File);
+		
+		TCHAR* ptszBodyBuffer = NULL;
+		if (!APIClient_Http_Request(_T("POST"), lpszAPIUrl, ptszMsgBuffer, &nCode, &ptszBodyBuffer, &nRet, lpszCustomHdr))
+		{
+			printf("发送投递失败！\n");
+			return 0;
+		}
+		printf("接受到数据,大小:%d,内容:%s\n", nRet, ptszBodyBuffer);
+		BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszBodyBuffer);
+	}
+	return 0;
+}
+
+int main()
+{
+#ifdef _MSC_BUILD
+	WSADATA st_WSAData;
+	WSAStartup(MAKEWORD(2, 2), &st_WSAData);
+#endif
+	test_create();
+	test_parse();
+
+#ifdef _MSC_BUILD
+	WSACleanup();
+#endif
+	return 0;
+}