modify:server handle cdkey serial field and set serial field

Author: xengine-qyt

XEngine_Source/AuthorizeModule_Protocol/AuthorizeModule_Protocol.vcxproj

@@ -72,7 +72,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\AuthorizeModule_Protocol;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

XEngine_Source/AuthorizeModule_Protocol/Protocol_Parse/Protocol_Parse.cpp

@@ -1104,26 +1104,6 @@ bool CProtocol_Parse::Protocol_Parse_HttpParseCDKey(LPCXSTR lpszMsgBuffer, int n
 	}
 	//注册信息
 	Json::Value st_JsonREGInfo = st_JsonRoot["st_AuthRegInfo"];
-	if (!st_JsonREGInfo["nHasTime"].isNull())
-	{
-		pSt_Authorize->st_AuthRegInfo.nHasTime = (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE)st_JsonREGInfo["nHasTime"].asInt();
-	}
-	if (!st_JsonREGInfo["enSerialType"].isNull())
-	{
-		pSt_Authorize->st_AuthRegInfo.enSerialType = (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE)st_JsonREGInfo["enSerialType"].asInt();
-	}
-	if (!st_JsonREGInfo["enRegType"].isNull())
-	{
-		pSt_Authorize->st_AuthRegInfo.enRegType = (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE)st_JsonREGInfo["enRegType"].asInt();
-	}
-	if (!st_JsonREGInfo["enHWType"].isNull())
-	{
-		pSt_Authorize->st_AuthRegInfo.enHWType = (ENUM_AUTHORIZE_MODULE_HW_TYPE)st_JsonREGInfo["enHWType"].asInt();
-	}
-	if (!st_JsonREGInfo["enVModeType"].isNull())
-	{
-		pSt_Authorize->st_AuthRegInfo.enVModeType = (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE)st_JsonREGInfo["enVModeType"].asInt();
-	}
 	if (!st_JsonREGInfo["tszHardware"].isNull())
 	{
 		_tcsxcpy(pSt_Authorize->st_AuthRegInfo.tszHardware, st_JsonREGInfo["tszHardware"].asCString());
@@ -1148,6 +1128,55 @@ bool CProtocol_Parse::Protocol_Parse_HttpParseCDKey(LPCXSTR lpszMsgBuffer, int n
 	{
 		_tcsxcpy(pSt_Authorize->st_AuthRegInfo.tszExpiryTime, st_JsonREGInfo["tszExpiryTime"].asCString());
 	}
+	if (!st_JsonREGInfo["nHasTime"].isNull())
+	{
+		pSt_Authorize->st_AuthRegInfo.nHasTime = st_JsonREGInfo["nHasTime"].asInt();
+	}
+	if (!st_JsonREGInfo["enSerialType"].isNull())
+	{
+		pSt_Authorize->st_AuthRegInfo.enSerialType = (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE)st_JsonREGInfo["enSerialType"].asInt();
+	}
+	if (!st_JsonREGInfo["enRegType"].isNull())
+	{
+		pSt_Authorize->st_AuthRegInfo.enRegType = (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE)st_JsonREGInfo["enRegType"].asInt();
+	}
+	if (!st_JsonREGInfo["enHWType"].isNull())
+	{
+		pSt_Authorize->st_AuthRegInfo.enHWType = (ENUM_AUTHORIZE_MODULE_HW_TYPE)st_JsonREGInfo["enHWType"].asInt();
+	}
+	if (!st_JsonREGInfo["enVModeType"].isNull())
+	{
+		pSt_Authorize->st_AuthRegInfo.enVModeType = (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE)st_JsonREGInfo["enVModeType"].asInt();
+	}
+	//临时序列号
+	Json::Value st_JsonSerialInfo = st_JsonRoot["st_AuthSerial"];
+	if (!st_JsonSerialInfo.isNull())
+	{
+		if (!st_JsonSerialInfo["tszTimeSerial"].isNull())
+		{
+			_tcsxcpy(pSt_Authorize->st_AuthSerial.st_TimeLimit.tszTimeSerial, st_JsonSerialInfo["tszTimeSerial"].asCString());
+		}
+		if (!st_JsonSerialInfo["nTimeCount"].isNull())
+		{
+			pSt_Authorize->st_AuthSerial.st_TimeLimit.nTimeCount = st_JsonSerialInfo["nTimeCount"].asInt();
+		}
+		if (!st_JsonSerialInfo["tszTimeSerial"].isNull())
+		{
+			_tcsxcpy(pSt_Authorize->st_AuthSerial.st_DataLimit.tszDataSerial, st_JsonSerialInfo["tszTimeSerial"].asCString());
+		}
+		if (!st_JsonSerialInfo["tszDataTime"].isNull())
+		{
+			_tcsxcpy(pSt_Authorize->st_AuthSerial.st_DataLimit.tszDataTime, st_JsonSerialInfo["tszDataTime"].asCString());
+		}
+		if (!st_JsonSerialInfo["bTimeAdd"].isNull())
+		{
+			pSt_Authorize->st_AuthSerial.st_DataLimit.bTimeAdd = st_JsonSerialInfo["bTimeAdd"].asBool();
+		}
+		if (!st_JsonSerialInfo["tszUNLimitSerial"].isNull())
+		{
+			_tcsxcpy(pSt_Authorize->st_AuthSerial.st_UNLimit.tszUNLimitSerial, st_JsonSerialInfo["tszUNLimitSerial"].asCString());
+		}
+	}
 	//CDKEY用户信息
 	Json::Value st_JsonUserInfo = st_JsonRoot["st_AuthUserInfo"];
 	if (!st_JsonUserInfo["tszUserName"].isNull())

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_CDKey.cpp

@@ -26,6 +26,30 @@ bool XEngine_AuthorizeHTTP_CDKey(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, LP
 		memset(&st_Authorize, '\0', sizeof(XENGINE_AUTHORIZE_LOCAL));
 
 		Protocol_Parse_HttpParseCDKey(lpszMsgBuffer, nMsgLen, &st_Authorize);
+
+		if (_tcsxlen(st_Authorize.st_AuthSerial.st_TimeLimit.tszTimeSerial) <= 0)
+		{
+			int nSerialCount = 3;
+			XCHAR** pptszSerialList;
+			Authorize_Serial_Create(&pptszSerialList, _X("XAUTH"), nSerialCount, 9);
+
+			st_Authorize.st_AuthSerial.st_TimeLimit.nTimeCount = 9999;
+			_tcsxcpy(st_Authorize.st_AuthSerial.st_TimeLimit.tszTimeSerial, pptszSerialList[0]);
+
+			st_Authorize.st_AuthSerial.st_DataLimit.bTimeAdd = false;
+			_tcsxcpy(st_Authorize.st_AuthSerial.st_DataLimit.tszDataSerial, pptszSerialList[1]);
+			XCHAR tszTimeStr[128] = {};
+			XENGINE_LIBTIMER st_LibTime = {};
+			BaseLib_OperatorTime_GetSysTime(&st_LibTime);
+			st_LibTime.wYear += 1; //一年后过期
+			BaseLib_OperatorTime_TimeToStr(tszTimeStr, NULL, true, &st_LibTime);
+
+			_tcsxcpy(st_Authorize.st_AuthSerial.st_DataLimit.tszDataTime, tszTimeStr);
+
+			_tcsxcpy(st_Authorize.st_AuthSerial.st_UNLimit.tszUNLimitSerial, pptszSerialList[2]);
+			BaseLib_OperatorMemory_Free((XPPPMEM)&pptszSerialList, nSerialCount);
+		}
+		
 		if (!Authorize_CDKey_WriteMemory(tszRVBuffer, &nRVLen, &st_Authorize))
 		{
 			Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, 406, "Not Acceptable,write key failed");