Skip to content

Commit 6bdbeac

Browse files
xengine-qytxengine-qyt
committed
update:Compatible with xengine version 9.10
1 parent 2a60586 commit 6bdbeac

File tree

27 files changed

+76
-66
lines changed

27 files changed

+76
-66
lines changed

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_CDKey/Authorize_CDKey.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ bool CAuthorize_CDKey::Authorize_CDKey_ReadKey(LPCXSTR lpszFileKey, XENGINE_AUTH
316316
//设置启动时间
317317
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == pSt_AuthLocal->st_AuthRegInfo.enSerialType)
318318
{
319-
XENGINE_LIBTIMER st_EndTimer;
320-
XENGINE_LIBTIMER st_StartTime;
319+
XENGINE_LIBTIME st_EndTimer;
320+
XENGINE_LIBTIME st_StartTime;
321321

322-
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIMER));
323-
memset(&st_StartTime, '\0', sizeof(XENGINE_LIBTIMER));
322+
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIME));
323+
memset(&st_StartTime, '\0', sizeof(XENGINE_LIBTIME));
324324

325325
BaseLib_Time_GetSysTime(&st_EndTimer);
326326
BaseLib_Time_StrToTime(pSt_AuthLocal->st_AuthRegInfo.tszStartTime, &st_StartTime);
@@ -703,11 +703,11 @@ bool CAuthorize_CDKey::Authorize_CDKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMs
703703
//设置启动时间
704704
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == pSt_AuthLocal->st_AuthRegInfo.enSerialType)
705705
{
706-
XENGINE_LIBTIMER st_EndTimer;
707-
XENGINE_LIBTIMER st_StartTime;
706+
XENGINE_LIBTIME st_EndTimer;
707+
XENGINE_LIBTIME st_StartTime;
708708

709-
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIMER));
710-
memset(&st_StartTime, '\0', sizeof(XENGINE_LIBTIMER));
709+
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIME));
710+
memset(&st_StartTime, '\0', sizeof(XENGINE_LIBTIME));
711711

