From 8979b4ff45a551262f6ed6c81239e21de86b110e Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 15:29:19 +0800
Subject: [PATCH] 增加视频录取程序的RPC端口以及检测程序的RPC端口参数
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 27e432c..c9f86a9 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -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