1

zhipuzi_pos_windows/worker/CMessagePushWorker.cpp

@@ -26,30 +26,6 @@ void CMessagePushWorker::Stop()
 	m_is_work = false;
 
 	socket_.close();
-
-	return;
-
-	sleepMutex.lock();
-	if (m_is_sleep == true)
-	{
-		//如果心跳线程正在睡眠，就不等了
-		sleepMutex.unlock();
-
-		while (m_nStopNum < 1)
-		{
-			Sleep(100);
-		}
-	}
-	else
-	{
-		//如果心跳线程没有睡眠，就等待
-		sleepMutex.unlock();
-
-		while (m_nStopNum < 2)
-		{
-			Sleep(100);
-		}
-	}
 }
 
 void CMessagePushWorker::KeepAlive()
@@ -94,7 +70,7 @@ void CMessagePushWorker::KeepAlive()
 			try
 			{
 				//发送失败，重新建立连接
-				char host[] = "pushserver.zhipuzi.com";
+				char host[] = "pushserver.lewaimai.com";
 				char port[] = "9001";
 
 				tcp::resolver resolver(m_io_context);

zhipuzi_pos_windows/worker/CMessagePushWorker.h

@@ -31,9 +31,9 @@ class CMessagePushWorker
 public:
 	static CMessagePushWorker* GetInstance()
 	{
-		CMessagePushWorker* instance = new CMessagePushWorker;
+		static CMessagePushWorker instance;
 
-		return instance;
+		return &instance;
 	}
 
 	//开始工作

zhipuzi_pos_windows_server/helper/CAliyunMNS.cpp

@@ -19,11 +19,11 @@ CAliyunMNS::CAliyunMNS(std::string queueName)
     {
         queue = m_mnsClient->getQueueRef(queueName.c_str());
 
-        //LOG_ERROR("queueName:" << queueName.c_str());
-        //LOG_ERROR("endpoint:" << endpoint.c_str());
-        //LOG_ERROR("accessId:" << accessId.c_str());
-        //LOG_ERROR("accessKey:" << accessKey.c_str());
-        //LOG_ERROR("stsToken:" << stsToken.c_str());
+        LOG_ERROR("queueName:" << queueName.c_str());
+        LOG_ERROR("endpoint:" << endpoint.c_str());
+        LOG_ERROR("accessId:" << accessId.c_str());
+        LOG_ERROR("accessKey:" << accessKey.c_str());
+        LOG_ERROR("stsToken:" << stsToken.c_str());
 
         is_init = true;
     }

zhipuzi_pos_windows_server/network/CClientSession.cpp

@@ -127,7 +127,7 @@ void CClientSession::handle_read(const boost::system::error_code& error,
 
 		if (is_login == "1")
 		{
-			//LOG_INFO("get client login message:" << msg.c_str());
+			LOG_INFO("get client login message:" << msg.c_str());
 
 			//获取到用户名了，进行绑定
 			m_server->BindUsername(username, this);

zhipuzi_pos_windows_server/network/CServer.cpp

@@ -296,7 +296,7 @@ void CServer::start_accept()
 void CServer::handle_accept(CClientSession* new_session,
 	const boost::system::error_code& error)
 {
-	//LOG_INFO("new client, handle_accept!");
+	LOG_INFO("new client, handle_accept!");
 
 	if (!error)
 	{