Merge pull request #17 from libxengine/develop

V3.1.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,47 @@
+XEngine_APIService V3.1.0.1001
+
+增加:为opencv和qr增加自定义编译开关
+增加:p2xp用户离开和万维网ip地址获取,心跳协议支持
+修改:自动启动仅仅运行在管理员模式下
+修改:用户验证配置为子级别了
+修改:当禁用守护进程的时候会停止进程
+修改:屏幕录像现在可以设置设备名称了
+修改:当图像处理失败会回复消息
+修改:图像处理错误方法
+修改:所有配置文件被指定到主配置中了
+修改:配置重载支持opencc,qr,deamon了
+修改:p2xp协议的connect字段不在作为key使用
+修正:qr码识别不支持linux的问题
+修正:日志配置没有作用的问题
+修正:p2p的delete和心跳不争取的问题
+修正:图像设置http参数解析不正确的问题
+修正:图像的宽高参数解析错误
+修正:windows隐藏窗口不正确的问题
+删除:没有使用的p2p协议代码
+删除:p2p的获取用户信息协议和链接协议
+删除:没有使用的内存代码
+
+added:custom build switch for opencv and qr
+added:p2p delete client and wan address get and heartbeat supported
+modify:Autostart only run with administrator privileges
+modify:user ver configure node level
+modify:stop process when disable deamon process
+modify:screen record can be set device name
+modify:reply message when process failed for image
+modify:image process error way
+modify:All configuration files are specified by the master configuration
+modify:configure reload supports opencc and qr and deamon now
+modify:p2xp does not use connect address as a key.
+fixed:qr not support linux platform
+fixed:log configure does not work
+fixed:delete and heart p2xp not work
+fixed:image set http parament parse is incorrent
+fixed:image width and heigth parament is incorrent
+fixed:hide window is incorrent for windows
+delete:unused p2p protocol code
+delete:get user info and connect for p2p client
+delete:not used memory code for deamon
+======================================================================================
 XEngine_APIService V3.0.0.1001
 
 增加:系统API函数模块

README.en.md

@@ -69,7 +69,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:x84-windows lua:x64-windows opencc:x84-windows opencc:x64-windows opencv[contrib]:x84-windows libqrencode:x84-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
+need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencc:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencc:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 
@@ -80,7 +80,7 @@ use makefile compile,UBUNTU22.04 x64 or RockyLinux 9 x64
 Run it on the terminal
 
 #### Macos
-install opencc:brew install opencc  
+install opencc:brew install opencc opencc opencv qrencode  
 use makefile compile,mac 13 and above  
 Run it on the terminal
 

README.md

@@ -68,7 +68,7 @@ macos执行:./XEngine_LINEnv.sh -i 3
 修改配置文件里面XSQL里面的数据库配置为你的  
 
 #### Windows
-需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x84-windows lua:x64-windows opencc:x84-windows opencc:x64-windows opencv[contrib]:x84-windows libqrencode:x84-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
+需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencc:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencc:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可
 
@@ -79,7 +79,7 @@ Linux使用Makefile编译,UBUNTU22.04 x64或者RockyLinux 9 x64
 在控制台运行
 
 #### Macos
-安装opencc,执行命令:brew install lua opencc  
+安装opencc,执行命令:brew install lua opencc opencv qrencode  
 使用makefile编译,控制台运行,需要mac 13以及以上版本  
 在控制台运行
 

XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp

@@ -2,51 +2,107 @@
 #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")
+#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
 #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_Types.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>
+#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
+#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
+#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
 
 //需要优先配置XEngine
 //WINDOWS支持VS2022 x64 debug 编译调试
 //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
 //macos::g++ -std=c++17 -Wall -g APPClient_ImageExample.cpp -o APPClient_ImageExample.exe -lXEngine_BaseLib -lNetHelp_APIClient
 
 
-int test_query()
+bool APPClient_ImageExample_GetAttr(LPCXSTR lpszMsgBuffer, int nMsgLen, int* pInt_Width, int* pInt_Height)
 {
 	int nCode = 0;
-	XCHAR* ptszFileBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_MAX);
-	if (NULL == ptszFileBuffer)
-	{
-		return -1;
-	}
-	memset(ptszFileBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);
-
 	LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5501/api?function=image&params1=0");
 
