Prechádzať zdrojové kódy

1、_DBG_SOMKING_ 宏,进行开关调试。
2、时间0~3分钟内,才执行冒烟脚本。

scbc 5 rokov pred
rodič
commit
9dc895575e

+ 1 - 1
SATService/SATService/Global.cpp

@@ -204,7 +204,7 @@ namespace GLOBAL
 			return -1;
 		}
 
-#if defined _DEBUG || defined RTEST
+#ifdef _DBG_SOMKING_
 		GetPrivateProfileString(_T("SATService"), _T("SomkingTime"), _T(""), g_stSATConfig.szSomkingTime, MAX_PATH, szIniPath);
 #endif
 		// »ñÈ¡·þÎñÆ÷¶ËÐÅÏ¢;

+ 1 - 1
SATService/SATService/Global.h

@@ -82,7 +82,7 @@ namespace GLOBAL
 		TCHAR szAdbRouteAddress[MAX_PATH];
 		// 异步connect超时值;
 		ULONG ulAsynConnectTimeout;
-#if defined _DEBUG || defined RTEST
+#ifdef _DBG_SOMKING_
 		TCHAR szSomkingTime[MAX_PATH];
 #endif
 		// 这个可以忽略不要;

+ 6 - 0
SATService/SATService/PythonExecutor.cpp

@@ -257,6 +257,7 @@ int CPythonExecutor::ServiceRunScriptProcess()
 	BOOL bResult = FALSE;
 	DWORD dwRet = 0;
 	DWORD dwSid = GetActiveSessionID();
+	//DWORD dwSid2 = WTSGetActiveConsoleSessionId();
 
 	HANDLE hProcess = NULL, hPToken = NULL, hUserTokenDup = NULL;
 	if (!WTSQueryUserToken(dwSid, &hPToken)) {
@@ -301,6 +302,11 @@ int CPythonExecutor::ServiceRunScriptProcess()
 	if (hPToken == NULL)
 		return -1;
 
+	/*if ( !ImpersonateLoggedOnUser(hPToken) )
+	{
+		printf("Ä£Ä⵱ǰÓû§µÇ¼ʧ°Ü\n");
+	}*/
+
 	TOKEN_LINKED_TOKEN admin;
 	bResult = GetTokenInformation(hPToken, (TOKEN_INFORMATION_CLASS)19, &admin, sizeof(TOKEN_LINKED_TOKEN), &dwRet);
 

+ 5 - 5
SATService/SATService/SATExecutor.cpp

@@ -56,7 +56,7 @@ CSATExecutor::~CSATExecutor(void)
 bool CSATExecutor::IsTaskExist(SATHTTP::STTask &task)
 {
 	// 若是冒烟任务;
-#if defined _DEBUG || defined RTEST
+#ifdef _DBG_SOMKING_
 	task.taskInfo.strInstanceType = "4";
 #endif
 	if ( task.taskInfo.strInstanceType == "4" ) {
@@ -1250,7 +1250,7 @@ int CSATExecutor::AttachTaskInfo2Buffer(SATPROTO::TaskInfo (&pbuff)[SATPROTO::MA
 
 bool CSATExecutor::SmokeTaskPretreated(SATHTTP::STTask &task)
 {
-#if defined _DEBUG || defined RTEST
+#ifdef _DBG_SOMKING_
 	task.taskInfo.stSomkingCycle.nType = 1;
 	task.taskInfo.stSomkingCycle.nWeek = 0;
 	task.taskInfo.stSomkingCycle.nDay = 0;
@@ -1272,16 +1272,16 @@ bool CSATExecutor::SmokeTaskPretreated(SATHTTP::STTask &task)
 		bTimeIsUp = true;
 	}
 	else if ( task.taskInfo.stSomkingCycle.nType == 1 ) {// 每天;
-		if ( gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
+		if ( gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
 			bTimeIsUp = true;
 	}
 	else if ( task.taskInfo.stSomkingCycle.nType == 2 ) {// 每周;
-		if ( gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
+		if ( gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
 			bTimeIsUp = true;
 	}
 	else if ( task.taskInfo.stSomkingCycle.nType == 3 ) {// 每月;
 		if ( gmtm.tm_mday == task.taskInfo.stSomkingCycle.nDay && 
-			gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
+			gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
 			bTimeIsUp = true;
 	}
 

+ 3 - 0
SATService/SATService/stdafx.h

@@ -25,6 +25,8 @@
 #include <afxcmn.h>                     // MFC 对 Windows 公共控件的支持
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
+#define _DBG_SOMKING_
+
 #include <iostream>
 #include <string>
 #include <vector>
@@ -37,3 +39,4 @@
 #include "cJSON.h"
 #include "tinyxml2.h"
 // TODO: 在此处引用程序需要的其他头文件
+