1、去掉Debug的ASSERT；

2、新增Gobal文件；

SATHTTP/SATHTTP/CurlClient.cpp

@@ -26,6 +26,8 @@ BOOL CCurlClient::Initialize()
 		return FALSE;
 	}
 
+	GLOBAL::GetIniInfo();
+
 	return m_bInit = TRUE;
 }
 

SATHTTP/SATHTTP/SATHTTP.cpp

@@ -132,26 +132,26 @@ SATHTTP_API int Login(std::string url, const SATHTTP::STLoginReq &stLoginReq, SA
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", "aaaa"));
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "EXECUTE"));
+	cJSON_AddStringToObject(pRoot, "function", "aaaa");
+	cJSON_AddStringToObject(pRoot, "sysCode", "EXECUTE");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "userName", stLoginReq.strUserName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "status", stLoginReq.strStatus.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "deleteStatus", stLoginReq.strDeleteStatus.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "ip", stLoginReq.strIP.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "memory", stLoginReq.strMemory.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "storage", stLoginReq.strStorage.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "connectTime", stLoginReq.strConnectTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "executeName", stLoginReq.strExecuteName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "mac", stLoginReq.strMAC.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "disconnectTime", stLoginReq.strDisconnectTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "password", stLoginReq.strPassword.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "cpu", stLoginReq.strCPU.c_str()));
-
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
+
+		cJSON_AddStringToObject(pData, "userName", stLoginReq.strUserName.c_str());
+		cJSON_AddStringToObject(pData, "status", stLoginReq.strStatus.c_str());
+		cJSON_AddStringToObject(pData, "deleteStatus", stLoginReq.strDeleteStatus.c_str());
+		cJSON_AddStringToObject(pData, "ip", stLoginReq.strIP.c_str());
+		cJSON_AddStringToObject(pData, "memory", stLoginReq.strMemory.c_str());
+		cJSON_AddStringToObject(pData, "storage", stLoginReq.strStorage.c_str());
+		cJSON_AddStringToObject(pData, "connectTime", stLoginReq.strConnectTime.c_str());
+		cJSON_AddStringToObject(pData, "executeName", stLoginReq.strExecuteName.c_str());
+		cJSON_AddStringToObject(pData, "mac", stLoginReq.strMAC.c_str());
+		cJSON_AddStringToObject(pData, "disconnectTime", stLoginReq.strDisconnectTime.c_str());
+		cJSON_AddStringToObject(pData, "password", stLoginReq.strPassword.c_str());
+		cJSON_AddStringToObject(pData, "cpu", stLoginReq.strCPU.c_str());		
 	}
 
 	char *pText = cJSON_Print(pRoot);