712712
BaseLib_Time_GetSysTime(&st_EndTimer);
713713
BaseLib_Time_StrToTime(pSt_AuthLocal->st_AuthRegInfo.tszStartTime, &st_StartTime);
@@ -805,7 +805,7 @@ bool CAuthorize_CDKey::Authorize_CDKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMs
805805
意思：是否构造成功
806806
备注：此函数会修改st_AuthRegInfo的时间信息成员,必须重写CDKEY
807807
*********************************************************************/
808-
bool CAuthorize_CDKey::Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer /* = 0 */, XENGINE_LIBTIMER* pSt_DayTimer /* = NULL */)
808+
bool CAuthorize_CDKey::Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer /* = 0 */, XENGINE_LIBTIME* pSt_DayTimer /* = NULL */)
809809
{
810810
Authorize_IsErrorOccur = false;
811811

@@ -867,12 +867,12 @@ bool CAuthorize_CDKey::Authorize_CDKey_UserRegister(XENGINE_AUTHORIZE_LOCAL* pSt
867867
bSerial = true;
868868
pSt_AuthLocal->st_AuthRegInfo.enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM;
869869
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_OFFICIAL;
870-
XENGINE_LIBTIMER st_LibTime = {};
870+
XENGINE_LIBTIME st_LibTime = {};
871871
BaseLib_Time_GetSysTime(&st_LibTime);
872872
if (pSt_AuthLocal->st_AuthSerial.st_DataLimit.bTimeAdd)
873873
{
874874
__int64x nTimeCount = 0;
875-
XENGINE_LIBTIMER st_AddTime = {};
875+
XENGINE_LIBTIME st_AddTime = {};
876876

877877
BaseLib_TimeSpan_GetForStr(pSt_AuthLocal->st_AuthSerial.st_DataLimit.tszDataTime, pSt_AuthLocal->st_AuthRegInfo.tszCreateTime, &nTimeCount);
878878
st_AddTime.wDay = (int)nTimeCount;
@@ -884,7 +884,7 @@ bool CAuthorize_CDKey::Authorize_CDKey_UserRegister(XENGINE_AUTHORIZE_LOCAL* pSt
884884
{
885885
__int64x nTimeCount = 0;
886886
XCHAR tszTimeStr[128] = {};
887-
XENGINE_LIBTIMER st_LibTime = {};
887+
XENGINE_LIBTIME st_LibTime = {};
888888
BaseLib_Time_TimeToStr(tszTimeStr);
889889

890890
BaseLib_TimeSpan_GetForStr(tszTimeStr, pSt_AuthLocal->st_AuthSerial.st_DataLimit.tszDataTime, &nTimeCount);
@@ -945,13 +945,13 @@ bool CAuthorize_CDKey::Authorize_CDKey_GetLeftTimer(XENGINE_AUTHORIZE_LOCAL* pSt
945945
return false;
946946
}
947947
//验证CDKEY本身情况
948-
XENGINE_LIBTIMER st_StartTimer;
949-
XENGINE_LIBTIMER st_EndTimer;
950-
XENGINE_LIBTIMER st_SysTimer;
948+
XENGINE_LIBTIME st_StartTimer;
949+
XENGINE_LIBTIME st_EndTimer;
950+
XENGINE_LIBTIME st_SysTimer;
951951

952-
memset(&st_StartTimer, '\0', sizeof(XENGINE_LIBTIMER));
953-
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIMER));
954-
memset(&st_SysTimer, '\0', sizeof(XENGINE_LIBTIMER));
952+
memset(&st_StartTimer, '\0', sizeof(XENGINE_LIBTIME));
953+
memset(&st_EndTimer, '\0', sizeof(XENGINE_LIBTIME));
954+
memset(&st_SysTimer, '\0', sizeof(XENGINE_LIBTIME));
955955

956956
BaseLib_Time_TimeToStr(pSt_AuthLocal->st_AuthRegInfo.tszStartTime);
957957
//处理注册类型

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_CDKey/Authorize_CDKey.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class CAuthorize_CDKey
2222
bool Authorize_CDKey_WriteMemory(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal);
2323
bool Authorize_CDKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal);
2424
public:
25-
bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer = 0, XENGINE_LIBTIMER* pSt_DayTimer = NULL);
25+
bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer = 0, XENGINE_LIBTIME* pSt_DayTimer = NULL);
2626
bool Authorize_CDKey_UserRegister(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, LPCXSTR lpszSerialStr);
2727
bool Authorize_CDKey_GetLeftTimer(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, LPCXSTR lpszSerialNumber = NULL);
2828
bool Authorize_CDKey_WriteTime(LPCXSTR lpszFileKey, int nCount = 0);

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_Serial/Authorize_Serial.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ CAuthorize_Serial::~CAuthorize_Serial()
6969
意思：是否生成成功
7070
备注：输入的时间不能超过99999,多天卡现在由用户直接使用pSt_CustomTimer参数指定,不在内部指定了
7171
*********************************************************************/
72-
bool CAuthorize_Serial::Authorize_Serial_Creator(XCHAR*** ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIMER* pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType /* = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY */)
72+
bool CAuthorize_Serial::Authorize_Serial_Creator(XCHAR*** ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIME* pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType /* = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY */)
7373
{
7474
Authorize_IsErrorOccur = false;
7575
//参数检查
@@ -265,7 +265,7 @@ bool CAuthorize_Serial::Authorize_Serial_Create(XCHAR*** ppptszSerialNumber, LPC
265265
意思：是否获取成功
266266
备注：
267267
*********************************************************************/
268-
bool CAuthorize_Serial::Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIMER* pSt_CustomTimer /* = NULL */)
268+
bool CAuthorize_Serial::Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIME* pSt_CustomTimer /* = NULL */)
269269
{
270270
Authorize_IsErrorOccur = false;
271271

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_Serial/Authorize_Serial.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class CAuthorize_Serial
1818
CAuthorize_Serial();
1919
~CAuthorize_Serial();
2020
public:
21-
bool Authorize_Serial_Creator(XCHAR*** ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIMER* pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY);
21+
bool Authorize_Serial_Creator(XCHAR*** ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIME* pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY);
2222
bool Authorize_Serial_Create(XCHAR*** ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber);
23-
bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIMER* pSt_CustomTimer = NULL);
23+
bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIME* pSt_CustomTimer = NULL);
2424
protected:
2525
bool Authorize_Serial_Fill(XCHAR *ptszFillBuffer, int nCardNumer); //填充后面的字段
2626
protected:

