合并javaapi推送

AppStart/RabbitMQClient.cs

@@ -248,7 +248,6 @@ namespace MySystem
                 RedisDbconn.Instance.AddList("JavaUrlDataQueue", MsgContent);
                 function.WriteLog(MsgContent, "接收mq接口数据队列");
                 if(ApiDataFromJavaService.Instance.ApiDataDo(MsgContent))
->>>>>>> test-mqserver
                 {
                     channel.BasicAck(e.DeliveryTag, true); //收到回复后，RabbitMQ会直接在队列中删除这条消息
                 }

Startup.cs

@@ -141,7 +141,7 @@ namespace MySystem
             MpMerchantActService.Instance.Start();
             KxsOrderService.Instance.Start();
             KxsActService.Instance.Start();
-            KxsActService.Instance.StartMp();            
+            KxsActService.Instance.StartMp();
             RabbitMQClient.Instance.StartReceiveApi("QUEUE_DTS_URL_DATA_DIVISION");
         }
     }