!2 change add firewall wait time to ms

Framework/Common/SpBase.h

@@ -1060,7 +1060,7 @@ struct IEntityFunction
 
 	virtual ErrorCodeEnum GetToken(CSimpleString& channelId, CSimpleString& token) = 0;
 
-	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString& pszPath, int maxWaitTime = 30) = 0;
+	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString& pszPath, int maxWaitMs = 30000) = 0;
 	/* GetRunningVersion
 	currently return version in active.txt, may be it will return the version from micro sever latter.
 	*/

Framework/spbase/SpEntity.cpp

@@ -1748,7 +1748,7 @@ ErrorCodeEnum SpEntity::GetToken(CSimpleString &channelId, CSimpleString &token)
 		return ErrorCodeEnum::Error_Succeed;
 }
 
-ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitTime)
+ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitMs)
 {
 	if (pszPath.GetLength() == 0) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall param error");
@@ -1764,7 +1764,7 @@ ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath, int maxWait
 
 	std::future<ErrorCodeEnum> result = std::async(std::launch::async, addFirewall_worker, pszPath.GetData());
 
-	auto status = result.wait_for(std::chrono::seconds(maxWaitTime));
+	auto status = result.wait_for(std::chrono::milliseconds(maxWaitMs));
 	if (status == std::future_status::ready)
 	{
 		auto ret = result.get();
@@ -1773,7 +1773,7 @@ ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath, int maxWait
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall run over %d seconds", maxWaitTime);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall run over %d milliseconds", maxWaitMs);
 		return Error_TimeOut;
 	}
 

Framework/spbase/SpEntity.h

@@ -125,7 +125,7 @@ public:
 	virtual ErrorCodeEnum GetEntityLogPath(const char* pszEntityName, CEntityLogInfo& Info);
 	virtual WORD GetDevID();
 	virtual ErrorCodeEnum GetToken(CSimpleString &channelId, CSimpleString &token);
-	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitTime = 30); // Input path:D:\\Runxxx\\version\\7.1.1.1
+	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitMs = 30000); // Input path:D:\\Runxxx\\version\\7.1.1.1
 
 	// connect
 	virtual ErrorCodeEnum ConnectRemoteEntity(CClientSessionBase *pClientSession, const char *pszRemoteEntity,const char *pszParam,CSmartPointer<IAsynWaitSp> &pAsynWaitSp);

Framework/spshell/spshell.cpp

@@ -302,6 +302,7 @@ static bool AddFirewallRules()
 
 int AddFireAddFirewallRulesThread(void* param)
 {
+	LOG_FUNCTION();
 	if (!sp_CheckAllRules())
 	{
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("设置Windows防火墙策略失败!!!");