@@ -230,21 +230,21 @@ SATHTTP_API int UpdateDeviceMessage(std::string url, const SATHTTP::STUpdateDevi
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "Execute"));
+	cJSON_AddStringToObject(pRoot, "sysCode", "Execute");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "status", stUpdateDeviceReq.strStatus.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "userName", stUpdateDeviceReq.strUserName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "ip", stUpdateDeviceReq.strIP.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "storage", stUpdateDeviceReq.strStorage.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnerName", stUpdateDeviceReq.strRunnerName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "mac", stUpdateDeviceReq.strMAC.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "reportType", stUpdateDeviceReq.strReportType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "startTime", stUpdateDeviceReq.strStartTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "memory", stUpdateDeviceReq.strMemory.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "endTime", stUpdateDeviceReq.strEndTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "cpu", stUpdateDeviceReq.strCPU.c_str()));
+		cJSON_AddStringToObject(pData, "status", stUpdateDeviceReq.strStatus.c_str());
+		cJSON_AddStringToObject(pData, "userName", stUpdateDeviceReq.strUserName.c_str());
+		cJSON_AddStringToObject(pData, "ip", stUpdateDeviceReq.strIP.c_str());
+		cJSON_AddStringToObject(pData, "storage", stUpdateDeviceReq.strStorage.c_str());
+		cJSON_AddStringToObject(pData, "runnerName", stUpdateDeviceReq.strRunnerName.c_str());
+		cJSON_AddStringToObject(pData, "mac", stUpdateDeviceReq.strMAC.c_str());
+		cJSON_AddStringToObject(pData, "reportType", stUpdateDeviceReq.strReportType.c_str());
+		cJSON_AddStringToObject(pData, "startTime", stUpdateDeviceReq.strStartTime.c_str());
+		cJSON_AddStringToObject(pData, "memory", stUpdateDeviceReq.strMemory.c_str());
+		cJSON_AddStringToObject(pData, "endTime", stUpdateDeviceReq.strEndTime.c_str());
+		cJSON_AddStringToObject(pData, "cpu", stUpdateDeviceReq.strCPU.c_str());
 		cJSON *pDeviceList = cJSON_CreateArray();
 		if ( pDeviceList )
 		{
@@ -254,23 +254,23 @@ SATHTTP_API int UpdateDeviceMessage(std::string url, const SATHTTP::STUpdateDevi
 				cJSON *pObj = cJSON_CreateObject();
 				if ( pObj )
 				{
-					ASSERT(cJSON_AddStringToObject(pObj, "status", it->strStatus.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "deviceSerial", it->strDeviceSerial.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "hardwareVersion", it->strHardwareVersion.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "manu", it->strManu.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "deviceMac", it->strDeviceMac.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "lastJobStartTime", it->strLastJobStartTime.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "lastTimeBreak", it->strLastTimeBreak.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "comments", it->strComments.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "cpu", it->strCPU.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "softwareVersion", it->strSoftwareVersion.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "phoneNumber", it->strPhoneNumber.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "lastJobFinishTime", it->strLastJobFinishTime.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "memory", it->strMemory.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "model", it->strModel.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "lastJob", it->strLastJob.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "lastTimeConnected", it->strLastTimeConnected.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "electric", it->strElectric.c_str()));
+					cJSON_AddStringToObject(pObj, "status", it->strStatus.c_str());
+					cJSON_AddStringToObject(pObj, "deviceSerial", it->strDeviceSerial.c_str());
+					cJSON_AddStringToObject(pObj, "hardwareVersion", it->strHardwareVersion.c_str());
+					cJSON_AddStringToObject(pObj, "manu", it->strManu.c_str());
+					cJSON_AddStringToObject(pObj, "deviceMac", it->strDeviceMac.c_str());
+					cJSON_AddStringToObject(pObj, "lastJobStartTime", it->strLastJobStartTime.c_str());
+					cJSON_AddStringToObject(pObj, "lastTimeBreak", it->strLastTimeBreak.c_str());
+					cJSON_AddStringToObject(pObj, "comments", it->strComments.c_str());
+					cJSON_AddStringToObject(pObj, "cpu", it->strCPU.c_str());
+					cJSON_AddStringToObject(pObj, "softwareVersion", it->strSoftwareVersion.c_str());
+					cJSON_AddStringToObject(pObj, "phoneNumber", it->strPhoneNumber.c_str());
+					cJSON_AddStringToObject(pObj, "lastJobFinishTime", it->strLastJobFinishTime.c_str());
+					cJSON_AddStringToObject(pObj, "memory", it->strMemory.c_str());
+					cJSON_AddStringToObject(pObj, "model", it->strModel.c_str());
+					cJSON_AddStringToObject(pObj, "lastJob", it->strLastJob.c_str());
+					cJSON_AddStringToObject(pObj, "lastTimeConnected", it->strLastTimeConnected.c_str());
+					cJSON_AddStringToObject(pObj, "electric", it->strElectric.c_str());
 
 					cJSON_AddItemToObject(pDeviceList, "", pObj);
 				}
@@ -356,12 +356,12 @@ SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHear
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "EXECUTE"));
+	cJSON_AddStringToObject(pRoot, "sysCode", "EXECUTE");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "userName", stHeartbeatReq.strUserName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnerMac", stHeartbeatReq.strRunnerMac.c_str()));
+		cJSON_AddStringToObject(pData, "userName", stHeartbeatReq.strUserName.c_str());
+		cJSON_AddStringToObject(pData, "runnerMac", stHeartbeatReq.strRunnerMac.c_str());
 		cJSON *pDeviceList = cJSON_CreateArray();
 		if ( pDeviceList )
 		{
@@ -371,8 +371,8 @@ SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHear
 				cJSON *pObj = cJSON_CreateObject();
 				if ( pObj )
 				{
-					ASSERT(cJSON_AddStringToObject(pObj, "status", it->strStatus.c_str()));
-					ASSERT(cJSON_AddStringToObject(pObj, "deviceSerial", it->strDeviceSerial.c_str()));
+					cJSON_AddStringToObject(pObj, "status", it->strStatus.c_str());
+					cJSON_AddStringToObject(pObj, "deviceSerial", it->strDeviceSerial.c_str());
 
 					cJSON_AddItemToObject(pDeviceList, "", pObj);
 				}
@@ -570,16 +570,16 @@ SATHTTP_API int SetResult(std::string url, const SATHTTP::STNotifyJobStartReq &s
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", ""));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", ""));
+	cJSON_AddStringToObject(pRoot, "sysCode", "");
+	cJSON_AddStringToObject(pRoot, "function", "");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "instanceId", stNotifyJobStartReq.strInstanceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "signalImageUrl", stNotifyJobStartReq.strSignalImageUrl.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "deviceId", stNotifyJobStartReq.strDeviceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "taskId", stNotifyJobStartReq.strTaskId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "executeId", stNotifyJobStartReq.strExecuteId.c_str()));
+		cJSON_AddStringToObject(pData, "instanceId", stNotifyJobStartReq.strInstanceId.c_str());
+		cJSON_AddStringToObject(pData, "signalImageUrl", stNotifyJobStartReq.strSignalImageUrl.c_str());
+		cJSON_AddStringToObject(pData, "deviceId", stNotifyJobStartReq.strDeviceId.c_str());
+		cJSON_AddStringToObject(pData, "taskId", stNotifyJobStartReq.strTaskId.c_str());
+		cJSON_AddStringToObject(pData, "executeId", stNotifyJobStartReq.strExecuteId.c_str());
 				
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
@@ -660,48 +660,48 @@ SATHTTP_API int SetResultList(std::string url, const SATHTTP::STJobProcessReq &s
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "Execute"));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", "setResultList"));
+	cJSON_AddStringToObject(pRoot, "sysCode", "Execute");
+	cJSON_AddStringToObject(pRoot, "function", "setResultList");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "result_state", stJobProcessReq.strResultState.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_scene", stJobProcessReq.strCaseScene.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_step", stJobProcessReq.strCaseStep.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "apkMd5", stJobProcessReq.strApkMD5.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "crash_time", stJobProcessReq.strCrashTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runner_id", stJobProcessReq.strRunnerId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "cpu_info", stJobProcessReq.strCPUInfo.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnedActionNameList", stJobProcessReq.strRunnedActionNameList.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "artificial_result", stJobProcessReq.strArtificialResult.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "artificial_modify", stJobProcessReq.strArtificialModify.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runner_name", stJobProcessReq.strRunnerName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "task_type", stJobProcessReq.strTaskType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_repeat", stJobProcessReq.strCaseRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "application_group", stJobProcessReq.strApplicationGroup.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "instanceId", stJobProcessReq.strInstanceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_id", stJobProcessReq.strCaseId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "progress", stJobProcessReq.strProgress.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "result_message", stJobProcessReq.strReusltMessage.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "job_repeat", stJobProcessReq.strJobRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "screenshot", stJobProcessReq.strScreenShot.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "start_time", stJobProcessReq.strStartTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "crash_number", stJobProcessReq.strCrashNumber.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_name", stJobProcessReq.strCaseName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "failed_reason", stJobProcessReq.strFailedReason.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "img_name", stJobProcessReq.strImgName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "case_index", stJobProcessReq.strCaseIndex.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "device_id", stJobProcessReq.strDeviceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "scene_index", stJobProcessReq.strSceneIndex.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "task_id", stJobProcessReq.strTaskId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "analysis", stJobProcessReq.strAnalysis.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "device_name", stJobProcessReq.strDevnceName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "info_type", stJobProcessReq.strInfoType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "memory_info", stJobProcessReq.strMemoryInfo.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "end_time", stJobProcessReq.strEndTime.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "round_number", stJobProcessReq.strRoundNumber.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "result_type", stJobProcessReq.strResultType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "operation_step", stJobProcessReq.strOperationStep.c_str()));
+		cJSON_AddStringToObject(pData, "result_state", stJobProcessReq.strResultState.c_str());
+		cJSON_AddStringToObject(pData, "case_scene", stJobProcessReq.strCaseScene.c_str());
+		cJSON_AddStringToObject(pData, "case_step", stJobProcessReq.strCaseStep.c_str());
+		cJSON_AddStringToObject(pData, "apkMd5", stJobProcessReq.strApkMD5.c_str());
+		cJSON_AddStringToObject(pData, "crash_time", stJobProcessReq.strCrashTime.c_str());
+		cJSON_AddStringToObject(pData, "runner_id", stJobProcessReq.strRunnerId.c_str());
+		cJSON_AddStringToObject(pData, "cpu_info", stJobProcessReq.strCPUInfo.c_str());
+		cJSON_AddStringToObject(pData, "runnedActionNameList", stJobProcessReq.strRunnedActionNameList.c_str());
+		cJSON_AddStringToObject(pData, "artificial_result", stJobProcessReq.strArtificialResult.c_str());
+		cJSON_AddStringToObject(pData, "artificial_modify", stJobProcessReq.strArtificialModify.c_str());
+		cJSON_AddStringToObject(pData, "runner_name", stJobProcessReq.strRunnerName.c_str());
+		cJSON_AddStringToObject(pData, "task_type", stJobProcessReq.strTaskType.c_str());
+		cJSON_AddStringToObject(pData, "case_repeat", stJobProcessReq.strCaseRepeat.c_str());
+		cJSON_AddStringToObject(pData, "application_group", stJobProcessReq.strApplicationGroup.c_str());
+		cJSON_AddStringToObject(pData, "instanceId", stJobProcessReq.strInstanceId.c_str());
+		cJSON_AddStringToObject(pData, "case_id", stJobProcessReq.strCaseId.c_str());
+		cJSON_AddStringToObject(pData, "progress", stJobProcessReq.strProgress.c_str());
+		cJSON_AddStringToObject(pData, "result_message", stJobProcessReq.strReusltMessage.c_str());
+		cJSON_AddStringToObject(pData, "job_repeat", stJobProcessReq.strJobRepeat.c_str());
+		cJSON_AddStringToObject(pData, "screenshot", stJobProcessReq.strScreenShot.c_str());
+		cJSON_AddStringToObject(pData, "start_time", stJobProcessReq.strStartTime.c_str());
+		cJSON_AddStringToObject(pData, "crash_number", stJobProcessReq.strCrashNumber.c_str());
+		cJSON_AddStringToObject(pData, "case_name", stJobProcessReq.strCaseName.c_str());
+		cJSON_AddStringToObject(pData, "failed_reason", stJobProcessReq.strFailedReason.c_str());
+		cJSON_AddStringToObject(pData, "img_name", stJobProcessReq.strImgName.c_str());
+		cJSON_AddStringToObject(pData, "case_index", stJobProcessReq.strCaseIndex.c_str());
+		cJSON_AddStringToObject(pData, "device_id", stJobProcessReq.strDeviceId.c_str());
+		cJSON_AddStringToObject(pData, "scene_index", stJobProcessReq.strSceneIndex.c_str());
+		cJSON_AddStringToObject(pData, "task_id", stJobProcessReq.strTaskId.c_str());
+		cJSON_AddStringToObject(pData, "analysis", stJobProcessReq.strAnalysis.c_str());
+		cJSON_AddStringToObject(pData, "device_name", stJobProcessReq.strDevnceName.c_str());
+		cJSON_AddStringToObject(pData, "info_type", stJobProcessReq.strInfoType.c_str());
+		cJSON_AddStringToObject(pData, "memory_info", stJobProcessReq.strMemoryInfo.c_str());
+		cJSON_AddStringToObject(pData, "end_time", stJobProcessReq.strEndTime.c_str());
+		cJSON_AddStringToObject(pData, "round_number", stJobProcessReq.strRoundNumber.c_str());
+		cJSON_AddStringToObject(pData, "result_type", stJobProcessReq.strResultType.c_str());
+		cJSON_AddStringToObject(pData, "operation_step", stJobProcessReq.strOperationStep.c_str());
 
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
@@ -783,12 +783,12 @@ SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATHT
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "Execute"));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", "getCaseFileListUrl"));
+	cJSON_AddStringToObject(pRoot, "sysCode", "Execute");
+	cJSON_AddStringToObject(pRoot, "function", "getCaseFileListUrl");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "testCaseId", strCaseId.c_str()));
+		cJSON_AddStringToObject(pData, "testCaseId", strCaseId.c_str());
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
 	}
