Skip to content

Commit a7b4bbd

Browse files
xengine-qytxengine-qyt
committed
modify:start parameter and http request name does not case-sensitive
1 parent ed58b40 commit a7b4bbd

5 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,44 +162,44 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
162162
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,HTTP验证类型:%d 通过"), lpszClientAddr, nVType);
163163
}
164164

165-
if (0 == _tcsxnicmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost)))
165+
if (0 == _tcsxncmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost)))
166166
{
167167
LPCXSTR lpszAPIPass = _X("Pass");
168168
LPCXSTR lpszAPIManage = _X("Manage");
169169
LPCXSTR lpszAPIAction = _X("Action");
170170

171171
BaseLib_String_GetKeyValueA(pptszUrlList[0], "=", tszStrKey, tszStrVlu);
172172
//通知类型.用于多服务器
173-
if (0 == _tcsxnicmp(lpszAPIPass, tszStrVlu, _tcsxlen(lpszAPIPass)))
173+
if (0 == _tcsxncmp(lpszAPIPass, tszStrVlu, _tcsxlen(lpszAPIPass)))
174174
{
175175
//http://127.0.0.1:5100/api?function=pass&param=xxx
176176
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
177177
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
178178
XEngine_Task_Pass(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
179179
}
180-
else if (0 == _tcsxnicmp(lpszAPIManage, tszStrVlu, _tcsxlen(lpszAPIManage)))
180+
else if (0 == _tcsxncmp(lpszAPIManage, tszStrVlu, _tcsxlen(lpszAPIManage)))
181181
{
182182
//http://127.0.0.1:5100/api?function=manage&param=xxx
183183
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
184184
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
185185
XEngine_Task_Manage(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
186186
}
187-
else if (0 == _tcsxnicmp(lpszAPIAction, tszStrVlu, _tcsxlen(lpszAPIAction)))
187+
else if (0 == _tcsxncmp(lpszAPIAction, tszStrVlu, _tcsxlen(lpszAPIAction)))
188188
{
189189
//http://127.0.0.1:5100/api?function=action&param=xxx
190190
memset(tszStrVlu, '\0', sizeof(tszStrVlu));
191191
BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
192192
Storage_TaskAction(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
193193
}
194194
}
195-
else if (0 == _tcsxnicmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
195+
else if (0 == _tcsxncmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodGet)))
196196
{
197197
//用于心跳
198198
//http://127.0.0.1:5100/api?function=heart
199199
LPCXSTR lpszAPIHeart = _X("heart");
200200

201201
BaseLib_String_GetKeyValueA(pptszUrlList[0], "=", tszStrKey, tszStrVlu);
202-
if (0 == _tcsxnicmp(lpszAPIHeart, tszStrVlu, _tcsxlen(lpszAPIHeart)))
202+
if (0 == _tcsxncmp(lpszAPIHeart, tszStrVlu, _tcsxlen(lpszAPIHeart)))
203203
{
204204
LPCXSTR lpszHdrBuffer = _X("Allow: POST GET PUT\r\n");
205205
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHdrBuffer);

‎XEngine_Source/XEngine_StorageApp/StorageApp_Config.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,49 +48,49 @@ bool StorageApp_Config_Parament(int argc,char **argv)
4848

4949
for (int i = 0;i < argc;i++)
5050
{
51-
if (0 == _tcsxicmp("-h",argv[i]))
51+
if (0 == _tcsxcmp("-h",argv[i]))
5252
{
5353
StorageApp_Config_ParamentHelp();
5454
return false;
5555
}
56-
if (0 == _tcsxicmp("-v", argv[i]))
56+
if (0 == _tcsxcmp("-v", argv[i]))
5757
{
5858
string m_StrVersion = st_ServiceCfg.st_XVer.pStl_ListStorage->front();
5959
printf("Version：%s\n", m_StrVersion.c_str());
6060
return false;
6161
}
62-
else if (0 == _tcsxicmp("-d", argv[i]))
62+
else if (0 == _tcsxcmp("-d", argv[i]))
6363
{
6464
st_ServiceCfg.bDeamon = _ttxoi(argv[++i]);
6565
}
66-
else if (0 == _tcsxicmp("-r", argv[i]))
66+
else if (0 == _tcsxcmp("-r", argv[i]))
6767
{
6868
st_ServiceCfg.st_Memory.bReload = true;
6969
}
70-
else if (0 == _tcsxicmp("-u", argv[i]))
70+
else if (0 == _tcsxcmp("-u", argv[i]))
7171
{
7272
st_ServiceCfg.bReuseraddr = true;
7373
}
74-
else if (0 == _tcsxicmp("-t", argv[i]))
74+
else if (0 == _tcsxcmp("-t", argv[i]))
7575
{
7676
bIsTest = true;
7777
}
78-
else if (0 == _tcsxicmp("-lt", argv[i]))
78+
else if (0 == _tcsxcmp("-lt", argv[i]))
7979
{
8080
st_ServiceCfg.st_XLog.nLogType = _ttxoi(argv[++i]);
8181
}
82-
else if (0 == _tcsxicmp("-l", argv[i]))
82+
else if (0 == _tcsxcmp("-l", argv[i]))
8383
{
8484
LPCXSTR lpszLogLevel = argv[++i];
85-
if (0 == _tcsxicmp("debug", lpszLogLevel))
85+
if (0 == _tcsxcmp("debug", lpszLogLevel))
8686
{
8787
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG;
8888
}
89-
else if (0 == _tcsxicmp("detail", lpszLogLevel))
89+
else if (0 == _tcsxcmp("detail", lpszLogLevel))
9090
{
9191
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DETAIL;
9292
}
93-
else if (0 == _tcsxicmp("info", lpszLogLevel))
93+
else if (0 == _tcsxcmp("info", lpszLogLevel))
9494
{
9595
st_ServiceCfg.st_XLog.nLogLeave = XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO;
9696
}

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskAction.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
113113

114114
if (0 == st_ActionInfo.byType || 1 == st_ActionInfo.byType)
115115
{
116-
if (0 == _tcsxnicmp(lpszAPIDownload, lpszAPIName, _tcsxlen(lpszAPIDownload)))
116+
if (0 == _tcsxncmp(lpszAPIDownload, lpszAPIName, _tcsxlen(lpszAPIDownload)))
117117
{
118118
XNETHANDLE xhToken = 0;
119119
BaseLib_Handle_Create(&xhToken);
@@ -138,7 +138,7 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
138138
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
139139
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,处理用户下载动作成功,URL:%s,路径:%s,句柄:%lld,类型:%d"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, xhToken, st_ActionInfo.byType);
140140
}
141-
else if (0 == _tcsxnicmp(lpszAPIUPload, lpszAPIName, _tcsxlen(lpszAPIUPload)))
141+
else if (0 == _tcsxncmp(lpszAPIUPload, lpszAPIName, _tcsxlen(lpszAPIUPload)))
142142
{
143143
XNETHANDLE xhToken = 0;
144144
BaseLib_Handle_Create(&xhToken);

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
2222

2323
st_HDRParam.bIsClose = true;
2424
st_HDRParam.nHttpCode = 200;
25-
if (0 == _tcsxnicmp(lpszAPIConfig, lpszAPIName, _tcsxlen(lpszAPIConfig)))
25+
if (0 == _tcsxncmp(lpszAPIConfig, lpszAPIName, _tcsxlen(lpszAPIConfig)))
2626
{
2727
StorageApp_Config_Parament(0, NULL);
2828
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
2929
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
3030
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,处理用户重载配置文件成功"), lpszClientAddr);
3131
}
32-
else if (0 == _tcsxnicmp(lpszAPIQuery, lpszAPIName, _tcsxlen(lpszAPIQuery)))
32+
else if (0 == _tcsxncmp(lpszAPIQuery, lpszAPIName, _tcsxlen(lpszAPIQuery)))
3333
{
3434
//查询文件列表
3535
int nMode = 0;
@@ -164,7 +164,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
164164
stl_ListFile.clear();
165165
}
166166
}
167-
else if (0 == _tcsxnicmp(lpszAPIInsert, lpszAPIName, _tcsxlen(lpszAPIInsert)))
167+
else if (0 == _tcsxncmp(lpszAPIInsert, lpszAPIName, _tcsxlen(lpszAPIInsert)))
168168
{
169169
int nListCount = 0;
170170
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -204,7 +204,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
204204
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
205205
BaseLib_Memory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
206206
}
207-
else if (0 == _tcsxnicmp(lpszAPIDelete, lpszAPIName, _tcsxlen(lpszAPIDelete)))
207+
else if (0 == _tcsxncmp(lpszAPIDelete, lpszAPIName, _tcsxlen(lpszAPIDelete)))
208208
{
209209
int nListCount = 0;
210210
XSTORAGECORE_DBFILE** ppSt_DBFile;
@@ -282,7 +282,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
282282
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
283283
BaseLib_Memory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
284284
}
285-
else if (0 == _tcsxnicmp(lpszAPIDir, lpszAPIName, _tcsxlen(lpszAPIDir)))
285+
else if (0 == _tcsxncmp(lpszAPIDir, lpszAPIName, _tcsxlen(lpszAPIDir)))
286286
{
287287
int nOPCode = 0;
288288
int nListCount = 0;
@@ -348,7 +348,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
348348
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求删除文件夹:%s,成功"), lpszClientAddr, tszRealDir);
349349
}
350350
}
351-
else if (0 == _tcsxnicmp(lpszAPIBucket, lpszAPIName, _tcsxlen(lpszAPIBucket)))
351+
else if (0 == _tcsxncmp(lpszAPIBucket, lpszAPIName, _tcsxlen(lpszAPIBucket)))
352352
{
353353
XCHAR tszBuckKey[XPATH_MAX] = {};
354354
Protocol_StorageParse_DirOperator(lpszMsgBuffer, NULL, tszBuckKey, NULL);
@@ -375,7 +375,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
375375
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
376376
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求获取BUCKET信息成功"), lpszClientAddr);
377377
}
378-
else if (0 == _tcsxnicmp(lpszAPIFlushSize, lpszAPIName, _tcsxlen(lpszAPIFlushSize)))
378+
else if (0 == _tcsxncmp(lpszAPIFlushSize, lpszAPIName, _tcsxlen(lpszAPIFlushSize)))
379379
{
380380
XCHAR tszBuckKey[XPATH_MAX] = {};
381381
Protocol_StorageParse_DirOperator(lpszMsgBuffer, NULL, tszBuckKey, NULL);
@@ -384,7 +384,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
384384
XENGINE_STORAGEBUCKET st_StorageBucket = {};
385385
for (auto stl_ListIterator = st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->begin(); stl_ListIterator != st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->end(); stl_ListIterator++)
386386
{
387-
if (0 == _tcsxnicmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
387+
if (0 == _tcsxncmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
388388
{
389389
APIHelp_Api_GetDIRSize(stl_ListIterator->tszFilePath, &stl_ListIterator->nBuckSize);
390390
st_StorageBucket = *stl_ListIterator;
@@ -398,7 +398,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
398398
{
399399
for (auto stl_ListIterator = st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->begin(); stl_ListIterator != st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->end(); stl_ListIterator++)
400400
{
401-
if (0 == _tcsxnicmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
401+
if (0 == _tcsxncmp(stl_ListIterator->tszBuckKey, tszBuckKey, _tcsxlen(stl_ListIterator->tszBuckKey)))
402402
{
403403
APIHelp_Api_GetDIRSize(stl_ListIterator->tszFilePath, &stl_ListIterator->nBuckSize);
404404
}
@@ -409,7 +409,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
409409
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
410410
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求刷新BUCKET大小成功"), lpszClientAddr);
411411
}
412-
else if (0 == _tcsxnicmp(lpszAPITask, lpszAPIName, _tcsxlen(lpszAPITask)))
412+
else if (0 == _tcsxncmp(lpszAPITask, lpszAPIName, _tcsxlen(lpszAPITask)))
413413
{
414414
int nDLCount = 0;
415415
int nUPCount = 0;

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskPass.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
1414
st_HDRParam.bIsClose = true;
1515
st_HDRParam.nHttpCode = 200;
1616
//下载
17-
if (0 == _tcsxnicmp(lpszAPIUPFile, lpszAPIName, _tcsxlen(lpszAPIUPFile)))
17+
if (0 == _tcsxncmp(lpszAPIUPFile, lpszAPIName, _tcsxlen(lpszAPIUPFile)))
1818
{
1919
XCHAR tszClientAddr[128];
2020
XSTORAGECORE_DBFILE st_DBFile;
@@ -26,7 +26,7 @@ bool XEngine_Task_Pass(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lpsz
2626
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
2727
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);
2828
}
29-
else if (0 == _tcsxnicmp(lpszAPIDLFile, lpszAPIName, _tcsxlen(lpszAPIDLFile)))
29+
else if (0 == _tcsxncmp(lpszAPIDLFile, lpszAPIName, _tcsxlen(lpszAPIDLFile)))
3030
{
3131
__int64x nFileSize = 0;
3232
XCHAR tszPathKey[XPATH_MAX];

0 commit comments

Comments
 (0)