Skip to content

Commit f6df98e

Browse files
committed
modify:delete topic and create topic issue and method name
update:configure file
1 parent 0f823f6 commit f6df98e

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@
4343
"nTimeCount":0
4444
},
4545
"XAuthorize":{
46-
"bHTTPAuth":true,
47-
"tszHTTPPass":"",
48-
"tszToken":"MQPasskey"
46+
"bHTTPAuth":true
4947
},
5048
"XReport":{
5149
"bEnable":true,

XEngine_Source/MQCore_ConfigModule/Config_Define.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ typedef struct
6767
struct
6868
{
6969
bool bHTTPAuth;
70-
XCHAR tszHTTPPass[MAX_PATH];
71-
XCHAR tszToken[MAX_PATH];
7270
}st_XAuthorize;
7371
struct
7472
{

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,14 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
137137
pSt_ServerConfig->st_XMemory.nTimeLast = st_JsonXMemory["nTimeLast"].asInt();
138138
pSt_ServerConfig->st_XMemory.nTimeCount = st_JsonXMemory["nTimeCount"].asInt();
139139

140-
if (st_JsonRoot["XAuthorize"].empty() || (3 != st_JsonRoot["XAuthorize"].size()))
140+
if (st_JsonRoot["XAuthorize"].empty() || (1 != st_JsonRoot["XAuthorize"].size()))
141141
{
142142
Config_IsErrorOccur = true;
143143
Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XAUTHORIZE;
144144
return false;
145145
}
146146
Json::Value st_JsonXAuthorize = st_JsonRoot["XAuthorize"];
147147
pSt_ServerConfig->st_XAuthorize.bHTTPAuth = st_JsonXAuthorize["bHTTPAuth"].asBool();
148-
_tcsxcpy(pSt_ServerConfig->st_XAuthorize.tszHTTPPass, st_JsonXAuthorize["tszHTTPPass"].asCString());
149-
_tcsxcpy(pSt_ServerConfig->st_XAuthorize.tszToken, st_JsonXAuthorize["tszToken"].asCString());
150148

151149
if (st_JsonRoot["XReport"].empty() || (3 != st_JsonRoot["XReport"].size()))
152150
{

XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPPost.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
2323
LPCXSTR lpszAPIGetList = _X("getlist");
2424
LPCXSTR lpszAPIGetOnline = _X("getonline");
2525
LPCXSTR lpszAPICreateTopic = _X("createtopic");
26-
LPCXSTR lpszAPIDelTopic = _X("deltopic");
27-
LPCXSTR lpszAPIDelUser = _X("deluser");
26+
LPCXSTR lpszAPIDelTopic = _X("deletetopic");
27+
LPCXSTR lpszAPIDelUser = _X("deleteuser");
2828

2929
//判断是否需要验证,不是注册协议
3030
if (st_ServiceCfg.st_XAuthorize.bHTTPAuth && (0 != _tcsxnicmp(lpszAPIRegister, lpszFuncName, _tcsxlen(lpszAPIRegister))))
@@ -162,12 +162,12 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
162162

163163
st_ProtocolHdr.xhToken = xhToken;
164164
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQTOPICCREATE;
165-
MessageQueue_TCP_Handle(&st_ProtocolHdr, lpszClientAddr, (LPCXSTR)&st_MQProtocol, sizeof(XENGINE_PROTOCOLHDR), XENGINE_MQAPP_NETTYPE_HTTP);
165+
MessageQueue_TCP_Handle(&st_ProtocolHdr, lpszClientAddr, (LPCXSTR)&st_MQProtocol, sizeof(XENGINE_PROTOCOL_XMQ), XENGINE_MQAPP_NETTYPE_HTTP);
166166
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求主题删除成功,主题名:%s"), lpszClientAddr, st_MQProtocol.tszMQKey);
167167
}
168168
else if (0 == _tcsxnicmp(lpszAPIDelTopic, lpszFuncName, _tcsxlen(lpszAPIDelTopic)))
169169
{
170-
//http://127.0.0.1:5202/api?function=deltopic
170+
//http://127.0.0.1:5202/api?function=deletetopic
171171

172172
XENGINE_PROTOCOL_XMQ st_MQProtocol = {};
173173
XENGINE_PROTOCOLHDR st_ProtocolHdr = {};
@@ -177,7 +177,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
177177

178178
st_ProtocolHdr.xhToken = xhToken;
179179
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQTOPICDELETE;
180-
MessageQueue_TCP_Handle(&st_ProtocolHdr, lpszClientAddr, (LPCXSTR)&st_MQProtocol, sizeof(XENGINE_PROTOCOLHDR), XENGINE_MQAPP_NETTYPE_HTTP);
180+
MessageQueue_TCP_Handle(&st_ProtocolHdr, lpszClientAddr, (LPCXSTR)&st_MQProtocol, sizeof(XENGINE_PROTOCOL_XMQ), XENGINE_MQAPP_NETTYPE_HTTP);
181181
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求主题删除成功,主题名:%s"), lpszClientAddr, st_MQProtocol.tszMQKey);
182182
}
183183
else if (0 == _tcsxnicmp(lpszAPIDelUser, lpszFuncName, _tcsxlen(lpszAPIDelUser)))

0 commit comments

Comments
 (0)