-	FILE* pSt_File = _xtfopen(_X("D:\\XEngine_APIService\\XEngine_APPClient\\x64\\Debug\\1.png"), "rb");
-	int nRet = fread(ptszFileBuffer, 1, XENGINE_MEMORY_SIZE_MAX, pSt_File);
-
 	XCHAR* ptszMsgBuffer = NULL;
-	if (!APIClient_Http_Request(_X("POST"), lpszAPIUrl, ptszFileBuffer, &nCode, &ptszMsgBuffer, &nRet))
+	if (!APIClient_Http_Request(_X("POST"), lpszAPIUrl, lpszMsgBuffer, &nCode, &ptszMsgBuffer, &nMsgLen))
 	{
 		printf("发送投递失败！\n");
 		return 0;
 	}
-	printf("接受到数据,大小:%d,内容:%s\n", nRet, ptszMsgBuffer);
+	Json::Value st_JsonRoot;
+	JSONCPP_STRING st_JsonError;
+	Json::CharReaderBuilder st_JsonBuilder;
+	//开始解析配置文件
+	std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
+	if (!pSt_JsonReader->parse(ptszMsgBuffer, ptszMsgBuffer + nMsgLen, &st_JsonRoot, &st_JsonError))
+	{
+		printf("json parse failed\n");
+		return false;
+	}
 	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
-	free(ptszFileBuffer);
+
+	Json::Value st_JsonBase = st_JsonRoot["st_BaseInfo"];
+	*pInt_Width = st_JsonBase["nWidth"].asInt();
+	*pInt_Height = st_JsonBase["nHeigth"].asInt();
+	return 0;
+}
+int test_imgzoom()
+{
+	LPCXSTR lpszFileDir = _X("D:\\Image\\*.png");
+
+	int nListCount = 0;
+	XCHAR** pptszListFile;
+
+	SystemApi_File_EnumFile(lpszFileDir, &pptszListFile, &nListCount);
+	for (int i = 0; i < nListCount; i++)
+	{
+		int nCode = 0;
+		int nWidth = 0;
+		int nHeight = 0;
+		XCHAR* ptszFileBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_MAX);
+		if (NULL == ptszFileBuffer)
+		{
+			return -1;
+		}
+		memset(ptszFileBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);
+
+		FILE* pSt_File = _xtfopen(pptszListFile[i], _X("rb"));
+		int nRet = (int)fread(ptszFileBuffer, 1, XENGINE_MEMORY_SIZE_MAX, pSt_File);
+		fclose(pSt_File);
+		APPClient_ImageExample_GetAttr(ptszFileBuffer, nRet, &nWidth, &nHeight);
+
+		XCHAR tszAPIUrl[MAX_PATH];
+		memset(tszAPIUrl, '\0', sizeof(tszAPIUrl));
+
+		_xstprintf(tszAPIUrl, _X("http://127.0.0.1:5501/api?function=image&type=1&ext=png&width=%d&height=%d"), nWidth / 2, nHeight / 2);
+
+		XCHAR* ptszMsgBuffer = NULL;
+		if (!APIClient_Http_Request(_X("POST"), tszAPIUrl, ptszFileBuffer, &nCode, &ptszMsgBuffer, &nRet))
+		{
+			printf("发送投递失败！\n");
+			return 0;
+		}
+		free(ptszFileBuffer);
+		
+		pSt_File = _xtfopen(pptszListFile[i], _X("wb"));
+		fwrite(ptszMsgBuffer, 1, nRet, pSt_File);
+		fclose(pSt_File);
+
+		BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+	}
+
+	
 	return 0;
 }
 
@@ -56,7 +112,8 @@ int main()
 	WSADATA st_WSAData;
 	WSAStartup(MAKEWORD(2, 2), &st_WSAData);
 #endif
-	test_query();
+
+	test_imgzoom();
 
 #ifdef _MSC_BUILD
 	WSACleanup();

XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.vcxproj

@@ -71,8 +71,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
-    <LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
+    <LibraryPath>$(XEngine_Lib64);../../XEngine_Source/x64/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

