Skip to content

Commit 945e735

Browse files
xengine-qytxengine-qyt
committed
modify:get time and pass protocol field for verification
1 parent 3621998 commit 945e735

File tree

4 files changed

+27
-22
lines changed

4 files changed

+27
-22
lines changed

‎XEngine_Module/XEngine_Verification/Verification_Define.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ extern "C" bool Verification_XAuthNet_Register(LPCXSTR lpszURLAddr, XENGINE_PROT
884884
意思：是否成功
885885
备注：
886886
*********************************************************************/
887-
extern "C" bool Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_LeftTime, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime = NULL, LPCXSTR lpszPassword = NULL);
887+
extern "C" 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);
888888
/********************************************************************
889889
函数名称：Verification_XAuthNet_GetPass
890890
函数功能：密码找回

‎XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.cpp‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ bool CVerification_XAuthNet::Verification_XAuthNet_Register(LPCXSTR lpszURLAddr,
249249

250250
if (NULL == pSt_UserInfo)
251251
{
252+
Verification_IsErrorOccur = true;
253+
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_PARAMENT;
252254
return false;
253255
}
254256
Json::Value st_JsonRoot;
@@ -313,11 +315,11 @@ bool CVerification_XAuthNet::Verification_XAuthNet_Register(LPCXSTR lpszURLAddr,
313315
类型：枚举型指针
314316
可空：N
315317
意思：输出用户序列号类型
316-
参数.三：pInt_LeftTime
318+
参数.三：pSt_UserInfo
317319
In/Out：Out
318-
类型：整数型指针
320+
类型：数据结构指针
319321
可空：N
320-
意思：输出剩余时间
322+
意思：输出用户序列号类型
321323
参数.四：pInt_OnlineTime
322324
In/Out：Out
323325
类型：整数型指针
@@ -328,7 +330,7 @@ bool CVerification_XAuthNet::Verification_XAuthNet_Register(LPCXSTR lpszURLAddr,
328330
类型：字符指针
329331
可空：N
330332
意思：输出剩余时间字符串
331-
参数.;六：lpszPassword
333+
参数.六：lpszPassword
332334
In/Out：In
333335
类型：常量字符指针
334336
可空：Y
@@ -338,7 +340,7 @@ bool CVerification_XAuthNet::Verification_XAuthNet_Register(LPCXSTR lpszURLAddr,
338340
意思：是否成功
339341
备注：
340342
*********************************************************************/
341-
bool CVerification_XAuthNet::Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_LeftTime, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime /* = NULL */, LPCXSTR lpszPassword /* = NULL */)
343+
bool CVerification_XAuthNet::Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERAUTH* pSt_UserInfo, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime, LPCXSTR lpszPassword /* = NULL */)
342344
{
343345
Verification_IsErrorOccur = false;
344346

@@ -353,9 +355,14 @@ bool CVerification_XAuthNet::Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr,
353355
JSONCPP_STRING st_JsonError;
354356
Json::CharReaderBuilder st_ReaderBuilder;
355357

358+
st_JsonObject["tszUserName"] = pSt_UserInfo->tszUserName;
359+
st_JsonObject["tszUserPass"] = pSt_UserInfo->tszUserPass;
360+
361+
st_JsonRoot["st_UserAuth"] = st_JsonObject;
362+
356363
int nMsgLen = 0;
357364
XCHAR tszMSGBuffer[XPATH_MAX] = {};
358-
if (!Verification_XAuthNet_HTTPRequest(lpszURLAddr, tszMSGBuffer, &nMsgLen))
365+
if (!Verification_XAuthNet_HTTPRequest(lpszURLAddr, tszMSGBuffer, &nMsgLen, st_JsonRoot.toStyledString().c_str(), lpszPassword))
359366
{
360367
return false;
361368
}
@@ -386,15 +393,11 @@ bool CVerification_XAuthNet::Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr,
386393
{
387394
*penSerialType = (ENUM_VERIFICATION_MODULE_SERIAL_TYPE)st_JsonObject["enSerialType"].asInt();
388395
}
389-
if (!st_JsonObject["nTimeLeft"].isNull())
390-
{
391-
*pInt_LeftTime = (__int64x)st_JsonObject["nTimeLeft"].asInt64();
392-
}
393396
if (!st_JsonObject["nTimeONLine"].isNull())
394397
{
395398
*pInt_OnlineTime = (__int64x)st_JsonObject["nTimeONLine"].asInt64();
396399
}
397-
if ((NULL != ptszLeftTime) && !st_JsonObject["tszLeftTime"].isNull())
400+
if (!st_JsonObject["tszLeftTime"].isNull())
398401
{
399402
_tcsxcpy(ptszLeftTime, st_JsonObject["tszLeftTime"].asCString());
400403
}
@@ -440,17 +443,19 @@ bool CVerification_XAuthNet::Verification_XAuthNet_GetPass(LPCXSTR lpszURLAddr,
440443
}
441444
Json::Value st_JsonRoot;
442445
Json::Value st_JsonObject;
443-
Json::Value st_JsonUserInfo;
444446
JSONCPP_STRING st_JsonError;
445447
Json::CharReaderBuilder st_ReaderBuilder;
446448

447-
st_JsonUserInfo["tszEMailAddr"] = pSt_UserInfo->tszEMailAddr;
448-
st_JsonUserInfo["nPhoneNumber"] = (Json::Value::Int64)pSt_UserInfo->nPhoneNumber;
449-
st_JsonUserInfo["nIDNumber"] = (Json::Value::Int64)pSt_UserInfo->nIDNumber;
450-
451-
st_JsonObject["st_UserInfo"] = st_JsonUserInfo;
449+
st_JsonObject["tszUserName"] = pSt_UserInfo->tszUserName;
450+
if (_tcsxlen(pSt_UserInfo->tszUserPass) > 0)
451+
{
452+
st_JsonObject["tszUserPass"] = pSt_UserInfo->tszUserPass;
453+
}
454+
st_JsonObject["tszEMailAddr"] = pSt_UserInfo->tszEMailAddr;
455+
st_JsonObject["nPhoneNumber"] = (Json::Value::Int64)pSt_UserInfo->nPhoneNumber;
456+
st_JsonObject["nIDNumber"] = (Json::Value::Int64)pSt_UserInfo->nIDNumber;
452457

453-
st_JsonRoot["st_UserTable"] = st_JsonObject;
458+
st_JsonRoot["st_UserInfo"] = st_JsonObject;
454459

455460
int nMsgLen = 0;
456461
XCHAR tszMSGBuffer[XPATH_MAX] = {};

‎XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthNet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CVerification_XAuthNet
2626
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);
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);
29-
bool Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_LeftTime, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime = NULL, LPCXSTR lpszPassword = NULL);
29+
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);
3030
bool Verification_XAuthNet_GetPass(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERINFO* pSt_UserInfo, XENGINE_PROTOCOL_USERAUTH* pSt_UserAuth, LPCXSTR lpszPassword = NULL);
3131
bool Verification_XAuthNet_Pay(LPCXSTR lpszURLAddr, LPCXSTR lpszUser, LPCXSTR lpszSerial, LPCXSTR lpszPassword = NULL);
3232
public:

‎XEngine_Module/XEngine_Verification/pch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ extern "C" bool Verification_XAuthNet_Register(LPCXSTR lpszURLAddr, XENGINE_PROT
149149
{
150150
return m_XAuthNetVerification.Verification_XAuthNet_Register(lpszURLAddr, pSt_UserInfo, lpszHWCode, lpszPassword);
151151
}
152-
extern "C" bool Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_LeftTime, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime, LPCXSTR lpszPassword)
152+
extern "C" bool Verification_XAuthNet_GetTime(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERAUTH* pSt_UserInfo, ENUM_VERIFICATION_MODULE_SERIAL_TYPE* penSerialType, __int64x* pInt_OnlineTime, XCHAR* ptszLeftTime, LPCXSTR lpszPassword)
153153
{
154-
return m_XAuthNetVerification.Verification_XAuthNet_GetTime(lpszURLAddr, penSerialType, pInt_LeftTime, pInt_OnlineTime, ptszLeftTime, lpszPassword);
154+
return m_XAuthNetVerification.Verification_XAuthNet_GetTime(lpszURLAddr, pSt_UserInfo, penSerialType, pInt_OnlineTime, ptszLeftTime, lpszPassword);
155155
}
156156
extern "C" bool Verification_XAuthNet_GetPass(LPCXSTR lpszURLAddr, XENGINE_PROTOCOL_USERINFO* pSt_UserInfo, XENGINE_PROTOCOL_USERAUTH* pSt_UserAuth, LPCXSTR lpszPassword)
157157
{

0 commit comments

Comments
 (0)