|
|
@@ -257,7 +257,7 @@ DWORD SaveCefclientLog(std::string magicStr)
|
|
|
unsigned int t_priority = 0;
|
|
|
mq.receive(&t_data, sizeof(cefclientLog), t_recvSize, t_priority);
|
|
|
std::string source = std::string(t_data.m_filename) + "(" + std::to_string((ULONGLONG)t_data.m_filePos) + ")";
|
|
|
-#ifdef OUTPUT_DETAIL_LOG /*DevOps流水线编译,ST环境*/
|
|
|
+#ifdef OUTPUT_DETAIL_LOG
|
|
|
DbgWithLink(t_data.m_level, t_data.m_type).withLogProducer(ConfigManager::getInstance().getLogProducer()).setSourceType(source.c_str()).withExtendLog(true).setResultMsg(t_data.m_cefLog)();
|
|
|
#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译,UAT环境*/
|
|
|
DbgWithLink(t_data.m_level, t_data.m_type).withLogProducer(ConfigManager::getInstance().getLogProducer()).setSourceType(source.c_str()).withExtendLog(true).setResultMsg(t_data.m_cefLog)();
|
|
|
@@ -920,10 +920,12 @@ bool SM2_Encrypt_Manager::verifySM2Manager()
|
|
|
return false;
|
|
|
return true;
|
|
|
}
|
|
|
-#ifdef RVC_OS_LINUX
|
|
|
+
|
|
|
std::vector<int> getUosBrowserPIDs(int UseUOSBrowser)
|
|
|
{
|
|
|
std::vector<int> pids;
|
|
|
+
|
|
|
+#ifdef RVC_OS_LINUX
|
|
|
FILE* fp = nullptr;
|
|
|
if(UseUOSBrowser == 1)
|
|
|
fp = popen("ps -ef | grep uosbrowser | grep -v grep | awk '{print $2}'", "r");
|
|
|
@@ -936,9 +938,10 @@ std::vector<int> getUosBrowserPIDs(int UseUOSBrowser)
|
|
|
}
|
|
|
pclose(fp);
|
|
|
}
|
|
|
+#endif
|
|
|
+
|
|
|
return pids;
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
ConfigManager& ConfigManager::getInstance() {
|
|
|
@@ -992,24 +995,6 @@ void LogManager::writeLog(LOG_LEVEL_E level, const Json::Value& log) {
|
|
|
}
|
|
|
|
|
|
std::string LogManager::getCurrentTimestamp() {
|
|
|
- /*
|
|
|
- FILETIME ft;
|
|
|
- SYSTEMTIME st;
|
|
|
- GetSystemTime(&st);
|
|
|
- SystemTimeToFileTime(&st, &ft);
|
|
|
-
|
|
|
- FILETIME utc_ft, local_ft;
|
|
|
-#ifdef _WIN32
|
|
|
- utc_ft.dwLowDateTime = (DWORD)ft.dwLowDateTime;
|
|
|
- utc_ft.dwHighDateTime = (DWORD)ft.dwHighDateTime;
|
|
|
- FileTimeToLocalFileTime(&utc_ft, &local_ft);
|
|
|
- FileTimeToSystemTime(&local_ft, &st);
|
|
|
-#else
|
|
|
- GetLocalTime(&st);
|
|
|
-#endif // _WIN32
|
|
|
-*/
|
|
|
-
|
|
|
-
|
|
|
using namespace std::chrono;
|
|
|
|
|
|
auto now = system_clock::now();
|