From f54c3b20dc82df32c4314d2c27aa2eb1fead6312 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 20 二月 2019 09:32:23 +0800
Subject: [PATCH] 修改重启命令

---
 QiaoJiaSystem/DataManagerServer/http_configserver.cpp |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 54a887b..07a20cf 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -951,8 +951,10 @@
 
 void devHttpServer_c::killVideoAnalysFromHCApp() const {
     string local_passwd = appConfig.getStringProperty("localPasswd");
-    string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalysFrom";
-    system(cmd_kill.c_str());
+    string cmd_kill_VideoAnalys = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
+    system(cmd_kill_VideoAnalys.c_str());
+    string cmd_kill_VideoToIma = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoToIma";
+    system(cmd_kill_VideoToIma.c_str());
     DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
 }
 
@@ -2078,6 +2080,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