delete:logout protocol support

modify:heart protocol send support

Author: xengine-qyt

XEngine_Module/XEngine_Verification/Verification_Define.h

@@ -1030,30 +1030,6 @@ extern "C" bool Verification_XAuthNet_GetAuth();
 *********************************************************************/
 extern "C" bool Verification_XAuthNet_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszHWCode = NULL, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0, VERIFICATION_USERINFO* pSt_UserInfo = NULL);
 /********************************************************************
-函数名称：Verification_XAuthNet_Logout
-函数功能：用户登出协议
- 参数.一：lpszUser
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入用户名
- 参数.二：lpszPass
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入密码
- 参数.三：dwCryption
-  In/Out：In
-  类型：整数型
-  可空：Y
-  意思：密码加密方法
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-extern "C" bool Verification_XAuthNet_Logout(LPCXSTR lpszUser, LPCXSTR lpszPass, XLONG dwCryption = 0);
-/********************************************************************
 函数名称：Verification_XAuthNet_GetToken
 函数功能：获取当前的令牌句柄
  参数.一：pxhToken

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.cpp

@@ -861,126 +861,6 @@ bool CVerification_XAuthNet::Verification_XAuthNet_Login(LPCXSTR lpszUser, LPCXS
 	return true;
 }
 /********************************************************************
-函数名称：Verification_XAuthNet_Logout
-函数功能：用户登出协议
- 参数.一：lpszUser
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入用户名
- 参数.二：lpszPass
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入密码
- 参数.三：dwCryption
-  In/Out：In
-  类型：整数型
-  可空：Y
-  意思：密码加密方法
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-bool CVerification_XAuthNet::Verification_XAuthNet_Logout(LPCXSTR lpszUser, LPCXSTR lpszPass, XLONG dwCryption /* = 0 */)
-{
-	Verification_IsErrorOccur = false;
-
-	if ((NULL == lpszUser) || (NULL == lpszPass))
-	{
-		Verification_IsErrorOccur = true;
-		Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_PARAMENT;
-		return false;
-	}
-	XCHAR tszMsgBuffer[2048] = {};
-	XENGINE_PROTOCOLHDR st_ProtocolHdr = {};
-	XENGINE_PROTOCOL_USERAUTHEX st_AuthUser = {};
-	//协议头
-	st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
-	st_ProtocolHdr.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
-	st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGOUT;
-	st_ProtocolHdr.unPacketSize = sizeof(XENGINE_PROTOCOL_USERAUTHEX);
-	st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
-
-#ifdef _MSC_BUILD
-	st_AuthUser.enDeviceType = ENUM_PROTOCOL_FOR_DEVICE_TYPE_PC_WINDOWS;
-#elif __linux__
-	st_AuthUser.enDeviceType = ENUM_PROTOCOL_FOR_DEVICE_TYPE_PC_LINUX;
-#else
-	st_AuthUser.enDeviceType = ENUM_PROTOCOL_FOR_DEVICE_TYPE_PC_MACOS;
-#endif
-	_tcsxcpy(st_AuthUser.tszUserName, lpszUser);
-
-	if (dwCryption > 0)
-	{
-		int nPLen = _tcsxlen(lpszPass);
-		XBYTE byMD5Buffer[XPATH_MAX] = {};
-		Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen, false, dwCryption);
-		BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, st_AuthUser.tszUserPass);
-	}
-	else
-	{
-		_tcsxcpy(st_AuthUser.tszUserPass, lpszPass);
-	}
-	//是否加密
-	int nMsgLen = 0;
-	if (_tcsxlen(tszPassStr) > 0)
-	{
-		XCHAR tszCodecBuffer[2048] = {};
-
-		st_ProtocolHdr.wCrypto = ENUM_XENGINE_PROTOCOLHDR_CRYPTO_TYPE_XCRYPT;
-		Cryption_XCrypto_Encoder((LPCXSTR)&st_AuthUser, (int*)&st_ProtocolHdr.unPacketSize, (XBYTE*)tszCodecBuffer, tszPassStr);
-
-		memcpy(tszMsgBuffer, &st_ProtocolHdr, sizeof(XENGINE_PROTOCOLHDR));
-		memcpy(tszMsgBuffer + sizeof(XENGINE_PROTOCOLHDR), tszCodecBuffer, st_ProtocolHdr.unPacketSize);
-
-		nMsgLen = sizeof(XENGINE_PROTOCOLHDR) + st_ProtocolHdr.unPacketSize;
-	}
-	else
-	{
-		memcpy(tszMsgBuffer, &st_ProtocolHdr, sizeof(XENGINE_PROTOCOLHDR));
-		memcpy(tszMsgBuffer + sizeof(XENGINE_PROTOCOLHDR), &st_AuthUser, st_ProtocolHdr.unPacketSize);
-
-		nMsgLen = sizeof(XENGINE_PROTOCOLHDR) + sizeof(XENGINE_PROTOCOL_USERAUTHEX);
-	}
-	//发送数据
-	if (!XClient_TCPSelect_SendMsg(m_hSocket, tszMsgBuffer, nMsgLen))
-	{
-		Verification_IsErrorOccur = true;
-		Verification_dwErrorCode = XClient_GetLastError();
-		return false;
-	}
-
-	nMsgLen = 0;
-	XCHAR* ptszMsgBuffer = NULL;
-	st_ProtocolHdr = {};
-	//接受数据
-	if (!XClient_TCPSelect_RecvPkt(m_hSocket, &ptszMsgBuffer, &nMsgLen, &st_ProtocolHdr))
-	{
-		Verification_IsErrorOccur = true;
-		Verification_dwErrorCode = XClient_GetLastError();
-		return false;
-	}
-	BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
-	//判断是否登录协议
-	if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGOUT != st_ProtocolHdr.unOperatorCode)
-	{
-		Verification_IsErrorOccur = true;
-		Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_CODE;
-		return false;
-	}
-	//登录失败，错误码
-	if (0 != st_ProtocolHdr.wReserve)
-	{
-		Verification_IsErrorOccur = true;
-		Verification_dwErrorCode = st_ProtocolHdr.wReserve;
-		return false;
-	}
-	Verification_XAuthNet_Close();
-	return true;
-}
-/********************************************************************
 函数名称：Verification_XAuthNet_GetToken
 函数功能：获取当前的令牌句柄
  参数.一：pxhToken
@@ -1098,13 +978,28 @@ bool CVerification_XAuthNet::Verification_XAuthNet_HTTPRequest(LPCXSTR lpszURLAd
 XHTHREAD XCALLBACK CVerification_XAuthNet::Verification_XAuthNet_Thread(XPVOID lParam)
 {
 	CVerification_XAuthNet* pClass_This = (CVerification_XAuthNet*)lParam;
+	XENGINE_PROTOCOLHDR st_ProtocolHeart = {};
+
+	st_ProtocolHeart.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
+	st_ProtocolHeart.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
+	st_ProtocolHeart.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_HB_SYN;
+	st_ProtocolHeart.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
 
 	while (pClass_This->m_bRun)
 	{
+		//发送心跳
+		if (!XClient_TCPSelect_SendMsg(pClass_This->m_hSocket, (LPCXSTR)&st_ProtocolHeart, sizeof(XENGINE_PROTOCOLHDR)))
+		{
+			//心跳失败
+			pClass_This->m_bRun = false;
+			pClass_This->m_bLogin = false;
+			pClass_This->m_bAuth = false;
+			XClient_TCPSelect_Close(pClass_This->m_hSocket);
+			break;
+		}
 		int nMsgLen = 0;
 		XCHAR* ptszMsgBuffer = NULL;
 		XENGINE_PROTOCOLHDR st_ProtocolHdr = {};
-
 		if (!XClient_TCPSelect_RecvPkt(pClass_This->m_hSocket, &ptszMsgBuffer, &nMsgLen, &st_ProtocolHdr))
 		{
 			XLONG dwRet = XClient_GetLastError();

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.h

@@ -34,7 +34,6 @@ class CVerification_XAuthNet
 	bool Verification_XAuthNet_Close();
 	bool Verification_XAuthNet_GetAuth();
 	bool Verification_XAuthNet_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszHWCode = NULL, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0, VERIFICATION_USERINFO* pSt_UserInfo = NULL);
-	bool Verification_XAuthNet_Logout(LPCXSTR lpszUser, LPCXSTR lpszPass, XLONG dwCryption = 0);
 	bool Verification_XAuthNet_GetToken(XNETHANDLE* pxhToken);
 protected:
 	bool Verification_XAuthNet_HTTPRequest(LPCXSTR lpszURLAddr, XCHAR* ptszMSGBuffer, int* pInt_MSGLen, LPCXSTR lpszMSGBuffer = NULL, LPCXSTR lpszPassword = NULL);

XEngine_Module/XEngine_Verification/XEngine_Verification.def

@@ -39,5 +39,4 @@ EXPORTS
 	Verification_XAuthNet_Close
 	Verification_XAuthNet_GetAuth
 	Verification_XAuthNet_Login
-	Verification_XAuthNet_Logout
 	Verification_XAuthNet_GetToken

XEngine_Module/XEngine_Verification/pch.cpp

@@ -177,10 +177,6 @@ extern "C" bool Verification_XAuthNet_Login(LPCXSTR lpszUser, LPCXSTR lpszPass,
 {
 	return m_XAuthNetVerification.Verification_XAuthNet_Login(lpszUser, lpszPass, lpszHWCode, nDYCode, xhToken, dwCryption, pSt_UserInfo);
 }
-extern "C" bool Verification_XAuthNet_Logout(LPCXSTR lpszUser, LPCXSTR lpszPass, XLONG dwCryption)
-{
-	return m_XAuthNetVerification.Verification_XAuthNet_Logout(lpszUser, lpszPass, dwCryption);
-}
 extern "C" bool Verification_XAuthNet_GetToken(XNETHANDLE* pxhToken)
 {
 	return m_XAuthNetVerification.Verification_XAuthNet_GetToken(pxhToken);