‎XEngine_Source/AuthorizeModule_CDKey/CDKey_Define.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern "C" XLONG Authorize_GetLastError(int *pInt_SysError = NULL);
5656
意思：是否生成成功
5757
备注：输入的时间不能超过99999,多天卡现在由用户直接使用pSt_CustomTimer参数指定,不在内部指定了
5858
*********************************************************************/
59-
extern "C" bool Authorize_Serial_Creator(XCHAR * **ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIMER * pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY);
59+
extern "C" bool Authorize_Serial_Creator(XCHAR * **ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIME * pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY);
6060
/********************************************************************
6161
函数名称：Authorize_Serial_Create
6262
函数功能：创建自定义无类型序列号
@@ -109,7 +109,7 @@ extern "C" bool Authorize_Serial_Create(XCHAR*** ppptszSerialNumber, LPCXSTR lps
109109
意思：是否获取成功
110110
备注：
111111
*********************************************************************/
112-
extern "C" bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIMER* pSt_CustomTimer = NULL);
112+
extern "C" bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE* penSerialType, XENGINE_LIBTIME* pSt_CustomTimer = NULL);
113113
/************************************************************************/
114114
/* 本地授权导出函数 */
115115
/************************************************************************/
@@ -222,7 +222,7 @@ extern "C" bool Authorize_CDKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsgLen, X
222222
意思：是否构造成功
223223
备注：此函数会修改st_AuthRegInfo的时间信息成员
224224
*********************************************************************/
225-
extern "C" bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer = 0, XENGINE_LIBTIMER* pSt_DayTimer = NULL);
225+
extern "C" bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL* pSt_AuthLocal, __int64x nDayTimer = 0, XENGINE_LIBTIME* pSt_DayTimer = NULL);
226226
/********************************************************************
227227
函数名称：Authorize_CDKey_UserRegister
228228
函数功能：用户注册CDKEY函数

‎XEngine_Source/AuthorizeModule_CDKey/pch.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ extern "C" XLONG Authorize_GetLastError(int* pInt_SysError)
3131
/************************************************************************/
3232
/* 卡导出函数 */
3333
/************************************************************************/
34-
extern "C" bool Authorize_Serial_Creator(XCHAR * **ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIMER * pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType)
34+
extern "C" bool Authorize_Serial_Creator(XCHAR * **ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber, XENGINE_LIBTIME * pSt_CustomTimer, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType)
3535
{
3636
return m_Serial.Authorize_Serial_Creator(ppptszSerialNumber, lpszUserHeader, nCardNumber, nFieldNumber, pSt_CustomTimer, enSerialType);
3737
}
3838
extern "C" bool Authorize_Serial_Create(XCHAR * **ppptszSerialNumber, LPCXSTR lpszUserHeader, int nCardNumber, int nFieldNumber)
3939
{
4040
return m_Serial.Authorize_Serial_Create(ppptszSerialNumber, lpszUserHeader, nCardNumber, nFieldNumber);
4141
}
42-
extern "C" bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE * penSerialType, XENGINE_LIBTIMER * pSt_CustomTimer)
42+
extern "C" bool Authorize_Serial_GetType(LPCXSTR lpszSerialNumber, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE * penSerialType, XENGINE_LIBTIME * pSt_CustomTimer)
4343
{
4444
return m_Serial.Authorize_Serial_GetType(lpszSerialNumber, penSerialType, pSt_CustomTimer);
4545
}
@@ -62,7 +62,7 @@ extern "C" bool Authorize_CDKey_ReadMemory(LPCXSTR lpszMsgBuffer, int nMsgLen, X
6262
{
6363
return m_Local.Authorize_CDKey_ReadMemory(lpszMsgBuffer, nMsgLen, pSt_AuthLocal);
6464
}
65-
extern "C" bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL * pSt_AuthLocal, __int64x nDayTimer, XENGINE_LIBTIMER * pSt_DayTimer)
65+
extern "C" bool Authorize_CDKey_BuildKeyTime(XENGINE_AUTHORIZE_LOCAL * pSt_AuthLocal, __int64x nDayTimer, XENGINE_LIBTIME * pSt_DayTimer)
6666
{
6767
return m_Local.Authorize_CDKey_BuildKeyTime(pSt_AuthLocal, nDayTimer, pSt_DayTimer);
6868
}