@@ -877,12 +877,12 @@ SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::stri
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", "Execute"));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", "getCaseFileListUrl"));
+	cJSON_AddStringToObject(pRoot, "sysCode", "Execute");
+	cJSON_AddStringToObject(pRoot, "function", "getCaseFileListUrl");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "testCaseId", strCaseId.c_str()));
+		cJSON_AddStringToObject(pData, "testCaseId", strCaseId.c_str());
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
 	}
@@ -984,12 +984,12 @@ SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, S
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", ""));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", ""));
+	cJSON_AddStringToObject(pRoot, "sysCode", "");
+	cJSON_AddStringToObject(pRoot, "function", "");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "instanceId", strInstnaceId.c_str()));
+		cJSON_AddStringToObject(pData, "instanceId", strInstnaceId.c_str());
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
 	}
@@ -1060,14 +1060,14 @@ SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATHTTP::STSaveLogReq &
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "useId", stSaveLogReq.strUserId.c_str()));
+	cJSON_AddStringToObject(pRoot, "useId", stSaveLogReq.strUserId.c_str());
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "fileType", stSaveLogReq.strFileType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseId", stSaveLogReq.strCaseId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "taskId", stSaveLogReq.strTaskId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "executeId", stSaveLogReq.strExecuteId.c_str()));
+		cJSON_AddStringToObject(pData, "fileType", stSaveLogReq.strFileType.c_str());
+		cJSON_AddStringToObject(pData, "caseId", stSaveLogReq.strCaseId.c_str());
+		cJSON_AddStringToObject(pData, "taskId", stSaveLogReq.strTaskId.c_str());
+		cJSON_AddStringToObject(pData, "executeId", stSaveLogReq.strExecuteId.c_str());
 
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
@@ -1144,32 +1144,32 @@ SATHTTP_API int SaveResultFile(std::string url, const SATHTTP::STSaveFileReq &st
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", ""));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", ""));
+	cJSON_AddStringToObject(pRoot, "sysCode", "");
+	cJSON_AddStringToObject(pRoot, "function", "");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "roundNum", stSaveFileReq.strRoundNum.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseRepeat", stSaveFileReq.strCaseRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "jobRepeat", stSaveFileReq.strJobRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "instanceId", stSaveFileReq.strInstanceId.c_str()));
-
-		ASSERT(cJSON_AddStringToObject(pData, "deviceId", stSaveFileReq.strDeviceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "executeId", stSaveFileReq.strExecuteId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "taskName", stSaveFileReq.strTaskName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "sceneIndex", stSaveFileReq.strSceneIndex.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "taskId", stSaveFileReq.strTaskId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseId", stSaveFileReq.strCaseId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "deviceName", stSaveFileReq.strDeviceName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnerName", stSaveFileReq.strRunnerName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnerIP", stSaveFileReq.strRunnerIP.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "runnerMac", stSaveFileReq.strRunnerMAC.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseName", stSaveFileReq.strCaseName.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseIndex", stSaveFileReq.strCaseIndex.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "taskRepeat", stSaveFileReq.strTaskRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "busCode", stSaveFileReq.strBusCode.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "fileType", stSaveFileReq.strFileType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseStep", stSaveFileReq.strCaseStep.c_str()));
+		cJSON_AddStringToObject(pData, "roundNum", stSaveFileReq.strRoundNum.c_str());
+		cJSON_AddStringToObject(pData, "caseRepeat", stSaveFileReq.strCaseRepeat.c_str());
+		cJSON_AddStringToObject(pData, "jobRepeat", stSaveFileReq.strJobRepeat.c_str());
+		cJSON_AddStringToObject(pData, "instanceId", stSaveFileReq.strInstanceId.c_str());
+
+		cJSON_AddStringToObject(pData, "deviceId", stSaveFileReq.strDeviceId.c_str());
+		cJSON_AddStringToObject(pData, "executeId", stSaveFileReq.strExecuteId.c_str());
+		cJSON_AddStringToObject(pData, "taskName", stSaveFileReq.strTaskName.c_str());
+		cJSON_AddStringToObject(pData, "sceneIndex", stSaveFileReq.strSceneIndex.c_str());
+		cJSON_AddStringToObject(pData, "taskId", stSaveFileReq.strTaskId.c_str());
+		cJSON_AddStringToObject(pData, "caseId", stSaveFileReq.strCaseId.c_str());
+		cJSON_AddStringToObject(pData, "deviceName", stSaveFileReq.strDeviceName.c_str());
+		cJSON_AddStringToObject(pData, "runnerName", stSaveFileReq.strRunnerName.c_str());
+		cJSON_AddStringToObject(pData, "runnerIP", stSaveFileReq.strRunnerIP.c_str());
+		cJSON_AddStringToObject(pData, "runnerMac", stSaveFileReq.strRunnerMAC.c_str());
+		cJSON_AddStringToObject(pData, "caseName", stSaveFileReq.strCaseName.c_str());
+		cJSON_AddStringToObject(pData, "caseIndex", stSaveFileReq.strCaseIndex.c_str());
+		cJSON_AddStringToObject(pData, "taskRepeat", stSaveFileReq.strTaskRepeat.c_str());
+		cJSON_AddStringToObject(pData, "busCode", stSaveFileReq.strBusCode.c_str());
+		cJSON_AddStringToObject(pData, "fileType", stSaveFileReq.strFileType.c_str());
+		cJSON_AddStringToObject(pData, "caseStep", stSaveFileReq.strCaseStep.c_str());
 
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
@@ -1245,20 +1245,20 @@ SATHTTP_API int SaveResultImg(std::string url, const SATHTTP::STSaveImgReq &stSa
 		return -1;
 	}
 
