Skip to content

Commit 194187c

Browse files
xengine-qytxengine-qyt
committed
delete:cdkey functions.
1 parent 36b5944 commit 194187c

File tree

13 files changed

+2
-292
lines changed

13 files changed

+2
-292
lines changed

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Define.h‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -451,30 +451,6 @@ extern "C" BOOL ModuleProtocol_Parse_Translation(LPCTSTR lpszMsgBuffer, int nMsg
451451
*********************************************************************/
452452
extern "C" BOOL ModuleProtocol_Parse_P2PClient(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_P2XPPEER_PROTOCOL * pSt_P2XPPeer);
453453
/********************************************************************
454-
函数名称：ModuleProtocol_Parse_CDKey
455-
函数功能：解析CDKEY
456-
参数.一：lpszMsgBuffer
457-
In/Out：In
458-
类型：常量字符指针
459-
可空：N
460-
意思：输入要解析的缓冲区
461-
参数.二：nMsgLen
462-
In/Out：In
463-
类型：整数型
464-
可空：N
465-
意思：输入缓冲区大小
466-
参数.三：pSt_Authorize
467-
In/Out：Out
468-
类型：数据结构指针
469-
可空：N
470-
意思：输出解析后的信息
471-
返回值
472-
类型：逻辑型
473-
意思：是否成功
474-
备注：
475-
*********************************************************************/
476-
extern "C" BOOL ModuleProtocol_Parse_CDKey(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_Authorize);
477-
/********************************************************************
478454
函数名称：ModuleProtocol_Parse_ZIPCode
479455
函数功能：解析邮政地址信息
480456
参数.一：lpszMsgBuffer

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.cpp‎

Lines changed: 0 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -312,139 +312,6 @@ BOOL CModuleProtocol_Parse::ModuleProtocol_Parse_P2PClient(LPCTSTR lpszMsgBuffer
312312
return TRUE;
313313
}
314314
/********************************************************************
315-
函数名称：ModuleProtocol_Parse_CDKey
316-
函数功能：解析CDKEY
317-
参数.一：lpszMsgBuffer
318-
In/Out：In
319-
类型：常量字符指针
320-
可空：N
321-
意思：输入要解析的缓冲区
322-
参数.二：nMsgLen
323-
In/Out：In
324-
类型：整数型
325-
可空：N
326-
意思：输入缓冲区大小
327-
参数.三：pSt_Authorize
328-
In/Out：Out
329-
类型：数据结构指针
330-
可空：N
331-
意思：输出解析后的信息
332-
返回值
333-
类型：逻辑型
334-
意思：是否成功
335-
备注：
336-
*********************************************************************/
337-
BOOL CModuleProtocol_Parse::ModuleProtocol_Parse_CDKey(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_Authorize)
338-
{
339-
ModuleProtocol_IsErrorOccur = FALSE;
340-
341-
if ((NULL == lpszMsgBuffer) || (NULL == pSt_Authorize))
342-
{
343-
ModuleProtocol_IsErrorOccur = TRUE;
344-
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PARSE_PARAMENT;
345-
return FALSE;
346-
}
347-
Json::Value st_JsonRoot;
348-
JSONCPP_STRING st_JsonError;
349-
Json::CharReaderBuilder st_ReaderBuilder;
350-
//解析JSON
351-
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_ReaderBuilder.newCharReader());
352-
if (!pSt_JsonReader->parse(lpszMsgBuffer, lpszMsgBuffer + nMsgLen, &st_JsonRoot, &st_JsonError))
353-
{
354-
ModuleProtocol_IsErrorOccur = TRUE;
355-
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PARSE_PARAMENT;
356-
return FALSE;
357-
}
358-
359-
if (!st_JsonRoot["tszAddr"].isNull())
360-
{
361-
_tcscpy(pSt_Authorize->tszAddr, st_JsonRoot["tszAddr"].asCString());
362-
}
363-
if (!st_JsonRoot["nPort"].isNull())
364-
{
365-
pSt_Authorize->nPort = st_JsonRoot["nPort"].asInt();
366-
}
367-
//应用信息
368-
Json::Value st_JsonAPPInfo = st_JsonRoot["st_AuthAppInfo"];
369-
if (!st_JsonAPPInfo["nExecTime"].isNull())
370-
{
371-
pSt_Authorize->st_AuthAppInfo.nExecTime = st_JsonAPPInfo["nExecTime"].asInt();
372-
}
373-
if (!st_JsonAPPInfo["bInit"].isNull())
374-
{
375-
pSt_Authorize->st_AuthAppInfo.bInit = st_JsonAPPInfo["bInit"].asBool();
376-
}
377-
if (!st_JsonAPPInfo["tszAppName"].isNull())
378-
{
379-
_tcscpy(pSt_Authorize->st_AuthAppInfo.tszAppName, st_JsonAPPInfo["tszAppName"].asCString());
380-
}
381-
if (!st_JsonAPPInfo["tszAppVer"].isNull())
382-
{
383-
_tcscpy(pSt_Authorize->st_AuthAppInfo.tszAppVer, st_JsonAPPInfo["tszAppVer"].asCString());
384-
}
385-
//注册信息
386-
Json::Value st_JsonREGInfo = st_JsonRoot["st_AuthRegInfo"];
387-
if (!st_JsonREGInfo["nHasTime"].isNull())
388-
{
389-
pSt_Authorize->st_AuthRegInfo.nHasTime = (ENUM_HELPCOMPONENTS_AUTHORIZE_REG_TYPE)st_JsonREGInfo["nHasTime"].asInt();
390-
}
391-
if (!st_JsonREGInfo["enSerialType"].isNull())
392-
{
393-
pSt_Authorize->st_AuthRegInfo.enSerialType = (ENUM_HELPCOMPONENTS_AUTHORIZE_SERIAL_TYPE)st_JsonREGInfo["enSerialType"].asInt();
394-
}
395-
if (!st_JsonREGInfo["enRegType"].isNull())
396-
{
397-
pSt_Authorize->st_AuthRegInfo.enRegType = (ENUM_HELPCOMPONENTS_AUTHORIZE_REG_TYPE)st_JsonREGInfo["enRegType"].asInt();
398-
}
399-
if (!st_JsonREGInfo["enHWType"].isNull())
400-
{
401-
pSt_Authorize->st_AuthRegInfo.enHWType = (ENUM_HELPCOMPONENTS_AUTHORIZE_HW_TYPE)st_JsonREGInfo["enHWType"].asInt();
402-
}
403-
if (!st_JsonREGInfo["enVModeType"].isNull())
404-
{
405-
pSt_Authorize->st_AuthRegInfo.enVModeType = (ENUM_HELPCOMPONENTS_AUTHORIZE_VERMODE_TYPE)st_JsonREGInfo["enVModeType"].asInt();
406-
}
407-
if (!st_JsonREGInfo["tszHardware"].isNull())
408-
{
409-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszHardware, st_JsonREGInfo["tszHardware"].asCString());
410-
}
411-
if (!st_JsonREGInfo["tszCreateTime"].isNull())
412-
{
413-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszCreateTime, st_JsonREGInfo["tszCreateTime"].asCString());
414-
}
415-
if (!st_JsonREGInfo["tszRegisterTime"].isNull())
416-
{
417-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszRegisterTime, st_JsonREGInfo["tszRegisterTime"].asCString());
418-
}
419-
if (!st_JsonREGInfo["tszLeftTime"].isNull())
420-
{
421-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszLeftTime, st_JsonREGInfo["tszLeftTime"].asCString());
422-
}
423-
if (!st_JsonREGInfo["tszStartTime"].isNull())
424-
{
425-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszStartTime, st_JsonREGInfo["tszStartTime"].asCString());
426-
}
427-
if (!st_JsonREGInfo["tszExpiryTime"].isNull())
428-
{
429-
_tcscpy(pSt_Authorize->st_AuthRegInfo.tszExpiryTime, st_JsonREGInfo["tszExpiryTime"].asCString());
430-
}
431-
//CDKEY用户信息
432-
Json::Value st_JsonUserInfo = st_JsonRoot["st_AuthUserInfo"];
433-
if (!st_JsonUserInfo["tszUserName"].isNull())
434-
{
435-
_tcscpy(pSt_Authorize->st_AuthUserInfo.tszUserName, st_JsonUserInfo["tszUserName"].asCString());
436-
}
437-
if (!st_JsonUserInfo["tszUserContact"].isNull())
438-
{
439-
_tcscpy(pSt_Authorize->st_AuthUserInfo.tszUserContact, st_JsonUserInfo["tszUserContact"].asCString());
440-
}
441-
if (!st_JsonUserInfo["tszCustom"].isNull())
442-
{
443-
_tcscpy(pSt_Authorize->st_AuthUserInfo.tszCustom, st_JsonUserInfo["tszCustom"].asCString());
444-
}
445-
return TRUE;
446-
}
447-
/********************************************************************
448315
函数名称：ModuleProtocol_Parse_ZIPCode
449316
函数功能：解析邮政地址信息
450317
参数.一：lpszMsgBuffer

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class CModuleProtocol_Parse
2222
BOOL ModuleProtocol_Parse_Bank(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_BANKINFO* pSt_BankInfo);
2323
BOOL ModuleProtocol_Parse_Translation(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_LANGUAGEINFO* pSt_LanguageInfo);
2424
BOOL ModuleProtocol_Parse_P2PClient(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_P2XPPEER_PROTOCOL* pSt_P2XPPeer);
25-
BOOL ModuleProtocol_Parse_CDKey(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL* pSt_Authorize);
2625
BOOL ModuleProtocol_Parse_ZIPCode(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_ZIPINFO* pSt_ZIPInfo);
2726
BOOL ModuleProtocol_Parse_XLog(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_XLOGINFO* pSt_XLogInfo);
2827
private:

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ EXPORTS
1919
ModuleProtocol_Parse_Bank
2020
ModuleProtocol_Parse_Translation
2121
ModuleProtocol_Parse_P2PClient
22-
ModuleProtocol_Parse_CDKey
2322
ModuleProtocol_Parse_ZIPCode
2423
ModuleProtocol_Parse_XLog

‎XEngine_Source/XEngine_ModuleProtocol/pch.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ extern "C" BOOL ModuleProtocol_Parse_P2PClient(LPCTSTR lpszMsgBuffer, int nMsgLe
9494
{
9595
return m_ProtocolParse.ModuleProtocol_Parse_P2PClient(lpszMsgBuffer, nMsgLen, pSt_P2XPPeer);
9696
}
97-
extern "C" BOOL ModuleProtocol_Parse_CDKey(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_AUTHORIZE_LOCAL * pSt_Authorize)
98-
{
99-
return m_ProtocolParse.ModuleProtocol_Parse_CDKey(lpszMsgBuffer, nMsgLen, pSt_Authorize);
100-
}
10197
extern "C" BOOL ModuleProtocol_Parse_ZIPCode(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_ZIPINFO * pSt_ZIPInfo)
10298
{
10399
return m_ProtocolParse.ModuleProtocol_Parse_ZIPCode(lpszMsgBuffer, nMsgLen, pSt_ZIPInfo);

‎XEngine_Source/XEngine_ModuleProtocol/pch.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2424
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
26-
#include <XEngine_Include/XEngine_HelpComponents/Authorize_Define.h>
27-
#include <XEngine_Include/XEngine_HelpComponents/Authorize_Error.h>
2826
using namespace std;
2927
#include "../XEngine_UserProtocol.h"
3028
#include "ModuleProtocol_Define.h"

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ UNICODE = 0
44
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp \
55
-L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin \
66
-L ../../XEngine_ThirdPart/jsoncpp
7-
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lHelpComponents_XLog -lHelpComponents_Authorize -lRfcComponents_HttpServer -lNetHelp_APIClient \
7+
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lHelpComponents_XLog -lRfcComponents_HttpServer -lNetHelp_APIClient \
88
-lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleHelp -lXEngine_ModulePlugin \
99
-ljsoncpp
1010
LIBEX = -ldl -lpthread
1111
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1212
LIBINCLUDE = XEngine_Configure.o XEngine_Network.o XEngine_HTTPTask.o XEngine_PluginTask.o XEngine_HttpApp.o \
13-
HTTPTask_IDCard.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o HTTPTask_OPtions.o HTTPTask_CDKey.o HTTPTask_Locker.o HTTPTask_PostCode.o
13+
HTTPTask_IDCard.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o HTTPTask_OPtions.o HTTPTask_Locker.o HTTPTask_PostCode.o
1414

1515
ifeq ($(shell uname),Darwin)
1616
LOADSO =
@@ -54,8 +54,6 @@ HTTPTask_P2PClient.o:./XEngine_HTTPTask/HTTPTask_P2PClient.cpp
5454
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_P2PClient.cpp
5555
HTTPTask_OPtions.o:./XEngine_HTTPTask/HTTPTask_OPtions.cpp
5656
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_OPtions.cpp
57-
HTTPTask_CDKey.o:./XEngine_HTTPTask/HTTPTask_CDKey.cpp
58-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_CDKey.cpp
5957
HTTPTask_Locker.o:./XEngine_HTTPTask/HTTPTask_Locker.cpp
6058
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_Locker.cpp
6159
HTTPTask_PostCode.o:./XEngine_HTTPTask/HTTPTask_PostCode.cpp

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask.cpp‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ BOOL XEngine_HTTPTask_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCTSTR
9696
LPCTSTR lpszParamLocker = _T("lock");
9797
//post
9898
LPCTSTR lpszParamP2PClient = _T("p2p");
99-
LPCTSTR lpszParamCDKey = _T("cdkey");
10099
LPCTSTR lpszParamZIPCode = _T("zipcode");
101100
LPCTSTR lpszParamXLog = _T("log");
102101

@@ -149,34 +148,6 @@ BOOL XEngine_HTTPTask_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCTSTR
149148
}
150149
XEngine_HTTPTask_P2PClient(lpszClientAddr, lpszRVBuffer, nRVLen, _ttoi(tszValue));
151150
}
152-
else if (0 == _tcsnicmp(lpszParamCDKey, tszValue, _tcslen(lpszParamCDKey)))
153-
{
154-
//是不是CDKEY生成器:http://app.xyry.org:5501/api?function=cdkey&params1=0&params2=123456
155-
memset(tszKey, '\0', sizeof(tszKey));
156-
memset(tszValue, '\0', sizeof(tszValue));
157-
BaseLib_OperatorString_GetKeyValue(pptszList[1], "=", tszKey, tszValue);
158-
if (0 != _tcsnicmp(lpszParamName, tszKey, _tcslen(lpszParamName)))
159-
{
160-
st_HDRParam.nHttpCode = 404;
161-
RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam);
162-
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
163-
BaseLib_OperatorMemory_Free((XPPPMEM)&pptszList, nListCount);
164-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("HTTP客户端:%s,发送的URL请求参数不正确:%s"), lpszClientAddr, pSt_HTTPParam->tszHttpUri);
165-
return FALSE;
166-
}
167-
int nOPType = _ttoi(tszValue);
168-
if (3 == nListCount)
169-
{
170-
memset(tszKey, '\0', sizeof(tszKey));
171-
memset(tszValue, '\0', sizeof(tszValue));
172-
BaseLib_OperatorString_GetKeyValue(pptszList[2], "=", tszKey, tszValue);
173-
XEngine_HTTPTask_CDKey(lpszClientAddr, lpszRVBuffer, nRVLen, nOPType, tszValue);
174-
}
175-
else
176-
{
177-
XEngine_HTTPTask_CDKey(lpszClientAddr, lpszRVBuffer, nRVLen, nOPType);
178-
}
179-
}
180151
else if (0 == _tcsnicmp(lpszParamZIPCode, tszValue, _tcslen(lpszParamZIPCode)))
181152
{
182153
//邮政信息:http://app.xyry.org:5501/api?function=zipcode&params1=0

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_CDKey.cpp‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_CDKey.h‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)