‎XEngine_Source/AuthorizeModule_CDKey/pch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ using namespace std;
3131
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
3232
#include <XEngine_Include/XEngine_SystemSdk/SystemConfig_Define.h>
3333
#include <XEngine_Include/XEngine_SystemSdk/SystemConfig_Error.h>
34+
#include "../XAuth_BuildSwitch.h"
3435
#include "../XAuth_Protocol.h"
3536
#include "CDKey_Define.h"
3637
#include "CDKey_Error.h"

‎XEngine_Source/AuthorizeModule_Client/pch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <WinSock2.h>
1414
#endif
1515
#endif //PCH_H
16-
#include "../XAuth_BuildSwitch.h"
1716
#include <stdio.h>
1817
#include <stdlib.h>
1918
#include <string.h>
@@ -25,6 +24,7 @@
2524
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2625
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2726
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27+
#include "../XAuth_BuildSwitch.h"
2828
#if (1 == _XAUTH_BUILD_SWITCH_CLIENT_TCP)
2929
#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
3030
#include <XEngine_Include/XEngine_Core/Cryption_Error.h>

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ bool CDBModule_MySQL::DBModule_MySQL_SerialInsert(LPCXSTR lpszSerialNumber)
578578
return false;
579579
}
580580
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enAuthSerialType;
581-
XENGINE_LIBTIMER st_AuthTimer;
581+
XENGINE_LIBTIME st_AuthTimer;
582582
memset(&st_AuthTimer, '\0', sizeof(st_AuthTimer));
583583

584584
if (!Authorize_Serial_GetType(lpszSerialNumber, &enAuthSerialType, &st_AuthTimer))
@@ -1918,11 +1918,11 @@ bool CDBModule_MySQL::DBModule_MySQL_UserPayTime(LPCXSTR lpszUserName, LPCXSTR l
19181918
case ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM:
19191919
{
19201920
XCHAR tszTime[128];
1921-
XENGINE_LIBTIMER st_AuthTime;
1921+
XENGINE_LIBTIME st_AuthTime;
19221922
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_GeneraterSerialType;
19231923

19241924
memset(tszTime, '\0', sizeof(tszTime));
1925-
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIMER));
1925+
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIME));
19261926
//获取重置卡类型和时间
19271927
if (!Authorize_Serial_GetType(lpszCardTime, &en_GeneraterSerialType, &st_AuthTime))
19281928
{
@@ -1968,11 +1968,11 @@ bool CDBModule_MySQL::DBModule_MySQL_UserPayTime(LPCXSTR lpszUserName, LPCXSTR l
19681968
{
19691969
//自定义卡,无法相加
19701970
XCHAR tszTime[128];
1971-
XENGINE_LIBTIMER st_AuthTime;
1971+
XENGINE_LIBTIME st_AuthTime;
19721972
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_GeneraterSerialType;
19731973

19741974
memset(tszTime, '\0', sizeof(tszTime));
1975-
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIMER));
1975+
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIME));
19761976
//获取重置卡类型和时间
19771977
if (!Authorize_Serial_GetType(lpszCardTime, &en_GeneraterSerialType, &st_AuthTime))
19781978
{

‎XEngine_Source/AuthorizeModule_Database/DBModule_SQLite/DBModule_SQLite.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ bool CDBModule_SQLite::DBModule_SQLite_SerialInsert(LPCXSTR lpszSerialNumber)
528528
return false;
529529
}
530530
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enAuthSerialType;
531-
XENGINE_LIBTIMER st_AuthTimer;
531+
XENGINE_LIBTIME st_AuthTimer;
532532
memset(&st_AuthTimer, '\0', sizeof(st_AuthTimer));
533533