-	ASSERT(cJSON_AddStringToObject(pRoot, "sysCode", ""));
-	ASSERT(cJSON_AddStringToObject(pRoot, "function", ""));
+	cJSON_AddStringToObject(pRoot, "sysCode", "");
+	cJSON_AddStringToObject(pRoot, "function", "");
 	cJSON *pData = cJSON_CreateObject();
 	if ( pData )
 	{
-		ASSERT(cJSON_AddStringToObject(pData, "instanceId", stSaveImgReq.strInstanceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "deviceId", stSaveImgReq.strDeviceId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "roundNum", stSaveImgReq.strRoundNum.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseId", stSaveImgReq.strCaseId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "step", stSaveImgReq.strCaseStep.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "type", stSaveImgReq.strTaskType.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "executeId", stSaveImgReq.strExecuteId.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "caseRepeat", stSaveImgReq.strCaseRepeat.c_str()));
-		ASSERT(cJSON_AddStringToObject(pData, "jobRepeat", stSaveImgReq.strJobRepeat.c_str()));
+		cJSON_AddStringToObject(pData, "instanceId", stSaveImgReq.strInstanceId.c_str());
+		cJSON_AddStringToObject(pData, "deviceId", stSaveImgReq.strDeviceId.c_str());
+		cJSON_AddStringToObject(pData, "roundNum", stSaveImgReq.strRoundNum.c_str());
+		cJSON_AddStringToObject(pData, "caseId", stSaveImgReq.strCaseId.c_str());
+		cJSON_AddStringToObject(pData, "step", stSaveImgReq.strCaseStep.c_str());
+		cJSON_AddStringToObject(pData, "type", stSaveImgReq.strTaskType.c_str());
+		cJSON_AddStringToObject(pData, "executeId", stSaveImgReq.strExecuteId.c_str());
+		cJSON_AddStringToObject(pData, "caseRepeat", stSaveImgReq.strCaseRepeat.c_str());
+		cJSON_AddStringToObject(pData, "jobRepeat", stSaveImgReq.strJobRepeat.c_str());
 		// 添加到根结点中;
 		cJSON_AddItemToObject(pRoot, "data", pData);
 	}

SATHTTP/SATHTTP/SATHTTP.vcproj

@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy $(TargetDir)$(TargetName).lib ..\..\SATService\SATService\$(TargetName).lib /y/a&#x0D;&#x0A;copy $(TargetName).h ..\..\SATService\SATService\$(TargetName).h /y/a"
+				CommandLine="copy $(TargetDir)$(TargetName).lib ..\..\SATService\SATService\$(TargetName).lib /y/a&#x0D;&#x0A;copy $(TargetName).h ..\..\SATService\SATService\$(TargetName).h /y/a&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -168,7 +168,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy $(TargetDir)$(TargetName).lib ..\..\SATService\SATService\$(TargetName).lib /y/a&#x0D;&#x0A;copy $(TargetName).h ..\..\SATService\SATService\$(TargetName).h /y/a"
+				CommandLine="copy $(TargetDir)$(TargetName).lib ..\..\SATService\SATService\$(TargetName).lib /y/a&#x0D;&#x0A;copy $(TargetName).h ..\..\SATService\SATService\$(TargetName).h /y/a&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -271,6 +271,10 @@
 				RelativePath=".\CurlClient.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Global.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\SATHTTP.cpp"
 				>
@@ -357,6 +361,10 @@
 				RelativePath=".\CurlClient.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Global.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Resource.h"
 				>

SATHTTP/SATHTTP/stdafx.h

@@ -32,4 +32,5 @@
 #include "CritSection.h"
 #include "CurlClient.h"
 #include "CharEncoding.h"
+#include "Global.h"
 // TODO: 在此处引用程序需要的其他头文件