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 |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 54a887b..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()));

--
Gitblit v1.8.0