fixed:websocket size lost

modify:verification type string from module

Author: xengine-qyt

XEngine_Source/AuthorizeModule_Protocol/Protocol_Parse/Protocol_Parse.cpp

@@ -72,6 +72,7 @@ bool CProtocol_Parse::Protocol_Parse_WSHdr(LPCXSTR lpszMsgBuffer, int nMsgLen, X
 	pSt_ProtocolHdr->unOperatorCode = st_JsonRoot["unOperatorCode"].asInt();
 	pSt_ProtocolHdr->byIsReply = st_JsonRoot["byIsReply"].asInt();
 	pSt_ProtocolHdr->wCrypto = st_JsonRoot["wCrypto"].asInt();
+	pSt_ProtocolHdr->unPacketSize = sizeof(XENGINE_PROTOCOL_USERAUTHEX);
 	if (!st_JsonRoot["xhToken"].isNull())
 	{
 		pSt_ProtocolHdr->xhToken = st_JsonRoot["xhToken"].asUInt64();
@@ -185,10 +186,6 @@ bool CProtocol_Parse::Protocol_Parse_HttpParseAuth(LPCXSTR lpszMsgBuffer, int nM
 	{
 		_tcsxcpy(pSt_UserAuth->tszUserPass, st_JsonProtocol["tszUserPass"].asCString());
 	}
-	if (!st_JsonProtocol["tszDCode"].isNull())
-	{
-		_tcsxcpy(pSt_UserAuth->tszDCode, st_JsonProtocol["tszDCode"].asCString());
-	}
 	if (!st_JsonProtocol["enClientType"].isNull())
 	{
 		pSt_UserAuth->enClientType = (ENUM_PROTOCOLCLIENT_TYPE)st_JsonProtocol["enClientType"].asInt();
@@ -197,6 +194,10 @@ bool CProtocol_Parse::Protocol_Parse_HttpParseAuth(LPCXSTR lpszMsgBuffer, int nM
 	{
 		pSt_UserAuth->enDeviceType = (ENUM_PROTOCOLDEVICE_TYPE)st_JsonProtocol["enDeviceType"].asInt();
 	}
+	if (!st_JsonProtocol["tszDCode"].isNull())
+	{
+		_tcsxcpy(pSt_UserAuth->tszDCode, st_JsonProtocol["tszDCode"].asCString());
+	}
 	if (!st_JsonProtocol["tszHWCode"].isNull())
 	{
 		_tcsxcpy(pSt_UserAuth->tszHWCode, st_JsonProtocol["tszHWCode"].asCString());

XEngine_Source/XAuth_Protocol.h

@@ -44,24 +44,10 @@
 #define ERROR_AUTHORIZE_PROTOCOL_PERMISSION 0x116                         //用户权限错误
 #define ERROR_AUTHORIZE_PROTOCOL_EXPIRED 0x117                            //已经过期
 #define ERROR_AUTHORIZE_PROTOCOL_CDKEY 0x118                              //CDKEY错误
-
+//////////////////////////////////////////////////////////////////////////
 #define ERROR_AUTHORIZE_PROTOCOL_SERVER 0x201                             //服务端内部错误
 #define ERROR_AUTHORIZE_PROTOCOL_LIMIT 0x202                              //服务端内部限制,数据过大后者过小
 //////////////////////////////////////////////////////////////////////////
-//                            导出的枚举型
-//////////////////////////////////////////////////////////////////////////
-#ifndef _MSC_BUILD
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#endif
-static LPCXSTR lpszXSerialType[5] = { "UNKNOW","SECOND","DAY","TIME","CUSTOM" };
-static LPCXSTR lpszXRegType[6] = { "UNKNOW","TEMP","TRY","OFFICIAL","UNLIMIT","EXPIRED" };
-static LPCXSTR lpszXHDType[6] = { "UNKNOW","CPU","DISK","BOARD","MAC","BIOS" };
-static LPCXSTR lpszXVerType[6] = { "UNKNOW","LOCAL","NETWORK" };
-#ifndef _MSC_BUILD
-#pragma GCC diagnostic pop
-#endif
-//////////////////////////////////////////////////////////////////////////
 //                            导出的结构体
 //////////////////////////////////////////////////////////////////////////
 //充值协议

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_WSTask.cpp

@@ -76,9 +76,7 @@ bool XEngine_Client_WSTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nM
 
 		if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN == st_ProtocolHdr.unOperatorCode)
 		{
-			XENGINE_PROTOCOL_USERAUTHEX st_UserAuth;
-			memset(&st_UserAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTHEX));
-
+			XENGINE_PROTOCOL_USERAUTHEX st_UserAuth = {};
 			Protocol_Parse_HttpParseAuth(lpszMsgBuffer, nMsgLen, &st_UserAuth);
 			XEngine_Client_TCPTask(lpszClientAddr, (LPCXSTR)&st_UserAuth, sizeof(XENGINE_PROTOCOL_USERAUTHEX), &st_ProtocolHdr, XENGINE_AUTH_APP_NETTYPE_WS);
 		}