各种优化

bin/Win32/Debug/conf/lewaimai_pos_windows_server.conf

@@ -0,0 +1,15 @@
+#这个是调度中心的配置文件，“#"用来注释当前行
+
+#模式，debug或者release
+mode = release
+
+#debug环境的队列参数
+debug_pos_task_queue = prod-windows-pos-push
+
+#release环境的队列参数
+release_pos_task_queue = prod-windows-pos-push
+
+#连接阿里云的mns需要用到的参数
+mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
+mns.accesskeyid = 2HUnzc9XJV92PjvW
+mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW

bin/Win32/Debug/lewaimai_pos_windows_server/conf/lewaimai_pos_windows_server.conf

@@ -0,0 +1,15 @@
+#这个是调度中心的配置文件，“#"用来注释当前行
+
+#模式，debug或者release
+mode = release
+
+#debug环境的队列参数
+debug_pos_task_queue = prod-windows-pos-push
+
+#release环境的队列参数
+release_pos_task_queue = prod-windows-pos-push
+
+#连接阿里云的mns需要用到的参数
+mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
+mns.accesskeyid = 2HUnzc9XJV92PjvW
+mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW

bin/Win32/Debug/lewaimai_pos_windows_server/log/lewaimai_pos_windows_server.log

@@ -0,0 +1,34 @@
+2019-05-22 21:35:20[INFO] - Opened database successfully [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:91]
+2019-05-22 21:35:20[INFO] - cpu num:8 [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:34]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:20[INFO] - Init AliyunMNS success! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:335]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u6d4b\u8bd5","timestamp":1558531287,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841414,"waimai_order_no":"W201905229848549823619384"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u9b4f\u8bb0\u70e7\u70e4","timestamp":1558531295,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841427,"waimai_order_no":"W201905225555985544905958"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u91d1\u73e0\u5c0f\u5403","timestamp":1558531302,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841439,"waimai_order_no":"W201905221025154496852798"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u4e91\u8d85\u5e02","timestamp":1558531297,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841437,"waimai_order_no":"W201905229810199570267531"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"sj","timestamp":1558531296,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841430,"waimai_order_no":"W201905225750100596136934"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u4e09\u9c9c\u9762","timestamp":1558531295,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841423,"waimai_order_no":"W201905225255100531969216"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u5c1a\u597d\u5477","timestamp":1558531290,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841420,"waimai_order_no":"W201905224898564850413215"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u8c6a\u9526\u8bb0\u9762\u7ebf\u7cca","timestamp":1558531306,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841444,"waimai_order_no":"W201905224810048124920196"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u725b\u8f66\u6c34","timestamp":1558531289,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841421,"waimai_order_no":"W201905224950102506219744"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u4fbf\u5229\u5e97","timestamp":1558531297,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841437,"waimai_order_no":"W201905229810199570267531"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u534e\u7acb\u96f6\u98df\u5e97","timestamp":1558531308,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841451,"waimai_order_no":"W201905225397102953518646"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u9f99\u9f99","timestamp":1558531297,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841437,"waimai_order_no":"W201905229810199570267531"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u98ce\u7834\u70e7\u70e4","timestamp":1558531301,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841436,"waimai_order_no":"W201905229856555775215944"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u8f6f\u8f6f\u9e21","timestamp":1558531307,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841448,"waimai_order_no":"W201905225250519931645165"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u9648\u671d\u6f58","timestamp":1558531308,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841451,"waimai_order_no":"W201905225397102953518646"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]
+2019-05-22 21:35:21[INFO] - get new message:{"username":"\u73e0\u6c5f\u5b66\u9662Q\u5821\u5821","timestamp":1558531309,"use_time":600,"data":{"msg_type":1,"waimai_order_id":131841453,"waimai_order_no":"W201905225497995004706909"}} [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows_server\network\cserver.cpp:345]

lewaimai_pos_windows_server/helper/CAliyunMNS.cpp

