Skip to content

Commit 57d2358

Browse files
committed
delete task event cpp
remove XENGINE_STORAGE_APP_METHOD_CONFIG to task manage
1 parent 13d074a commit 57d2358

File tree

6 files changed

+9
-128
lines changed

6 files changed

+9
-128
lines changed

XEngine_Source/XEngine_StorageApp/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XE
55
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_NetXApi -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol
66
LIBEX = -static-libgcc -ldl -lrt -lpthread
77
LOADSO = -Wl,-rpath=./,--disable-new-dtags
8-
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_APPHelp.o Storage_TaskEvent.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o
8+
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_APPHelp.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o
99

1010
ifeq ($(RELEASE),1)
1111
FLAGS = -c -O2
@@ -39,9 +39,6 @@ StorageApp_P2XPNet.o:./StorageApp_P2XPNet.cpp
3939

4040
Storage_APPHelp.o:./Storage_APPHelp/Storage_APPHelp.cpp
4141
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPHelp/Storage_APPHelp.cpp
42-
43-
Storage_TaskEvent.o:./Storage_APPTask/Storage_TaskEvent.cpp
44-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPTask/Storage_TaskEvent.cpp
4542
Storage_TaskPass.o:./Storage_APPTask/Storage_TaskPass.cpp
4643
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPTask/Storage_TaskPass.cpp
4744
Storage_TaskManage.o:./Storage_APPTask/Storage_TaskManage.cpp

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
105105
{
106106
XEngine_Task_Pass(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
107107
}
108-
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_EVENT, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_EVENT)))
109-
{
110-
XEngine_Task_Event(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
111-
}
112108
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_MANAGE, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_MANAGE)))
113109
{
114110
XEngine_Task_Manage(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
109109
#include "StorageApp_UPLoader.h"
110110
#include "StorageApp_Center.h"
111111
#include "StorageApp_P2XPNet.h"
112-
#include "Storage_APPTask/Storage_TaskEvent.h"
113112
#include "Storage_APPTask/Storage_TaskPass.h"
114113
#include "Storage_APPTask/Storage_TaskP2p.h"
115114
#include "Storage_APPTask/Storage_TaskManage.h"

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskEvent.cpp

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

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskEvent.h

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

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "../StorageApp_Hdr.h"
22

3-
43
BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, TCHAR** pptszListHdr, int nHdrCount)
54
{
65
int nSDLen = 2048;
@@ -15,8 +14,14 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
1514

1615
st_HDRParam.bIsClose = TRUE;
1716
st_HDRParam.nHttpCode = 200;
18-
//文件存储成功的事件上传
19-
if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_ADD, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_ADD)))
17+
if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_CONFIG, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_CONFIG)))
18+
{
19+
StorageApp_Config_Parament(0, NULL);
20+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
21+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
22+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,处理用户重载配置文件成功"), lpszClientAddr);
23+
}
24+
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_ADD, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_ADD)))
2025
{
2126
int nListCount = 0;
2227
XSTORAGECORE_DBFILE** ppSt_DBFile;

0 commit comments

Comments
 (0)