Z991239-5462 #comment fix the compile problem

Framework/spbase/TokenKeeper_client_g.h

@@ -32,7 +32,6 @@ public:
 	}
 	void OnClose(ErrorCodeEnum)
 	{
-		Dbg("session closed.");
 		bSessionClosed = true;
 	}
 	bool QuerySessionClosed()

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -2492,7 +2492,7 @@ Err:
 				else
 				{
 					//吐卡失败，前面已有告警，这里不再告警
-					Dbg("InternalAcceptCard::MachineMoveCardFrontGate failed(0x%x)", eErr);
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::MachineMoveCardFrontGate failed(0x%x)", eErr);
 					err = 2;
 				}
 			}

Module/mod_ResourceWatcher/ResourceWatcher_msg_g.h

@@ -0,0 +1,32 @@
+
+#ifndef __RESOURCEWATCHER_MSG_G_H
+#define __RESOURCEWATCHER_MSG_G_H
+
+#pragma once
+
+// This code is generated by spgen tool!
+
+#include "SpHelper.h"
+
+namespace ResourceWatcher {
+#define eMsg_BrowserCacheClean 2
+
+#define eMsgSig_BrowserCacheClean 1728030659
+
+	struct BrowserCacheClean
+	{
+		int needClean;
+		int reversed1;
+		CSimpleStringA reversed2;
+
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & needClean & reversed1 & reversed2;
+		}
+
+	};
+
+	///////////////////////////
+
+} // namespace ResourceWatcher
+#endif // __RESOURCEWATCHER_MSG_G_H

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -436,7 +436,7 @@ struct UpdateWKTask : ITaskSp
 
 		std::string test;
 		test = config.GetRequestUri();
-		Dbg("请求地址：%s.", test.c_str());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("请求地址：%s.", test.c_str());
 
 		RestfulClient client = RestfulClient::getInstance();
 		config.PreDo();

Module/mod_alarm/AlarmFSM.cpp

@@ -397,7 +397,7 @@ unsigned int AlarmFSM::s0_on_event( FSMEvent* event )
 						//创建成功
 					}else{
 						//创建失败
-						Dbg("connect server fail,config or Servers Error!");
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("connect server fail,config or Servers Error!");
 						closeClientConn();//断开连接
 					}	
 				}
@@ -1072,7 +1072,7 @@ int AlarmFSM::HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len)
 	for (int i = 0; i < len; ++i)
 	{
 		sprintf(tmpStr + count, "%0.2x", hexBuf[i]);
-		Dbg("strBut:%s", tmpStr);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("strBut:%s", tmpStr);
 		count += 2;
 	}
 	return 0;

Module/mod_assistantchannel/test/testAssistantChannelEntity.cpp

@@ -8,7 +8,7 @@ TEST_CASE_ENTITY_CLASS(CBizChannelEntity, "__OnStart")
 	LOG_FUNCTION();
 	ErrorCodeEnum Error = __OnStart(Error_Succeed);
 	if (Error == Error_Succeed) {
-		Dbg("__OnStart is success");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("__OnStart is success");
 	}
 	return Error;
 }
@@ -18,7 +18,7 @@ TEST_CASE_ENTITY_CLASS(CBizChannelEntity, "__OnClose")
 	LOG_FUNCTION();
 	ErrorCodeEnum Error = __OnClose(Error_Succeed);
 	if (Error == Error_Succeed) {
-		Dbg("__OnClose is success");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("__OnClose is success");
 	}
 	return Error;
 }
@@ -30,24 +30,12 @@ TEST_CASE_ENTITY_CLASS(CBizChannelEntity, "Connect")
 
 	ErrorCodeEnum Error = Connect("99.1.100.227", 2334, "07550001",NORMAL_CALLTYPE);
 	if (Error == Error_Succeed) {
-		Dbg("Connect is success");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Connect is success");
 	}
 	Error = Close();
 	if (Error == Error_Succeed) {
-		Dbg("Close is success");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Close is success");
 	}
 	return Error;
 }
 
-/*
-TEST_CASE_ENTITY_CLASS(CBizChannelEntity, "Send")
-{
-	LOG_FUNCTION();
-
-	ErrorCodeEnum Error = Send();
-	if (Error == Error_Succeed) {
-		Dbg("Send is success");
-	}
-	return Error;
-}
-*/

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -2520,7 +2520,7 @@ Err:
 				else
 				{
 					//吐卡失败，前面已有告警，这里不再告警
-					Dbg("InternalAcceptCard::MachineMoveCardFrontGate failed(0x%x)", eErr);
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::MachineMoveCardFrontGate failed(0x%x)", eErr);
 					err = 2;
 				}
 			}

Module/mod_chromium/CModTools.cpp