@@ -30,7 +30,7 @@ CAliyunMNS::CAliyunMNS(std::string queueName)
     catch(MNSServerException& me)
     {
         //cout << "Request Failed: " << me.GetErrorCode().c_str() << endl;
-        LOG_INFO("Request Failed: " << me.GetErrorCode().c_str());
+        //LOG_INFO("Request Failed: " << me.GetErrorCode().c_str());
         is_init = false;
 
         return;
@@ -38,7 +38,7 @@ CAliyunMNS::CAliyunMNS(std::string queueName)
     catch(MNSExceptionBase& mb)
     {
         //cout << "Request Failed: " << mb.ToString().c_str() << endl;
-        LOG_INFO("Request Failed: " << mb.ToString().c_str());
+        //LOG_INFO("Request Failed: " << mb.ToString().c_str());
         is_init = false;
 
         return;

lewaimai_pos_windows_server/lewaimai_pos_windows_server_linux.vcxproj

@@ -119,7 +119,7 @@
       <LibraryDependencies>log4cplus;mnscpp;crypto;sqlite3;pthread;boost_system;curl</LibraryDependencies>
     </Link>
     <RemotePostBuildEvent>
-      <Command>mkdir /usr/local/lewaimai_pos_windows_server;mkdir /usr/local/lewaimai_pos_windows_server/bin;mkdir /usr/local/lewaimai_pos_windows_server/conf;cp -f $(RemoteRootDir)/bin/$(Platform)/$(Configuration)/$(ProjectName)/* /usr/local/lewaimai_pos_windows_server/bin/;cp -f $(RemoteRootDir)/$(ProjectName)/conf/* /usr/local/lewaimai_pos_windows_server/conf/</Command>
+      <Command>mkdir /usr/local/lewaimai_pos_windows_server;mkdir /usr/local/lewaimai_pos_windows_server/bin;mkdir /usr/local/lewaimai_pos_windows_server/conf;mkdir /usr/local/lewaimai_pos_windows_server/db;cp -f $(RemoteRootDir)/bin/$(Platform)/$(Configuration)/$(ProjectName)/* /usr/local/lewaimai_pos_windows_server/bin/;cp -f $(RemoteRootDir)/$(ProjectName)/conf/* /usr/local/lewaimai_pos_windows_server/conf/</Command>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

lewaimai_pos_windows_server/network/CServer.cpp

@@ -74,8 +74,9 @@ void CServer::InitSqlLite()
 
 	m_rc = sqlite3_open(s_path.c_str(), &m_db);
 #else
-	LOG_INFO("absopath:" << CSystem::getAbsopath().c_str());
 	std::string db_path = CSystem::getAbsopath() + "../db/pos.db";
+	LOG_INFO("db path:" << db_path.c_str());
+
 	m_rc = sqlite3_open(db_path.c_str(), &m_db);
 #endif
 
@@ -160,11 +161,11 @@ bool CServer::AddMessageToDB(std::string username, std::string due_time, std::st
 
 	if (result == SQLITE_OK)
 	{
-		LOG_INFO("save params success");
+		//LOG_INFO("save params success");
 		return true;
 	}
 
-	LOG_INFO("save params fail");
+	//LOG_INFO("save params fail");
 	return false;
 }
 
@@ -331,6 +332,8 @@ void CServer::ReceiveMNSMessage()
         return;
     }
 
+	LOG_INFO("Init AliyunMNS success!");
+
     while(true)
     {
         std::string message = mns.getMessage();
@@ -351,9 +354,23 @@ void CServer::ReceiveMNSMessage()
         }
 
         //处理消息类型
+		if (!document["username"].IsString() || !document["timestamp"].IsString())
+		{
+			continue;
+		}
+
+		std::string use_time;
+		if (document["use_time"].IsInt())
+		{
+			use_time = to_string(document["use_time"].GetInt());
+		}
+		else
+		{
+			use_time = document["use_time"].GetString();
+		}
+
 		std::string username = document["username"].GetString();
 		std::string timestamp = document["timestamp"].GetString();
-		std::string use_time = document["use_time"].GetString();
 
 		rapidjson::Value& data = document["data"];
 
@@ -424,7 +441,7 @@ void CServer::SendMessageToClient()
 		{
 			m_map_mutex.unlock();
 
-			LOG_INFO("can not find client, save to db");
+			LOG_INFO("can not find client, save to db, username:"<<username.c_str());
 
 			//客户端不在线，操作存数据库
 			AddMessageToDB(username, due_time, data);
@@ -439,13 +456,13 @@ void CServer::SendMessageToClient()
 			bool ret = session->send_message(data);
 			if (ret == false)
 			{
-				LOG_INFO("send to client fail, save it to db");
+				LOG_INFO("send to client fail, save it to db, username:" << username.c_str());
 				//如果发送失败了，把消息存回到数据库
 				AddMessageToDB(username, due_time, data);
 			}
 			else
 			{
-				LOG_INFO("send to client success");
+				LOG_INFO("send to client success, username:" << username.c_str());
 			}
 		}
 	}