|
@@ -45,6 +45,7 @@ namespace GLOBAL
|
|
|
TCHAR g_szDBPassWord[MAX_PATH]; // 数据库登录密码;
|
|
|
TCHAR g_szDBName[MAX_PATH]; // 数据库名称;
|
|
|
TCHAR g_szPython27Dir[MAX_PATH] = {0};
|
|
|
+ TCHAR g_szPython27ResourceConfig[MAX_PATH] = { 0 };
|
|
|
std::string g_strIPAddress;
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
@@ -225,12 +226,12 @@ namespace GLOBAL
|
|
|
GetPrivateProfileString(_T("LinuxDevice"), _T("model"), _T(""), g_stSATConfig.stLinuxDevice.szModel, MAX_PATH, szIniPath);
|
|
|
|
|
|
// 读取其他目录的配置文件;sat_result_dir
|
|
|
- _stprintf_s(szIniPath, _T("%s%s"), g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\resource_run.cfg");
|
|
|
- GetPrivateProfileString(_T("COMM"), _T("serial_communicator_port"), _T(""), g_stSATConfig.szTVPort, MAX_PATH, szIniPath);
|
|
|
- GetPrivateProfileString(_T("Abnormal"), _T("reboot"), NULL, g_stSATConfig.szTVReboot, MAX_PATH, szIniPath);
|
|
|
- GetPrivateProfileString(_T("Abnormal"), _T("shutdown"), NULL, g_stSATConfig.szTVShutdown, MAX_PATH, szIniPath);
|
|
|
- g_stSATConfig.bWatchTVPort = GetPrivateProfileInt(_T("Abnormal"), _T("Watch"), 0, szIniPath);
|
|
|
- GetPrivateProfileString(_T("COMM"), _T("sat_result_dir"), _T(""), g_stSATConfig.szCaseResultDir, MAX_PATH, szIniPath);
|
|
|
+ _stprintf_s(g_szPython27ResourceConfig, _T("%s%s"), g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\resource_run.cfg");
|
|
|
+ GetPrivateProfileString(_T("COMM"), _T("serial_communicator_port"), _T(""), g_stSATConfig.szTVPort, MAX_PATH, g_szPython27ResourceConfig);
|
|
|
+ GetPrivateProfileString(_T("Abnormal"), _T("reboot"), NULL, g_stSATConfig.szTVReboot, MAX_PATH, g_szPython27ResourceConfig);
|
|
|
+ GetPrivateProfileString(_T("Abnormal"), _T("shutdown"), NULL, g_stSATConfig.szTVShutdown, MAX_PATH, g_szPython27ResourceConfig);
|
|
|
+ g_stSATConfig.bWatchTVPort = GetPrivateProfileInt(_T("Abnormal"), _T("Watch"), 0, g_szPython27ResourceConfig);
|
|
|
+ GetPrivateProfileString(_T("COMM"), _T("sat_result_dir"), _T(""), g_stSATConfig.szCaseResultDir, MAX_PATH, g_szPython27ResourceConfig);
|
|
|
// 将反斜转正斜;
|
|
|
std::string dir = Replace(g_stSATConfig.szCaseResultDir, "\\", "/");
|
|
|
_stprintf_s(g_stSATConfig.szCaseResultDir, dir.c_str());
|
|
@@ -241,7 +242,7 @@ namespace GLOBAL
|
|
|
TCHAR szValue[10] = { 0 };
|
|
|
_itoa_s(g_stSATConfig.dwTCPSvrPort, szValue, 10);
|
|
|
// 作用:python脚本不需要去读取SATService的配置文件;
|
|
|
- WritePrivateProfileString(_T("COMM"), _T("runner_tcp_port"), szValue, szIniPath);
|
|
|
+ WritePrivateProfileString(_T("COMM"), _T("runner_tcp_port"), szValue, g_szPython27ResourceConfig);
|
|
|
|
|
|
return 0;
|
|
|
}
|