Skip to content

Commit 78d15f5

Browse files
committed
added:points support for try network verification
1 parent 05f0983 commit 78d15f5

4 files changed

Lines changed: 27 additions & 11 deletions

File tree

XEngine_Module/XEngine_Verification/Verification_Define.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,12 +777,22 @@ extern "C" bool Verification_XAuthKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsg
777777
类型:整数型指针
778778
可空:Y
779779
意思:输出验证类型
780+
参数.四:pInt_AvailablePoints
781+
In/Out:Out
782+
类型:整数型指针
783+
可空:Y
784+
意思:输出可用点数
785+
参数.五:enHWType
786+
In/Out:Out
787+
类型:枚举型
788+
可空:Y
789+
意思:输入序列号类型
780790
返回值
781791
类型:逻辑型
782792
意思:是否成功
783793
备注:
784794
*********************************************************************/
785-
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);
795+
extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL, int* pInt_AvailablePoints = NULL, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD);
786796
/********************************************************************
787797
函数名称:Verification_XAuthNet_GetDCode
788798
函数功能:获取动态码

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ CVerification_XAuthNet::~CVerification_XAuthNet()
3838
类型:整数型指针
3939
可空:Y
4040
意思:输出验证类型
41-
参数.四:enHWType
41+
参数.四:pInt_AvailablePoints
42+
In/Out:Out
43+
类型:整数型指针
44+
可空:Y
45+
意思:输出可用点数
46+
参数.五:enHWType
4247
In/Out:Out
4348
类型:枚举型
4449
可空:Y
@@ -48,7 +53,7 @@ CVerification_XAuthNet::~CVerification_XAuthNet()
4853
意思:是否成功
4954
备注:
5055
*********************************************************************/
51-
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 */)
56+
bool CVerification_XAuthNet::Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass /* = NULL */, int* pInt_Type /* = NULL */, int* pInt_AvailablePoints /* = NULL */, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType /* = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD */)
5257
{
5358
Verification_IsErrorOccur = true;
5459

@@ -127,12 +132,13 @@ bool CVerification_XAuthNet::Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAdd
127132
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_CODE;
128133
return false;
129134
}
130-
if (NULL != pInt_Type)
135+
if (!st_JsonRoot["type"].isNull() && (NULL != pInt_Type))
131136
{
132-
if (!st_JsonRoot["type"].isNull())
133-
{
134-
*pInt_Type = st_JsonRoot["type"].asInt();
135-
}
137+
*pInt_Type = st_JsonRoot["type"].asInt();
138+
}
139+
if (!st_JsonRoot["availablePoints"].isNull() && (NULL != pInt_AvailablePoints))
140+
{
141+
*pInt_AvailablePoints = st_JsonRoot["availablePoints"].asInt();
136142
}
137143
m_bLogin = true;
138144
m_bAuth = true;

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CVerification_XAuthNet
2323
CVerification_XAuthNet();
2424
~CVerification_XAuthNet();
2525
public:
26-
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);
26+
bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass = NULL, int* pInt_Type = NULL, int* pInt_AvailablePoints = NULL, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD);
2727
bool Verification_XAuthNet_GetDCode(LPCXSTR lpszURLAddr, int* pInt_DYCode, XNETHANDLE* pxhToken, int* pInt_Timeout = NULL, LPCXSTR lpszPass = NULL);
2828
bool Verification_XAuthNet_Register(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERINFO* pSt_UserInfo, LPCXSTR lpszHWCode = NULL, LPCXSTR lpszPassword = NULL);
2929
bool Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERAUTH* pSt_UserInfo, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime, LPCXSTR lpszPassword = NULL);

XEngine_Module/XEngine_Verification/pch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ extern "C" bool Verification_XAuthKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsg
137137
{
138138
return m_XAuthKeyVerification.Verification_XAuthKey_ReadMemory(lpszMsgBuffer, nMsgLen, pSt_AuthLocal);
139139
}
140-
extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass, int* pInt_Type, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType)
140+
extern "C" bool Verification_XAuthNet_TryRequest(LPCXSTR lpszURLAddr, LPCXSTR lpszPass, int* pInt_Type, int* pInt_AvailablePoints, ENUM_VERIFICATION_MODULE_HW_TYPE enHWType)
141141
{
142-
return m_XAuthNetVerification.Verification_XAuthNet_TryRequest(lpszURLAddr, lpszPass, pInt_Type, enHWType);
142+
return m_XAuthNetVerification.Verification_XAuthNet_TryRequest(lpszURLAddr, lpszPass, pInt_Type, pInt_AvailablePoints, enHWType);
143143
}
144144
extern "C" bool Verification_XAuthNet_GetDCode(LPCXSTR lpszURLAddr, int* pInt_DYCode, XNETHANDLE* pxhToken, int* pInt_Timeout, LPCXSTR lpszPass)
145145
{

0 commit comments

Comments
 (0)