534534
if (!Authorize_Serial_GetType(lpszSerialNumber, &enAuthSerialType, &st_AuthTimer))
@@ -1778,11 +1778,11 @@ bool CDBModule_SQLite::DBModule_SQLite_UserPayTime(LPCXSTR lpszUserName, LPCXSTR
17781778
case ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM:
17791779
{
17801780
XCHAR tszTime[128];
1781-
XENGINE_LIBTIMER st_AuthTime;
1781+
XENGINE_LIBTIME st_AuthTime;
17821782
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_GeneraterSerialType;
17831783

17841784
memset(tszTime, '\0', sizeof(tszTime));
1785-
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIMER));
1785+
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIME));
17861786
//获取重置卡类型和时间
17871787
if (!Authorize_Serial_GetType(lpszCardTime, &en_GeneraterSerialType, &st_AuthTime))
17881788
{
@@ -1828,11 +1828,11 @@ bool CDBModule_SQLite::DBModule_SQLite_UserPayTime(LPCXSTR lpszUserName, LPCXSTR
18281828
{
18291829
//自定义卡,无法相加
18301830
XCHAR tszTime[128];
1831-
XENGINE_LIBTIMER st_AuthTime;
1831+
XENGINE_LIBTIME st_AuthTime;
18321832
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_GeneraterSerialType;
18331833

18341834
memset(tszTime, '\0', sizeof(tszTime));
1835-
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIMER));
1835+
memset(&st_AuthTime, '\0', sizeof(XENGINE_LIBTIME));
18361836
//获取重置卡类型和时间
18371837
if (!Authorize_Serial_GetType(lpszCardTime, &en_GeneraterSerialType, &st_AuthTime))
18381838
{

‎XEngine_Source/AuthorizeModule_Database/pch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ using namespace std;
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2626
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
2727
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Error.h>
28+
#include "../XAuth_BuildSwitch.h"
2829
#include "../XAuth_Protocol.h"
2930
#include "../AuthorizeModule_CDKey/CDKey_Define.h"
3031
#include "../AuthorizeModule_CDKey/CDKey_Error.h"

‎XEngine_Source/AuthorizeModule_Help/AuthHelp_MultiLogin/AuthHelp_MultiLogin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ bool CAuthHelp_MultiLogin::AuthHelp_MultiLogin_TimeMatch(LPCXSTR lpszLoginTime)
124124
{
125125
Help_IsErrorOccur = true;
126126

127-
XENGINE_LIBTIMER st_TimeLogin = {};
128-
XENGINE_LIBTIMER st_TimeLocal = {};
127+
XENGINE_LIBTIME st_TimeLogin = {};
128+
XENGINE_LIBTIME st_TimeLocal = {};
129129
BaseLib_Time_GetSysTime(&st_TimeLocal);
130130
BaseLib_Time_StrToTime(lpszLoginTime, &st_TimeLogin);
131131

‎XEngine_Source/AuthorizeModule_Help/pch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ using namespace std;
2424
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27+
#include "../XAuth_BuildSwitch.h"
2728
#include "AuthHelp_Define.h"
2829
#include "AuthHelp_Error.h"
2930
/********************************************************************

‎XEngine_Source/AuthorizeModule_Protocol/Protocol_Packet/Protocol_Packet.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,12 @@ bool CProtocol_Packet::Protocol_Packet_HttpToken(XCHAR* ptszMsgBuffer, int* pInt
587587
}
588588
XCHAR tszTimeStart[128];
589589
XCHAR tszTimeEnd[128];
590-
XENGINE_LIBTIMER st_TimeOut;
590+
XENGINE_LIBTIME st_TimeOut;
591591
Json::Value st_JsonRoot;
592592

593593
memset(tszTimeStart, '\0', sizeof(tszTimeStart));
594594
memset(tszTimeEnd, '\0', sizeof(tszTimeEnd));
595-
memset(&st_TimeOut, '\0', sizeof(XENGINE_LIBTIMER));
595+
memset(&st_TimeOut, '\0', sizeof(XENGINE_LIBTIME));
596596

597597
BaseLib_Time_TimeToStr(tszTimeStart);
598598
_xstprintf(tszTimeEnd, _X("0-0-0 0:0:%d"), nTimeout);
@@ -858,8 +858,8 @@ bool CProtocol_Packet::Protocol_Packet_HttpTryList(XCHAR* ptszMsgBuffer, int* pI
858858
st_JsonObject["enVMode"] = (*pppSt_TryList)[i]->enVMode;
859859
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == (*pppSt_TryList)[i]->enVMode)
860860
{
861-
XENGINE_LIBTIMER st_TimeStart = {};
862-
XENGINE_LIBTIMER st_TimeEnd = {};
861+
XENGINE_LIBTIME st_TimeStart = {};
862+
XENGINE_LIBTIME st_TimeEnd = {};
863863
XCHAR tszTimeStart[128] = {};
864864
XCHAR tszTimeEnd[128] = {};
865865
//时间戳转换

‎XEngine_Source/AuthorizeModule_Protocol/pch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ using namespace std;
2424
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27+
#include "../XAuth_BuildSwitch.h"
2728
#include "../XAuth_Protocol.h"
2829
#include "../AuthorizeModule_CDKey/CDKey_Define.h"
2930
#include "../AuthorizeModule_CDKey/CDKey_Error.h"

‎XEngine_Source/AuthorizeModule_Session/Session_Authorize/Session_Authorize.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ XHTHREAD CSession_Authorize::Session_Authorize_ActiveThread(XPVOID lParam)
401401
for (auto stl_ListIterator = stl_MapIterator->second.begin(); stl_ListIterator != stl_MapIterator->second.end(); stl_ListIterator++)
402402
{
403403
__int64x nOnlineSpan = 0; //在线时间
404-
XENGINE_LIBTIMER st_LibTimer;
405-
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIMER));
404+
XENGINE_LIBTIME st_LibTimer;
405+
memset(&st_LibTimer, '\0', sizeof(XENGINE_LIBTIME));
406406
memset(&st_ProtocolTimer, '\0', sizeof(AUTHREG_PROTOCOL_TIME));
407407
//获取现在的系统时间
408408
BaseLib_Time_GetSysTime(&st_LibTimer);
@@ -463,8 +463,8 @@ XHTHREAD CSession_Authorize::Session_Authorize_ActiveThread(XPVOID lParam)
463463
{
464464
//自定义
465465
__int64x nLeftTime = 0; //剩余时间
466-
XENGINE_LIBTIMER st_TimeLeft;
467-
memset(&st_TimeLeft, '\0', sizeof(XENGINE_LIBTIMER));
466+
XENGINE_LIBTIME st_TimeLeft;
467+
memset(&st_TimeLeft, '\0', sizeof(XENGINE_LIBTIME));
468468
//获取指定过期日期
469469
if (6 != _stxscanf(stl_ListIterator->st_UserTable.tszLeftTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), &st_TimeLeft.wYear, &st_TimeLeft.wMonth, &st_TimeLeft.wDay, &st_TimeLeft.wHour, &st_TimeLeft.wMinute, &st_TimeLeft.wSecond))
470470
{

0 commit comments

Comments
 (0)