fixed:day and second serial process error

Author: xengine-qyt

XEngine.sln

@@ -59,6 +59,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Verification", "XEngine_Module\XEngine_Verification\XEngine_Verification.vcxproj", "{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Verification_APPExample", "XEngine_Example\Verification_APPExample\Verification_APPExample.vcxproj", "{6DDE9B0B-5DDA-47B0-BF6F-ADF47EC8568A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {A8E43EC0-698A-4807-8A61-B2BE5FAB7256}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

XEngine_Example/Verification_APPExample/Verification_APPExample.vcxproj

@@ -109,6 +109,18 @@
     <LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
     <IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
+    <LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
+    <LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
+    <LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

XEngine_Module/XEngine_Verification/Makefile

@@ -5,7 +5,7 @@ FILEEXT =
 LIBFLAG = 
 LOADHDR = -I ./ -I ../jsoncpp
 LOADSO = -L ../jsoncpp
-LIB = -lXEngine_BaseLib -lXEngine_BaseSafe -lXEngine_Cryption -lRfcComponents_HttpProtocol -ljsoncpp
+LIB = -lXEngine_BaseLib -lXEngine_BaseSafe -lXEngine_Cryption -lRfcComponents_HttpProtocol -lXEngine_SystemConfig -lXEngine_SystemApi -ljsoncpp
 LIBEX = 
 OBJECTS = Verification_HTTP.o Verification_OAuth.o Verification_XAuthKey.o Verification_XAuthNet.o pch.o
 

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthKey.cpp

@@ -83,7 +83,25 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileRead(VERIFICATION_XAUTHKE
 			return false;
 		}
 	}
-	BaseLib_Time_TimeToStr(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime);
+
+	if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
+	{
+		XENGINE_LIBTIME st_SysTime = {};
+		XENGINE_LIBTIME st_EndTime = {};
+		BaseLib_Time_GetSysTime(&st_SysTime);
+		BaseLib_Time_StrToTime(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime, &st_EndTime);
+		if ((st_EndTime.wYear != st_SysTime.wYear) || (st_EndTime.wMonth != st_SysTime.wMonth) || (st_EndTime.wDay != st_SysTime.wDay))
+		{
+			pSt_XAuthInfo->st_AuthRegInfo.nHasTime--;
+			_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszLeftTime, _X("%lld"), pSt_XAuthInfo->st_AuthRegInfo.nHasTime);
+			BaseLib_Time_TimeToStr(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime);
+		}
+	}
+	else
+	{
+		BaseLib_Time_TimeToStr(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime);
+	}
+	pSt_XAuthInfo->st_AuthAppInfo.nExecTime++;
 	return true;
 }
 /********************************************************************
@@ -120,15 +138,13 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileWrite(VERIFICATION_XAUTHK
 	//更新使用时间
 	if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
 	{
-		XCHAR tszTimeStart[64];
-		XCHAR tszTimeEnd[64];
+		XCHAR tszTimeEnd[64] = {};
 		__int64x nUsedTime = 0;
 
-		memset(tszTimeStart, '\0', sizeof(tszTimeStart));
-		memset(tszTimeEnd, '\0', sizeof(tszTimeEnd));
 		BaseLib_Time_TimeToStr(tszTimeEnd);
 		BaseLib_TimeSpan_GetForStr(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime, tszTimeEnd, &nUsedTime, ENUM_XENGINE_BASELIB_TIME_TYPE_SECOND);
 		pSt_XAuthInfo->st_AuthRegInfo.nHasTime -= nUsedTime;
+		_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszLeftTime, _X("%lld"), pSt_XAuthInfo->st_AuthRegInfo.nHasTime);
 	}
 	//准备数据
 	if (!Verification_XAuthKey_WriteMemory(tszDECodecBuffer, &nSize, pSt_XAuthInfo))
@@ -216,17 +232,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
 	{
 		//其他类型的注册机制
 		BaseLib_Time_GetSysTime(&st_SysTimer);
-		//计算超时时间
-		if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
-		{
-			BaseLib_Time_GetSysTime(&st_SysTimer);
-			BaseLib_Time_StrToTime(pSt_XAuthInfo->st_AuthRegInfo.tszStartTime, &st_EndTimer);
-			if ((st_EndTimer.wYear != st_SysTimer.wYear) || (st_EndTimer.wMonth != st_SysTimer.wMonth) || (st_EndTimer.wDay != st_SysTimer.wDay))
-			{
-				pSt_XAuthInfo->st_AuthRegInfo.nHasTime--;
-			}
-		}
-		else if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
+		if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
 		{
 			XCHAR tszTimeEnd[64] = {};
 			__int64x nUsedTime = 0;
@@ -262,8 +268,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
 			return false;
 		}
 	}
-	pSt_XAuthInfo->st_AuthAppInfo.nExecTime++;
-
+	
 	SYSTEMAPI_SERIAL_INFOMATION st_SDKSerial = {};
 	SystemApi_HardWare_GetSerial(&st_SDKSerial);
 	if (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_LOCAL != pSt_XAuthInfo->st_AuthRegInfo.enVModeType)