From d6ae9fa43cb42b76537085419be2a29ccdadc6d1 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期二, 19 二月 2019 17:03:01 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 27e432c..0673a47 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -951,7 +951,7 @@
void devHttpServer_c::killVideoAnalysFromHCApp() const {
string local_passwd = appConfig.getStringProperty("localPasswd");
- string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalysFrom";
+ string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
system(cmd_kill.c_str());
DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
}
@@ -2078,6 +2078,12 @@
img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp);
img_url.swap(img_str);
}
+ } else {
+ std::string img_str = "http://";
+ if (fdfsClient.fastFds != nullptr) {
+ img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
+ img_url.swap(img_str);
+ }
}
auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str()));
@@ -2528,7 +2534,7 @@
std::string picDate = value["picDate"].asString();
std::string imgKey = value["imgKey"].asString();
//鍏煎鏃х増鏈�
- if(imgKey=="undefined")
+ if(imgKey=="undefined" || imgKey.empty())
{
return getAlarmImageByPicDateAndDevId(picDate,devId,response);
}
@@ -2644,7 +2650,7 @@
std::string path;
//鍏煎鏃х増鏈�
- if(imgKey=="undefined")
+ if(imgKey=="undefined"||imgKey.empty())
{
qint64 sub;
path = getVideoPathByPicDate(picDate,devId,sub);
--
Gitblit v1.8.0