Skip to content

Commit fbf4550

Browse files
xengine-qytxengine-qyt
committed
modify:cdkey module to verification module from depend library
1 parent 9e26102 commit fbf4550

37 files changed

+247
-615
lines changed

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp‎

Lines changed: 32 additions & 89 deletions
Large diffs are not rendered by default.

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CDBModule_MySQL
3333
bool DBModule_MySQL_UserLogin(LPCXSTR lpszUserName, LPCXSTR lpszUserAddr);
3434
bool DBModule_MySQL_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lpszUserAddr);
3535
public:
36-
bool DBModule_MySQL_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime); //插入序列卡
36+
bool DBModule_MySQL_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable); //插入序列卡
3737
bool DBModule_MySQL_SerialDelete(LPCXSTR lpszSerialNumber); //删除一个序列号
3838
bool DBModule_MySQL_SerialQuery(LPCXSTR lpszSerialNumber, LPAUTHREG_SERIALTABLE pSt_SerialTable = NULL); //按照卡号或者用户查询
3939
bool DBModule_MySQL_SerialQueryAll(AUTHREG_SERIALTABLE*** pppSt_SerialTable, int* pInt_ListCount, int nPosStart, int nPosEnd);//查询所有序列卡
@@ -42,7 +42,7 @@ class CDBModule_MySQL
4242
bool DBModule_MySQL_TryInsert(AUTHREG_TEMPVER* pSt_AuthVer); //网络使用模式插入一条数据
4343
bool DBModule_MySQL_TryQuery(AUTHREG_TEMPVER* pSt_AuthVer); //试用序列号查询函数
4444
bool DBModule_MySQL_TryDelete(LPCXSTR lpszSerial); //删除一条指定的试用数据
45-
bool DBModule_MySQL_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW); //清理函数,自动清理过期数据
45+
bool DBModule_MySQL_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW); //清理函数,自动清理过期数据
4646
bool DBModule_MySQL_TrySet(AUTHREG_TEMPVER* pSt_AuthVer); //设置用户信息函数
4747
bool DBModule_MySQL_TryList(AUTHREG_TEMPVER*** pppSt_AuthVer, int* pInt_ListCount, int nPosStart = 0, int nPosEnd = 1000); //请求试用期列表
4848
public:
@@ -56,7 +56,7 @@ class CDBModule_MySQL
5656
bool DBModule_MySQL_AnnouncementDelete(AUTHREG_ANNOUNCEMENT* pSt_Announcement); //公告删除
5757
bool DBModule_MySQL_AnnouncementList(AUTHREG_ANNOUNCEMENT*** ppppSt_Announcement, int* pInt_ListCount); //列举所有公告
5858
protected:
59-
bool DBModule_MySQL_UserPayTime(LPCXSTR lpszUserName, LPCXSTR lpszUserTime, LPCXSTR lpszCardTime, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_AuthSerialType, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_AuthUserType); //日期方式充值方式
59+
bool DBModule_MySQL_UserPayTime(LPCXSTR lpszUserName, LPCXSTR lpszUserTime, LPCXSTR lpszCardTime, ENUM_VERIFICATION_MODULE_SERIAL_TYPE en_AuthSerialType, ENUM_VERIFICATION_MODULE_SERIAL_TYPE en_AuthUserType); //日期方式充值方式
6060
private:
6161
bool m_bChange;
6262
XNETHANDLE xhData; //数据库句柄

‎XEngine_Source/AuthorizeModule_Database/DBModule_SQLite/DBModule_SQLite.cpp‎

Lines changed: 33 additions & 90 deletions
Large diffs are not rendered by default.

