Skip to content

Commit d83de9e

Browse files
committed
modify:define http request type modify to const char *
1 parent 240e499 commit d83de9e

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
5757

5858
LPCXSTR lpszMethodPost = _X("POST");
5959
LPCXSTR lpszMethodOption = _X("OPTIONS");
60+
LPCXSTR lpszMethodPass = _X("Pass");
61+
LPCXSTR lpszMehtodManage = _X("Manage");
6062

6163
if (st_ServiceCfg.st_XAuth.bCHAuth)
6264
{
@@ -127,11 +129,11 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
127129
return false;
128130
}
129131
//通知类型.用于多服务器
130-
if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_TASK_PASS, tszAPIMethod, _tcsxlen(XENGINE_STORAGE_APP_TASK_PASS)))
132+
if (0 == _tcsxnicmp(lpszMethodPass, tszAPIMethod, _tcsxlen(lpszMethodPass)))
131133
{
132134
XEngine_Task_Pass(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
133135
}
134-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_TASK_MANAGE, tszAPIMethod, _tcsxlen(XENGINE_STORAGE_APP_TASK_MANAGE)))
136+
else if (0 == _tcsxnicmp(lpszMehtodManage, tszAPIMethod, _tcsxlen(lpszMehtodManage)))
135137
{
136138
XEngine_Task_Manage(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
137139
}
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#pragma once
2-
#define XENGINE_STORAGE_APP_TASK_PASS _X("Pass")
3-
#define XENGINE_STORAGE_APP_TASK_MANAGE _X("Manage")
4-
5-
#define XENGINE_STORAGE_APP_METHOD_CONFIG _X("Config")
6-
#define XENGINE_STORAGE_APP_METHOD_UPFILE _X("UPFile")
7-
#define XENGINE_STORAGE_APP_METHOD_DLFILE _X("DLFile")
8-
2+
/********************************************************************
3+
// Created: 2024/04/16 10:43:39
4+
// File Name: D:\XEngine_Storage\XEngine_Source\XEngine_StorageApp\StorageApp_Center.h
5+
// File Path: D:\XEngine_Storage\XEngine_Source\XEngine_StorageApp
6+
// File Base: StorageApp_Center
7+
// File Ext: h
8+
// Project: XEngine(网络通信引擎)
9+
// Author: qyt
10+
// Purpose: HTTP管理服务处理类
11+
// History:
12+
*********************************************************************/
913
XHTHREAD CALLBACK XEngine_Center_HTTPThread(XPVOID lParam);
1014
bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount);

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
66
int nRVLen = 10240;
77
XCHAR tszSDBuffer[10240];
88
XCHAR tszRVBuffer[10240];
9+
LPCXSTR lpszAPIConfig = _X("Config");
10+
LPCXSTR lpszAPIInsert = _X("Insert");
11+
LPCXSTR lpszAPIDelete = _X("Delete");
12+
LPCXSTR lpszAPIQuery = _X("Query");
13+
LPCXSTR lpszAPIDir = _X("Dir");
14+
LPCXSTR lpszAPITask = _X("Task");
915
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam;
1016

1117
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
@@ -14,14 +20,14 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
1420

1521
st_HDRParam.bIsClose = true;
1622
st_HDRParam.nHttpCode = 200;
17-
if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_CONFIG, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_CONFIG)))
23+
if (0 == _tcsxnicmp(lpszAPIConfig, lpszAPIName, _tcsxlen(lpszAPIConfig)))
1824
{
1925
StorageApp_Config_Parament(0, NULL);
2026
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
2127
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
2228
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,处理用户重载配置文件成功"), lpszClientAddr);
2329
}
24-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_QUERY, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_QUERY)))
30+
else if (0 == _tcsxnicmp(lpszAPIQuery, lpszAPIName, _tcsxlen(lpszAPIQuery)))
2531
{
2632
//查询文件列表
2733
int nMode = 0;
@@ -160,7 +166,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
160166
stl_ListFile.clear();
161167
}
162168
}
163-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_INSERT, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_INSERT)))
169+
else if (0 == _tcsxnicmp(lpszAPIInsert, lpszAPIName, _tcsxlen(lpszAPIInsert)))
164170
{
165171
int nListCount = 0;
166172
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -200,7 +206,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
200206
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
201207
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
202208
}
203-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_DELETE, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_DELETE)))
209+
else if (0 == _tcsxnicmp(lpszAPIDelete, lpszAPIName, _tcsxlen(lpszAPIDelete)))
204210
{
205211
int nListCount = 0;
206212
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -275,7 +281,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
275281
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
276282
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
277283
}
278-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_DIR, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_DIR)))
284+
else if (0 == _tcsxnicmp(lpszAPIDir, lpszAPIName, _tcsxlen(lpszAPIDir)))
279285
{
280286
int nOPCode = 0;
281287
int nListCount = 0;
@@ -368,7 +374,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
368374
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求删除文件夹:%s,成功"), lpszClientAddr, tszRealDir);
369375
}
370376
}
371-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_TASK, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_TASK)))
377+
else if (0 == _tcsxnicmp(lpszAPITask, lpszAPIName, _tcsxlen(lpszAPITask)))
372378
{
373379
int nDLCount = 0;
374380
int nUPCount = 0;
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
#pragma once
22

3-
#define XENGINE_STORAGE_APP_METHOD_INSERT _X("Insert")
4-
#define XENGINE_STORAGE_APP_METHOD_DELETE _X("Delete")
5-
#define XENGINE_STORAGE_APP_METHOD_QUERY _X("Query")
6-
#define XENGINE_STORAGE_APP_METHOD_DIR _X("Dir")
7-
#define XENGINE_STORAGE_APP_METHOD_TASK _X("Task")
8-
93
bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount);

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskPass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
44
{
55
int nSDLen = 2048;
66
XCHAR tszSDBuffer[2048];
7+
LPCXSTR lpszAPIUPFile = _X("UPFile");
8+
LPCXSTR lpszAPIDLFile = _X("DLFile");
79
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam;
810

911
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
@@ -12,7 +14,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
1214
st_HDRParam.bIsClose = true;
1315
st_HDRParam.nHttpCode = 200;
1416
//下载
15-
if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_UPFILE, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_UPFILE)))
17+
if (0 == _tcsxnicmp(lpszAPIUPFile, lpszAPIName, _tcsxlen(lpszAPIUPFile)))
1618
{
1719
XCHAR tszClientAddr[128];
1820
XSTORAGECORE_DBFILE st_DBFile;
@@ -24,7 +26,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
2426
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
2527
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求的上传文件通知协议成功,Bucket:%s,文件名:%s,大小:%d"), lpszClientAddr, st_DBFile.tszBuckKey, st_DBFile.st_ProtocolFile.tszFileName, st_DBFile.st_ProtocolFile.nFileSize);
2628
}
27-
else if (0 == _tcsxnicmp(XENGINE_STORAGE_APP_METHOD_DLFILE, lpszAPIName, _tcsxlen(XENGINE_STORAGE_APP_METHOD_DLFILE)))
29+
else if (0 == _tcsxnicmp(lpszAPIDLFile, lpszAPIName, _tcsxlen(lpszAPIDLFile)))
2830
{
2931
__int64x nFileSize = 0;
3032
XCHAR tszPathKey[MAX_PATH];

0 commit comments

Comments
 (0)