@@ -812,7 +812,7 @@ namespace Chromium {
 			if (Error_Succeed == openCefRet.first)
 				return std::make_pair(Error_Succeed, openCefRet.second);
 			else
-				Dbg("open cef for %s failed: %d", reason._to_string(), openCefRet.first);
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("open cef for %s failed: %d", reason._to_string(), openCefRet.first);
 		}
 		else
 		{

Module/mod_chromium/CSocketClient.cpp

@@ -182,31 +182,11 @@ namespace Chromium {
 
 	ErrorCodeEnum CSocketClient::Reconnect()
 	{
-		/*
-		boost::system::error_code ec;
-		DbgEx("CSocketClient method -> reconnect thread_id = %ld, object=%ld", boost::this_thread::get_id(), this);
-		if (!CModTools::get_mutable_instance().RestartProxyServer())
-			return Error_Unexpect;
-		m_psocket->close();
-		
-		m_psocket->connect(m_ep, ec);
-		if (ec)
-		{
-			// connect failed!
-			DbgEx("CSocketClient method -> Reconnect  : connect failed! Retry after 1s ! error message = %s", ec.message());
-			// retry to connect after 3s
-			Sleep(1000);
-			m_psocket->connect(m_ep, ec);
-			if (ec)return Error_IO;
-		}
-		DbgEx("CSocketClient method -> reconnect  succeed!");
-		*/
 		return Error_Succeed;
 	}
 
 
 	void CSocketClient::handle_write(const boost::system::error_code& err) {
-		//DbgEx("CSocketClient method -> handle_write %s!", err ? "error" : "succeed");
 	}
 
 	ErrorCodeEnum CSocketClient::SetMessageHandler(ISocketCallback* obj) {
@@ -217,7 +197,6 @@ namespace Chromium {
 	void CSocketClient::handle_read(const boost::system::error_code& err,
 		const size_t bytes_transferred, CMessage& msg)
 	{
-		//DbgEx("CSocketClient handle_read bytes_transferred=%d", bytes_transferred);
 		if (err)
 		{
 			// OnRecvError

Module/mod_chromium/SystemRun.cpp

@@ -10,12 +10,12 @@ void SystemRunTest(const std::string& systemCmd)
     std::string runStr(systemCmd);
     if (SP::Module::Util::ShellExecute(runStr, succStr, errStr)) {
         if (succStr.empty()) {
-            Dbg("result empty");
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("result empty");
         } else {
-            Dbg("ret msg: %s", succStr.c_str());
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ret msg: %s", succStr.c_str());
         }
     } else {
-        Dbg("execute '%s' failed!", runStr.c_str());
+        DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("execute '%s' failed!", runStr.c_str());
     }
 
 #else
@@ -37,18 +37,18 @@ void SystemRunTest(const std::string& systemCmd)
         option.params = app;
 
         if (ldRet == 0) {
-            Dbg("get library path: %s", szldPath);
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("get library path: %s", szldPath);
             toolkit_unsetenv("LD_LIBRARY_PATH");
         } else {
-            Dbg("GetEnv of LD_LIBRARY_PATH failed: %s", toolkit_strerror(ldRet));
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("GetEnv of LD_LIBRARY_PATH failed: %s", toolkit_strerror(ldRet));
         }
 
         const int res = process_spawn(&option, &process);
         if (0 == res) {
-            Dbg("execute {%s} suc pid: %d", app, process->pid);
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("execute {%s} suc pid: %d", app, process->pid);
             FREE(process);
         } else {
-            Dbg("execute {%s} failed: %d", app, res);
+            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("execute {%s} failed: %d", app, res);
         }
         if (ldRet == 0) {
             toolkit_setenv("LD_LIBRARY_PATH", szldPath);

Module/mod_chromium/baseEx.h

@@ -18,7 +18,6 @@ extern bool g_hasInitCfg;
 #define DEFAULT_KEY_LEN 256
 
 
-//void DbgEx(const char* str, ...);
 std::vector<std::string> find_files(const std::string srcPath, const std::string fileName, bool isDir = false);
 std::string generateTimeStr(bool isSimple = false);
 DWORD SaveCefclientLog(std::string magicStr);

Module/mod_chromium/mod_chromium.cpp

@@ -956,10 +956,10 @@ namespace Chromium {
 		startTimeStr.replace(pos, 1, std::string(":"));
 		auto urlStartTime = boost::posix_time::microsec_clock::universal_time();
 		while (!m_firstStartMain.try_lock_for(boost::chrono::seconds(30)))
-			Dbg("wait 30s, but slv did not start");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("wait 30s, but slv did not start");
 		auto urlEndTime = boost::posix_time::microsec_clock::universal_time();
 		auto timeDuration = urlEndTime - urlStartTime;
-		Dbg("slv start at %s, used %d ms", startTimeStr.c_str(), timeDuration.total_milliseconds());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("slv start at %s, used %d ms", startTimeStr.c_str(), timeDuration.total_milliseconds());
 		if (1 == getBrowserStartTimes())
 		{
 			auto generateAlarmJson = [](CSimpleString entityName, CSimpleString startTime, int cost) ->CSimpleString {