‎XEngine_Source/AuthorizeModule_Database/DBModule_SQLite/DBModule_SQLite.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CDBModule_SQLite
3333
bool DBModule_SQLite_UserLogin(LPCXSTR lpszUserName, LPCXSTR lpszUserAddr);
3434
bool DBModule_SQLite_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lpszUserAddr);
3535
public:
36-
bool DBModule_SQLite_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime); //插入序列卡
36+
bool DBModule_SQLite_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable); //插入序列卡
3737
bool DBModule_SQLite_SerialDelete(LPCXSTR lpszSerialNumber); //删除一个序列号
3838
bool DBModule_SQLite_SerialQuery(LPCXSTR lpszSerialNumber,LPAUTHREG_SERIALTABLE pSt_SerialTable = NULL); //按照卡号或者用户查询
3939
bool DBModule_SQLite_SerialQueryAll(AUTHREG_SERIALTABLE ***pppSt_SerialTable,int *pInt_ListCount, int nPosStart, int nPosEnd);//查询所有序列卡
@@ -42,7 +42,7 @@ class CDBModule_SQLite
4242
bool DBModule_SQLite_TryInsert(AUTHREG_TEMPVER* pSt_AuthVer);
4343
bool DBModule_SQLite_TryQuery(AUTHREG_TEMPVER* pSt_AuthVer);
4444
bool DBModule_SQLite_TryDelete(LPCXSTR lpszSerial);
45-
bool DBModule_SQLite_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW);
45+
bool DBModule_SQLite_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW);
4646
bool DBModule_SQLite_TrySet(AUTHREG_TEMPVER* pSt_AuthVer);
4747
bool DBModule_SQLite_TryList(AUTHREG_TEMPVER*** pppSt_AuthVer, int* pInt_ListCount, int nPosStart = 0, int nPosEnd = 1000);
4848
public:
@@ -56,7 +56,7 @@ class CDBModule_SQLite
5656
bool DBModule_SQLite_AnnouncementDelete(AUTHREG_ANNOUNCEMENT* pSt_Announcement);
5757
bool DBModule_SQLite_AnnouncementList(AUTHREG_ANNOUNCEMENT*** ppppSt_Announcement, int* pInt_ListCount);
5858
protected:
59-
bool DBModule_SQLite_UserPayTime(LPCXSTR lpszUserName, LPCXSTR lpszUserTime, LPCXSTR lpszCardTime, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_AuthSerialType, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE en_AuthUserType);
59+
bool DBModule_SQLite_UserPayTime(LPCXSTR lpszUserName, LPCXSTR lpszUserTime, LPCXSTR lpszCardTime, ENUM_VERIFICATION_MODULE_SERIAL_TYPE en_AuthSerialType, ENUM_VERIFICATION_MODULE_SERIAL_TYPE en_AuthUserType);
6060
private:
6161
bool m_bChange;
6262
XNETHANDLE xhData; //数据库句柄

