Skip to content

Commit 6f2eef7

Browse files
committed
delete:get notice of task code and modify notice permission
1 parent 551acd0 commit 6f2eef7

4 files changed

Lines changed: 8 additions & 24 deletions

File tree

‎XEngine_Docment/Docment_en.docx‎

69 Bytes
Binary file not shown.

‎XEngine_Docment/Docment_zh.docx‎

1.83 KB
Binary file not shown.

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Get/AuthorizeHTTP_GetTask.cpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,5 @@ bool XEngine_AuthorizeHTTP_GetTask(LPCXSTR lpszClientAddr, XCHAR** pptszList, in
5858
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
5959
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求获得动态验证码成功,TOKEN:%lld,验证码:%d"), lpszClientAddr, xhToken, nDCode);
6060
}
61-
else if (0 == _tcsxncmp(lpszAPINotice, tszURLValue, _tcsxlen(lpszAPINotice)))
62-
{
63-
XCHAR tszUserToken[128];
64-
memset(tszUserToken, '\0', sizeof(tszUserToken));
65-
BaseLib_String_GetKeyValue(pptszList[1], "=", tszURLKey, tszUserToken);
66-
67-
XENGINE_PROTOCOL_USERINFO st_UserInfo = {};
68-
if (!Session_Token_Get(_ttxoll(tszUserToken), &st_UserInfo))
69-
{
70-
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_NOTFOUND, "user not found");
71-
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
72-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,获取通告失败,无法继续,错误:%X"), lpszClientAddr, Session_GetLastError());
73-
return false;
74-
}
75-
//http://app.xyry.org:5302/api?function=notice
76-
XEngine_AuthorizeHTTP_Announcement(lpszClientAddr, _X("list"), NULL, 0);
77-
}
7861
return true;
7962
}

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,13 @@ bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
269269
//验证权限
270270
if (0 != st_UserTable.st_UserInfo.nUserLevel)
271271
{
272-
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_UNAUTHORIZE, "permission is failed");
273-
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
274-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求的API:%s 失败,因为TOKEN权限不足"), lpszClientAddr, pSt_HTTPParament->tszHttpUri);
275-
return false;
272+
if (0 != _tcsxncmp(_X("list"), tszAPIName, 4))
273+
{
274+
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_UNAUTHORIZE, "permission is failed");
275+
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
276+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求的API:%s 失败,因为TOKEN权限不足"), lpszClientAddr, pSt_HTTPParament->tszHttpUri);
277+
return false;
278+
}
276279
}
277280
XEngine_AuthorizeHTTP_Announcement(lpszClientAddr, tszAPIName, lpszMsgBuffer, nMsgLen);
278281
}
@@ -327,7 +330,6 @@ bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
327330
LPCXSTR lpszFuncName = _X("api");
328331
LPCXSTR lpszAPIVerDCode = _X("dcode");
329332
LPCXSTR lpszAPIVerTime = _X("time");
330-
LPCXSTR lpszAPIVerNotice = _X("notice");
331333

332334
memset(tszUrlName, '\0', sizeof(tszUrlName));
333335
HttpProtocol_ServerHelp_GetParament(pSt_HTTPParament->tszHttpUri, &pptszList, &nListCount, tszUrlName);
@@ -346,8 +348,7 @@ bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
346348
memset(tszURLValue, '\0', sizeof(tszURLValue));
347349

348350
BaseLib_String_GetKeyValue(pptszList[0], "=", tszURLKey, tszURLValue);
349-
if (0 == _tcsxncmp(lpszAPIVerDCode, tszURLValue, _tcsxlen(lpszAPIVerDCode)) || 0 == _tcsxncmp(lpszAPIVerTime, tszURLValue, _tcsxlen(lpszAPIVerTime)) ||
350-
0 == _tcsxncmp(lpszAPIVerNotice, tszURLValue, _tcsxlen(lpszAPIVerNotice)))
351+
if (0 == _tcsxncmp(lpszAPIVerDCode, tszURLValue, _tcsxlen(lpszAPIVerDCode)) || 0 == _tcsxncmp(lpszAPIVerTime, tszURLValue, _tcsxlen(lpszAPIVerTime)))
351352
{
352353
XEngine_AuthorizeHTTP_GetTask(lpszClientAddr, pptszList, nListCount);
353354
}

0 commit comments

Comments
 (0)