modify:custom serial type for try verification

Author: xengine-qyt

XEngine_Module/XEngine_Verification/Verification_Define.h

@@ -773,7 +773,7 @@ extern "C" bool Verification_XAuthKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsg
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL);
+extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD);
 /********************************************************************
 函数名称：Verification_XAuthNet_GetDCode
 函数功能：获取动态码

XEngine_Module/XEngine_Verification/Verification_Error.h

@@ -40,4 +40,5 @@
 #define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_CODE 0x01E2013            //服务器返回的CODE错误
 #define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_THREAD 0x01E2014          //创建线程失败
 #define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_NOTAUTH 0x01E2015         //没有验证无法继续
-#define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_NOLOGIN 0x01E2016         //没有登录无法继续
+#define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_NOLOGIN 0x01E2016         //没有登录无法继续
+#define ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_GETSERIAL 0x01E2017       //获取硬件序列号失败

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.cpp

@@ -38,12 +38,17 @@ CVerification_XAuthNet::~CVerification_XAuthNet()
   类型：整数型指针
   可空：Y
   意思：输出验证类型
+ 参数.四：enHWType
+  In/Out：Out
+  类型：枚举型
+  可空：Y
+  意思：输入序列号类型
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-bool CVerification_XAuthNet::Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass /* = NULL */, int* pInt_Type /* = NULL */)
+bool CVerification_XAuthNet::Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass /* = NULL */, int* pInt_Type /* = NULL */, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType /* = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD */)
 {
 	Verification_IsErrorOccur = true;
 
@@ -63,7 +68,34 @@ bool CVerification_XAuthNet::Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAdd
 	LPCXSTR lpszCustomHdr = _X("Content-Type: application/json\r\n");
 
 	SystemApi_HardWare_GetSerial(&st_SDKSerial);
-	_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszBoardSerial);
+
+	if (ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD == enHWType)
+	{
+		_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszBoardSerial);
+	}
+	else if (ENUM_VERIFICATION_MODULE_HW_TYPE_CPU == enHWType)
+	{
+		_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszCPUSerial);
+	}
+	else if (ENUM_VERIFICATION_MODULE_HW_TYPE_DISK == enHWType)
+	{
+		_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszDiskSerial);
+	}
+	else if (ENUM_VERIFICATION_MODULE_HW_TYPE_SYSTEM == enHWType)
+	{
+		_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszSystemSerial);
+	}
+	else
+	{
+		_xstprintf(tszJsonStr, _X("%s"), st_SDKSerial.tszBoardSerial);
+	}
+
+	if (_tcsxlen(tszJsonStr) <= 0)
+	{
+		Verification_IsErrorOccur = true;
+		Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_GETSERIAL;
+		return false;
+	}
 
 	st_JsonObject["tszVSerial"] = tszJsonStr;
 	st_JsonRoot["st_VERTemp"] = st_JsonObject;

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.h

@@ -23,7 +23,7 @@ class CVerification_XAuthNet
 	CVerification_XAuthNet();
 	~CVerification_XAuthNet();
 public:
-	bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL);
+	bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD);
 	bool Verification_XAuthNet_GetDCode(LPCXSTR lpszURLAddr, int* pInt_DYCode, XNETHANDLE* pxhToken, int* pInt_Timeout = NULL, LPCXSTR lpszPass = NULL);
 public:
 	bool Verification_XAuthNet_Connect(LPCXSTR lpszClientAddr, int nPort, LPCXSTR lpszPass = NULL);

XEngine_Module/XEngine_Verification/pch.cpp

@@ -137,9 +137,9 @@ extern "C" bool Verification_XAuthKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsg
 {
 	return m_XAuthKeyVerification.Verification_XAuthKey_ReadMemory(lpszMsgBuffer, nMsgLen, pSt_AuthLocal);
 }
-extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass, int* pInt_Type)
+extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass, int* pInt_Type, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType)
 {
-	return m_XAuthNetVerification.Verification_XAuthNet_TryRequest(lpszURLAddr, lpszPass, pInt_Type);
+	return m_XAuthNetVerification.Verification_XAuthNet_TryRequest(lpszURLAddr, lpszPass, pInt_Type, enHWType);
 }
 extern "C" bool Verification_XAuthNet_GetDCode(LPCXSTR lpszURLAddr, int* pInt_DYCode, XNETHANDLE* pxhToken, int* pInt_Timeout, LPCXSTR lpszPass)
 {