‎XEngine_Source/AuthorizeModule_Database/Database_Define.h‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -214,22 +214,17 @@ extern "C" bool DBModule_SQLite_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lpszUse
214214
/********************************************************************
215215
函数名称：DBModule_SQLite_SerialInsert
216216
函数功能：插入一个序列号到数据库
217-
参数.一：lpszSerialNumber
217+
参数.一：pSt_SerialTable
218218
In/Out：In
219-
类型：常量字符指针
219+
类型：数据结构指针
220220
可空：N
221221
意思：要插入的序列号
222-
参数.二：lpszExpiredTime
223-
In/Out：In
224-
类型：常量字符指针
225-
可空：N
226-
意思：过期日期
227222
返回值
228223
类型：逻辑型
229224
意思：是否插入成功
230225
备注：
231226
*********************************************************************/
232-
extern "C" bool DBModule_SQLite_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime);
227+
extern "C" bool DBModule_SQLite_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable);
233228
/********************************************************************
234229
函数名称：DBModule_SQLite_SerialDelete
235230
函数功能：从数据库删除指定序列号
@@ -366,7 +361,7 @@ extern "C" bool DBModule_SQLite_TryDelete(LPCXSTR lpszSerial);
366361
意思：是否成功
367362
备注：
368363
*********************************************************************/
369-
extern "C" bool DBModule_SQLite_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW);
364+
extern "C" bool DBModule_SQLite_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW);
370365
/********************************************************************
371366
函数名称：DBModule_SQLite_TrySet
372367
函数功能：设置用户信息函数
@@ -712,22 +707,17 @@ extern "C" bool DBModule_MySQL_UserList(AUTHREG_USERTABLE*** pppSt_UserInfo, int
712707
/********************************************************************
713708
函数名称：DBModule_MySQL_SerialInsert
714709
函数功能：插入一个序列号到数据库
715-
参数.一：lpszSerialNumber
710+
参数.一：pSt_SerialTable
716711
In/Out：In
717-
类型：常量字符指针
712+
类型：数据结构指针
718713
可空：N
719714
意思：要插入的序列号
720-
参数.二：lpszExpiredTime
721-
In/Out：In
722-
类型：常量字符指针
723-
可空：N
724-
意思：过期日期
725715
返回值
726716
类型：逻辑型
727717
意思：是否插入成功
728718
备注：
729719
*********************************************************************/
730-
extern "C" bool DBModule_MySQL_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime);
720+
extern "C" bool DBModule_MySQL_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable);
731721
/********************************************************************
732722
函数名称：DBModule_MySQL_SerialDelete
733723
函数功能：从数据库删除指定序列号
@@ -864,7 +854,7 @@ extern "C" bool DBModule_MySQL_TryDelete(LPCXSTR lpszSerial);
864854
意思：是否成功
865855
备注：
866856
*********************************************************************/
867-
extern "C" bool DBModule_MySQL_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW);
857+
extern "C" bool DBModule_MySQL_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW);
868858
/********************************************************************
869859
函数名称：DBModule_MySQL_TrySet
870860
函数功能：设置用户信息函数

‎XEngine_Source/AuthorizeModule_Database/pch.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ extern "C" bool DBModule_SQLite_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lpszUse
7575
{
7676
return m_DBSQLite.DBModule_SQLite_QueryLogin(lpszUserName, lpszUserAddr);
7777
}
78-
extern "C" bool DBModule_SQLite_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime)
78+
extern "C" bool DBModule_SQLite_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable)
7979
{
80-
return m_DBSQLite.DBModule_SQLite_SerialInsert(lpszSerialNumber, lpszExpiredTime);
80+
return m_DBSQLite.DBModule_SQLite_SerialInsert(pSt_SerialTable);
8181
}
8282
extern "C" bool DBModule_SQLite_SerialDelete(LPCXSTR lpszSerialNumber)
8383
{
@@ -107,7 +107,7 @@ extern "C" bool DBModule_SQLite_TryDelete(LPCXSTR lpszSerial)
107107
{
108108
return m_DBSQLite.DBModule_SQLite_TryDelete(lpszSerial);
109109
}
110-
extern "C" bool DBModule_SQLite_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode)
110+
extern "C" bool DBModule_SQLite_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode)
111111
{
112112
return m_DBSQLite.DBModule_SQLite_TryClear(nThanValue, enVerMode);
113113
}
@@ -190,9 +190,9 @@ extern "C" bool DBModule_MySQL_UserList(AUTHREG_USERTABLE*** pppSt_UserInfo, int
190190
{
191191
return m_DBMySQL.DBModule_MySQL_UserList(pppSt_UserInfo, pInt_ListCount, nPosStart, nPosEnd);
192192
}
193-
extern "C" bool DBModule_MySQL_SerialInsert(LPCXSTR lpszSerialNumber, LPCXSTR lpszExpiredTime)
193+
extern "C" bool DBModule_MySQL_SerialInsert(AUTHREG_SERIALTABLE* pSt_SerialTable)
194194
{
195-
return m_DBMySQL.DBModule_MySQL_SerialInsert(lpszSerialNumber, lpszExpiredTime);
195+
return m_DBMySQL.DBModule_MySQL_SerialInsert(pSt_SerialTable);
196196
}
197197
extern "C" bool DBModule_MySQL_SerialDelete(LPCXSTR lpszSerialNumber)
198198
{
@@ -222,7 +222,7 @@ extern "C" bool DBModule_MySQL_TryDelete(LPCXSTR lpszSerial)
222222
{
223223
return m_DBMySQL.DBModule_MySQL_TryDelete(lpszSerial);
224224
}
225-
extern "C" bool DBModule_MySQL_TryClear(int nThanValue, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enVerMode)
225+
extern "C" bool DBModule_MySQL_TryClear(int nThanValue, ENUM_VERIFICATION_MODULE_SERIAL_TYPE enVerMode)
226226
{
227227
return m_DBMySQL.DBModule_MySQL_TryClear(nThanValue, enVerMode);
228228
}

‎XEngine_Source/AuthorizeModule_Database/pch.h‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ 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"
28+
#include "../XEngine_OPenSource/XEngine_Module/XEngine_Verification/Verification_Define.h"
2929
#include "../XAuth_Protocol.h"
30-
#include "../AuthorizeModule_CDKey/CDKey_Define.h"
31-
#include "../AuthorizeModule_CDKey/CDKey_Error.h"
3230
#include "Database_Define.h"
3331
#include "Database_Error.h"
3432
/********************************************************************
@@ -46,24 +44,7 @@ extern bool SQLPacket_IsErrorOccur;
4644
extern XLONG SQLPacket_dwErrorCode;
4745

4846

49-
#ifdef _WINDOWS
47+
#ifdef _MSC_BUILD
5048
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
5149
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_DataBase.lib")
52-
#ifdef _DEBUG
53-
#ifdef _M_X64
54-
#pragma comment(lib,"../x64/Debug/AuthorizeModule_CDKey")
55-
#elif _M_ARM64
56-
#pragma comment(lib,"../ARM64/Debug/AuthorizeModule_CDKey")
57-
#elif _M_IX86
58-
#pragma comment(lib,"../Debug/AuthorizeModule_CDKey")
59-
#endif
60-
#else
61-
#ifdef _M_X64
62-
#pragma comment(lib,"../x64/Release/AuthorizeModule_CDKey")
63-
#elif _M_ARM64
64-
#pragma comment(lib,"../ARM64/Release/AuthorizeModule_CDKey")
65-
#elif _M_IX86
66-
#pragma comment(lib,"../Release/AuthorizeModule_CDKey")
67-
#endif
68-
#endif
6950
#endif

‎XEngine_Source/AuthorizeModule_Help/pch.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ using namespace std;
3131
#include <XEngine_Include/XEngine_Core/ManagePool_Define.h>
3232
#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Define.h>
3333
#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Error.h>
34-
#include "../XAuth_BuildSwitch.h"
3534
#include "AuthHelp_Define.h"
3635
#include "AuthHelp_Error.h"
3736
/********************************************************************

‎XEngine_Source/AuthorizeModule_Protocol/Protocol_Define.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ extern "C" bool Protocol_Packet_HttpComm(XCHAR* ptszMsgBuffer, int* pInt_MsgLen,
9898
意思：是否成功
9999
备注：
100100
*********************************************************************/
101-
extern "C" bool Protocol_Packet_HttpUserPass(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, AUTHORIZE_PROTOCOL_USERAUTHEX* pSt_UserAuth);
101+
extern "C" bool Protocol_Packet_HttpUserPass(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_PROTOCOL_USERAUTHEX* pSt_UserAuth);
102102
/********************************************************************
103103
函数名称：Protocol_Packet_UserTime
104104
函数功能：用户时间打包函数
@@ -473,7 +473,7 @@ extern "C" bool Protocol_Parse_HttpParseToken(LPCXSTR lpszMsgBuffer, int nMsgLen
473473
意思：是否成功
474474
备注：
475475
*********************************************************************/
476-
extern "C" bool Protocol_Parse_HttpParseAuth(LPCXSTR lpszMsgBuffer, int nMsgLen, AUTHORIZE_PROTOCOL_USERAUTHEX* pSt_UserAuth);
476+
extern "C" bool Protocol_Parse_HttpParseAuth(LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_PROTOCOL_USERAUTHEX* pSt_UserAuth);
477477
/********************************************************************
478478
函数名称：Protocol_Parse_HttpParseUser
479479
函数功能：解析用户信息
@@ -642,7 +642,7 @@ extern "C" bool Protocol_Parse_HttpParseSerial(LPCXSTR lpszMsgBuffer, int nMsgLe
642642
意思：是否成功
643643
备注：
644644
*********************************************************************/
645-
extern "C" bool Protocol_Parse_HttpParseSerial2(LPCXSTR lpszMsgBuffer, int nMsgLen, ENUM_AUTHORIZE_MODULE_SERIAL_TYPE * penSerialType, int* pInt_NumberCount, int* pInt_SerialCount, XCHAR * ptszHasTime, XCHAR* ptszExpiredTime);
645+
extern "C" bool Protocol_Parse_HttpParseSerial2(LPCXSTR lpszMsgBuffer, int nMsgLen, ENUM_VERIFICATION_MODULE_SERIAL_TYPE * penSerialType, int* pInt_NumberCount, int* pInt_SerialCount, XCHAR * ptszHasTime, XCHAR* ptszExpiredTime);
646646
/********************************************************************
647647
函数名称：Protocol_Parse_HttpParseOnline
648648
函数功能：解析在线列表
@@ -820,7 +820,7 @@ extern "C" bool Protocol_Parse_HttpParseBanned2(LPCXSTR lpszMsgBuffer, int nMsgL
820820
意思：是否成功
821821
备注：
822822
*********************************************************************/
823-
extern "C" bool Protocol_Parse_HttpParseCDKey(LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_Authorize);
823+
extern "C" bool Protocol_Parse_HttpParseCDKey(LPCXSTR lpszMsgBuffer, int nMsgLen, VERIFICATION_XAUTHKEY* pSt_Authorize);
824824
/********************************************************************
825825
函数名称：Protocol_Parse_HttpParseAnnouncement
826826
函数功能：解析公告信息

‎XEngine_Source/AuthorizeModule_Protocol/Protocol_Packet/Protocol_Packet.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ bool CProtocol_Packet::Protocol_Packet_HttpComm(XCHAR* ptszMsgBuffer, int* pInt_
159159
意思：是否成功
160160
备注：
161161
*********************************************************************/
162-
bool CProtocol_Packet::Protocol_Packet_HttpUserPass(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, AUTHORIZE_PROTOCOL_USERAUTHEX* pSt_UserAuth)
162+
bool CProtocol_Packet::Protocol_Packet_HttpUserPass(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_PROTOCOL_USERAUTHEX* pSt_UserAuth)
163163
{
164164
Protocol_IsErrorOccur = false;
165165

@@ -860,7 +860,7 @@ bool CProtocol_Packet::Protocol_Packet_HttpTryList(XCHAR* ptszMsgBuffer, int* pI
860860
st_JsonObject["nID"] = (Json::Value::Int64)(*pppSt_TryList)[i]->nID;
861861
st_JsonObject["nVTime"] = (*pppSt_TryList)[i]->nVTime;
862862
st_JsonObject["enVMode"] = (*pppSt_TryList)[i]->enVMode;
863-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == (*pppSt_TryList)[i]->enVMode)
863+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_DAY == (*pppSt_TryList)[i]->enVMode)
864864
{
865865
XENGINE_LIBTIME st_TimeStart = {};
866866
XENGINE_LIBTIME st_TimeEnd = {};

0 commit comments

Comments
 (0)