fixed:the problem that locker return information is not imcomplete

xengine-qyt · xengine-qyt · commit a2da3b2355ea · 2022-08-29T09:14:24.000+08:00
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_Locker.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_Locker.cpp
@@ -29,7 +29,7 @@ BOOL XEngine_HTTPTask_Locker(LPCTSTR lpszClientAddr, __int64x xhToken, ENUM_XENG
 		//打开
 		if (!ModuleHelp_Locker_OPen(xhToken))
 		{
-			DWORD dwRet = ModuleProtocol_GetLastError();
+			DWORD dwRet = ModuleHelp_GetLastError();
 			ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");
 			RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
@@ -45,71 +45,71 @@ BOOL XEngine_HTTPTask_Locker(LPCTSTR lpszClientAddr, __int64x xhToken, ENUM_XENG
 	{
 		ModuleHelp_Locker_Close(xhToken);
 		ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);
-		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
+		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求关闭锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);
 	}
 	else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_READ == enLockType)
 	{
 		if (!ModuleHelp_Locker_ReadLock(xhToken))
 		{
-			DWORD dwRet = ModuleProtocol_GetLastError();
+			DWORD dwRet = ModuleHelp_GetLastError();
 			ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");
 			RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读加锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);
 			return FALSE;
 		}
 		ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);
-		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
+		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读加锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);
 	}
 	else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_UNREAD == enLockType)
 	{
 		if (!ModuleHelp_Locker_ReadUNLock(xhToken))
 		{
-			DWORD dwRet = ModuleProtocol_GetLastError();
+			DWORD dwRet = ModuleHelp_GetLastError();
 			ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");
 			RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读解锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);
 			return FALSE;
 		}
 		ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);
-		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
+		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读解锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);
 	}
 	else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_WRITE == enLockType)
 	{
 		if (!ModuleHelp_Locker_WriteLock(xhToken))
 		{
-			DWORD dwRet = ModuleProtocol_GetLastError();
+			DWORD dwRet = ModuleHelp_GetLastError();
 			ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");
 			RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写加锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);
 			return FALSE;
 		}
 		ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);
-		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
+		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写加锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);
 	}
 	else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_UNWRITE == enLockType)
 	{
 		if (!ModuleHelp_Locker_WriteUNLock(xhToken))
 		{
-			DWORD dwRet = ModuleProtocol_GetLastError();
+			DWORD dwRet = ModuleHelp_GetLastError();
 			ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");
 			RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写解锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);
 			return FALSE;
 		}
 		ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);
-		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
+		RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写解锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ BOOL XEngine_HTTPTask_Locker(LPCTSTR lpszClientAddr, __int64x xhToken, ENUM_XENG`
`29`	`29`	`//打开`
`30`	`30`	`if (!ModuleHelp_Locker_OPen(xhToken))`
`31`	`31`	`{`
`32`		`- DWORD dwRet = ModuleProtocol_GetLastError();`
	`32`	`+ DWORD dwRet = ModuleHelp_GetLastError();`
`33`	`33`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");`
`34`	`34`	`RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`35`	`35`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`@@ -45,71 +45,71 @@ BOOL XEngine_HTTPTask_Locker(LPCTSTR lpszClientAddr, __int64x xhToken, ENUM_XENG`
`45`	`45`	`{`
`46`	`46`	`ModuleHelp_Locker_Close(xhToken);`
`47`	`47`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);`
`48`		`- RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);`
	`48`	`+ RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`49`	`49`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`50`	`50`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求关闭锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);`
`51`	`51`	`}`
`52`	`52`	`else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_READ == enLockType)`
`53`	`53`	`{`
`54`	`54`	`if (!ModuleHelp_Locker_ReadLock(xhToken))`
`55`	`55`	`{`
`56`		`- DWORD dwRet = ModuleProtocol_GetLastError();`
	`56`	`+ DWORD dwRet = ModuleHelp_GetLastError();`
`57`	`57`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");`
`58`	`58`	`RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`59`	`59`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`60`	`60`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读加锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);`
`61`	`61`	`return FALSE;`
`62`	`62`	`}`
`63`	`63`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);`
`64`		`- RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);`
	`64`	`+ RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`65`	`65`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`66`	`66`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读加锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);`
`67`	`67`	`}`
`68`	`68`	`else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_UNREAD == enLockType)`
`69`	`69`	`{`
`70`	`70`	`if (!ModuleHelp_Locker_ReadUNLock(xhToken))`
`71`	`71`	`{`
`72`		`- DWORD dwRet = ModuleProtocol_GetLastError();`
	`72`	`+ DWORD dwRet = ModuleHelp_GetLastError();`
`73`	`73`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");`
`74`	`74`	`RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`75`	`75`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`76`	`76`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读解锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);`
`77`	`77`	`return FALSE;`
`78`	`78`	`}`
`79`	`79`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);`
`80`		`- RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);`
	`80`	`+ RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`81`	`81`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`82`	`82`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求读解锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);`
`83`	`83`	`}`
`84`	`84`	`else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_WRITE == enLockType)`
`85`	`85`	`{`
`86`	`86`	`if (!ModuleHelp_Locker_WriteLock(xhToken))`
`87`	`87`	`{`
`88`		`- DWORD dwRet = ModuleProtocol_GetLastError();`
	`88`	`+ DWORD dwRet = ModuleHelp_GetLastError();`
`89`	`89`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");`
`90`	`90`	`RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`91`	`91`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`92`	`92`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写加锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);`
`93`	`93`	`return FALSE;`
`94`	`94`	`}`
`95`	`95`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);`
`96`		`- RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);`
	`96`	`+ RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`97`	`97`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`98`	`98`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写加锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);`
`99`	`99`	`}`
`100`	`100`	`else if (ENUM_XENGINE_APISERVICE_LOCKER_TYPE_UNWRITE == enLockType)`
`101`	`101`	`{`
`102`	`102`	`if (!ModuleHelp_Locker_WriteUNLock(xhToken))`
`103`	`103`	`{`
`104`		`- DWORD dwRet = ModuleProtocol_GetLastError();`
	`104`	`+ DWORD dwRet = ModuleHelp_GetLastError();`
`105`	`105`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken, dwRet, "request is failed");`
`106`	`106`	`RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`107`	`107`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`108`	`108`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写解锁失败,锁句柄:%lld,错误码:%lX"), lpszClientAddr, xhToken, dwRet);`
`109`	`109`	`return FALSE;`
`110`	`110`	`}`
`111`	`111`	`ModuleProtocol_Packet_Locker(tszRVBuffer, &nRVLen, xhToken);`
`112`		`- RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);`
	`112`	`+ RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);`
`113`	`113`	`XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);`
`114`	`114`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求写解锁成功,锁句柄:%lld"), lpszClientAddr, xhToken);`
`115`	`115`	`}`