释放出SATExecutor的EndofWork函数;

SATService/SATService/PythonExecutor.h

@@ -50,8 +50,7 @@ protected:
 	bool StartThread();
 	// 结束线程;
 	void EndWorkThread();
-	void EndLogThread();
-	void EndThread();
+	void EndLogThread();	
 	// 从管道读取日志;
 	void ReadFromPipe();
 	// 结束重定向句柄,恢复默认;
@@ -70,6 +69,8 @@ public:
 	void StopScript();
 	// 脚本是否结束;
 	bool IsScriptOver();
+	// 结束所有线程;
+	void EndThread();
 	// 设置用例对象;
 	void SetCaseObje(SATHTTP::STCase *pObj){ m_pCaseObj = pObj;}
 	// 结束子进程;

SATService/SATService/SATTCPServer.cpp

@@ -896,7 +896,7 @@ void CSATTCPServer::_TaskProcess(PER_IO_CONTEXT* pIoContext, SATPROTO::Package*
 				{
 					// 怬;
 					SATPROTO::UserInfo *pLogin = (SATPROTO::UserInfo*)pak->buf;
-					GLOBAL::WriteTextLog(_T("User=%s, psw=%s"), pLogin->szUserName, pLogin->szPassword);
+					GLOBAL::WriteTextLog(_T("User=%s, psw=%s, Actuator=%s"), pLogin->szUserName, pLogin->szPassword, pLogin->szActuatorName);
 					bool bRet = CSATExecutor::GetInstance()->Login(pLogin->szUserName, pLogin->szPassword, pLogin->szActuatorName, !pHeader->cmd);
 
 					// ¼ÆËãÊý¾Ý°ü³¤¶È;