added:register bind comm topic

Author: xengine-qyt

XEngine_Apps/MQCore_TCPApp/MQCore_TCPApp.cpp

@@ -24,7 +24,9 @@ using namespace std;
 
 XSOCKET m_Socket;
 __int64x nLastNumber = 0;
-LPCXSTR lpszKey = _X("XEngine_NotifyKey");  //主题
+LPCXSTR lpszKey = _X("XEngine_CommKey");  //主题
+LPCXSTR lpszUser = _X("aaadddzxc");
+LPCXSTR lpszPass = _X("123123");
 
 void MQ_Register()
 {
@@ -48,8 +50,8 @@ void MQ_Register()
 	st_ProtocolInfo.nUserState = 0;
 	st_ProtocolInfo.nPhoneNumber = 13699999999;
 	st_ProtocolInfo.nIDNumber = 511000000000101010;
-	strcpy(st_ProtocolInfo.tszUserName, "123123aa");
-	strcpy(st_ProtocolInfo.tszUserPass, "123123");
+	strcpy(st_ProtocolInfo.tszUserName, lpszUser);
+	strcpy(st_ProtocolInfo.tszUserPass, lpszPass);
 	strcpy(st_ProtocolInfo.tszEMailAddr, "[email protected]");
 
 	st_ProtocolHdr.unPacketSize = sizeof(XENGINE_PROTOCOL_USERINFO);
@@ -95,8 +97,8 @@ void MQ_Authorize()
 	st_ProtocolHdr.byIsReply = true;           //获得处理返回结果
 	st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
 
-	strcpy(st_ProtocolAuth.tszUserName, "123123aa");
-	strcpy(st_ProtocolAuth.tszUserPass, "123123");
+	strcpy(st_ProtocolAuth.tszUserName, lpszUser);
+	strcpy(st_ProtocolAuth.tszUserPass, lpszPass);
 
 	st_ProtocolHdr.unPacketSize = sizeof(XENGINE_PROTOCOL_USERAUTH);
 
@@ -199,8 +201,8 @@ void MQ_DeleteUser()
 	st_ProtocolInfo.nUserState = 0;
 	st_ProtocolInfo.nPhoneNumber = 13699999999;
 	st_ProtocolInfo.nIDNumber = 511000000000101010;
-	strcpy(st_ProtocolInfo.tszUserName, "123123aa");
-	strcpy(st_ProtocolInfo.tszUserPass, "123123");
+	strcpy(st_ProtocolInfo.tszUserName, lpszUser);
+	strcpy(st_ProtocolInfo.tszUserPass, lpszPass);
 	strcpy(st_ProtocolInfo.tszEMailAddr, "[email protected]");
 
 	nLen = sizeof(XENGINE_PROTOCOLHDR) + st_ProtocolHdr.unPacketSize;

XEngine_Release/XEngine_Config/XEngine_DBConfig.json

@@ -1,10 +1,11 @@
 {
-    "MQUser":{
-        "UserTime":{
-            "bPubClear":false
+    "MQUser": {
+        "UserTime": {
+            "bPubClear": false
         }
     },
-    "MQData":{
-        "nDBMonth":3
+    "MQData": {
+        "bCommSub": true,
+        "nDBMonth": 3
     }
 }

XEngine_Source/MQCore_ConfigModule/Config_Define.h

@@ -78,6 +78,7 @@ typedef struct
     struct  
     {
         int nDBMonth;
+        bool bCommSub;
     }st_MQData;
 }MESSAGEQUEUE_DBCONFIG;
 //////////////////////////////////////////////////////////////////////////

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

@@ -250,13 +250,14 @@ bool CConfig_Json::Config_Json_DBFile(LPCXSTR lpszConfigFile, MESSAGEQUEUE_DBCON
 	Json::Value st_JsonUserTime = st_JsonUser["UserTime"];
 	pSt_DBConfig->st_MQUser.st_UserTime.bPubClear = st_JsonUserTime["bPubClear"].asBool();
 
-	if (st_JsonRoot["MQData"].empty() || (1 != st_JsonRoot["MQData"].size()))
+	if (st_JsonRoot["MQData"].empty() || (2 != st_JsonRoot["MQData"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XTIME;
 		return false;
 	}
 	Json::Value st_JsonMQData = st_JsonRoot["MQData"];
 	pSt_DBConfig->st_MQData.nDBMonth = st_JsonMQData["nDBMonth"].asInt();
+	pSt_DBConfig->st_MQData.bCommSub = st_JsonMQData["bCommSub"].asBool();
 	return true;
 }

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -227,6 +227,20 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 					return false;
 				}
 			}
+			//是否需要订阅公用消息队列
+			if (st_DBConfig.st_MQData.bCommSub)
+			{
+				XENGINE_DBUSERKEY st_Userkey;
+				memset(&st_Userkey, '\0', sizeof(XENGINE_DBUSERKEY));
+
+				_tcsxcpy(st_Userkey.tszUserName, st_UserInfo.tszUserName);
+				_tcsxcpy(st_Userkey.tszKeyName, st_ServiceCfg.tszTopic);
+				//创建
+				if (!DBModule_MQUser_KeyInsert(&st_Userkey))
+				{
+					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("%s消息端:%s,绑定消息队列主题失败,主题名称:%s,错误：%lX"), lpszClientType, lpszClientAddr, st_Userkey.tszKeyName, DBModule_GetLastError());
+				}
+			}
 			pSt_ProtocolHdr->wReserve = 0;
 			ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, NULL, tszSDBuffer, &nSDLen);
 			XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);