XEngine_APPClient/APPClient_P2PExample/APPClient_P2PExample.cpp

@@ -52,7 +52,7 @@ BOOL APIHelp_NetWork_GetIPNet(XCHAR* ptszIPAddr)
 int APPClient_P2XPLogin()
 {
 	Json::Value st_JsonRoot;
-	LPCXSTR lpszAddr = _T("http://192.168.1.8:5501/api?function=p2p&params1=24577");
+	LPCXSTR lpszAddr = _T("http://127.0.0.1:5501/api?function=p2p&params1=24577");
 	ENUM_XENGINE_NETXAPI_SOCKET_CONNECTTYPE dwNetType;
 
 	memset(tszPublicAddr, '\0', sizeof(tszPublicAddr));
@@ -95,7 +95,7 @@ int APPClient_P2XPLogin()
 int APPClient_P2XPList()
 {
 	Json::Value st_JsonRoot;
-	LPCXSTR lpszAddr = _T("http://192.168.1.8:5501/api?function=p2p&params1=24579");
+	LPCXSTR lpszAddr = _T("http://127.0.0.1:5501/api?function=p2p&params1=24581");
 
 	st_JsonRoot["tszUserName"] = lpszUserName;
 	st_JsonRoot["tszPrivateAddr"] = tszPrivateAddr;
@@ -113,31 +113,27 @@ int APPClient_P2XPList()
 	return 0;
 }
 
-int APPClient_P2XPGetUser()
+int APPClient_P2XPWan()
 {
 	Json::Value st_JsonRoot;
-	LPCXSTR lpszAddr = _T("http://192.168.1.8:5501/api?function=p2p&params1=24583");
-
-	st_JsonRoot["tszUserName"] = lpszUserName;
-	st_JsonRoot["tszPrivateAddr"] = tszPrivateAddr;
-	st_JsonRoot["tszPublicAddr"] = tszPublicAddr;
+	LPCXSTR lpszAddr = _T("http://127.0.0.1:5501/api?function=p2p&params1=24583");
 
 	int nMsgLen = 0;
 	int nHTTPCode = 0;
 	XCHAR* ptszMsgBuffer = NULL;
-	if (!APIClient_Http_Request(_T("POST"), lpszAddr, st_JsonRoot.toStyledString().c_str(), &nHTTPCode, &ptszMsgBuffer, &nMsgLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszAddr, NULL, &nHTTPCode, &ptszMsgBuffer, &nMsgLen))
 	{
 		return -1;
 	}
-	printf("APPClient_P2XPGetUser,&nMsgLen:%d,%s\n", nMsgLen, ptszMsgBuffer);
+	printf("APPClient_P2XPWan,&nMsgLen:%d,%s\n", nMsgLen, ptszMsgBuffer);
 	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 	return 0;
 }
 
-int APPClient_P2XPConnect()
+int APPClient_P2XPLogout()
 {
 	Json::Value st_JsonRoot;
-	LPCXSTR lpszAddr = _T("http://192.168.1.8:5501/api?function=p2p&params1=24581");
+	LPCXSTR lpszAddr = _T("http://127.0.0.1:5501/api?function=p2p&params1=24579");
 
 	st_JsonRoot["tszUserName"] = lpszUserName;
 	st_JsonRoot["tszPrivateAddr"] = tszPrivateAddr;
@@ -150,7 +146,7 @@ int APPClient_P2XPConnect()
 	{
 		return -1;
 	}
-	printf("APPClient_P2XPConnect,&nMsgLen:%d,%s\n", nMsgLen, ptszMsgBuffer);
+	printf("APPClient_P2XPLogout,&nMsgLen:%d,%s\n", nMsgLen, ptszMsgBuffer);
 	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 	return 0;
 }
@@ -164,8 +160,8 @@ int main()
 
 	APPClient_P2XPLogin();
 	APPClient_P2XPList();
-	//APPClient_P2XPGetUser();
-	//APPClient_P2XPConnect();
+	APPClient_P2XPWan();
+	APPClient_P2XPLogout();
 
 #ifdef _MSC_BUILD
 	WSACleanup();