From 43a25cfe285b11f88a4678cd94b929866b6fedc5 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 26 一月 2019 14:08:02 +0800
Subject: [PATCH] # Type(<scope>): <subject>
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 4 +---
QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp | 2 --
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 9eaf5e6..9a632e9 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -2418,10 +2418,9 @@
string str_serIp = GET_STR_CONFIG("mainServerIp");
string str_serPort = GET_STR_CONFIG("mainServerPort");
-// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
+// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
string sendUrl = str_serIp;
sendUrl.append(":").append(str_serPort).append("/addPerson/uploadToTemporary");
-
Json::Value perInfos;
Json::Value perInfo;
@@ -2433,7 +2432,6 @@
auto rec = db_c.searchConfigTableWithinServerInfo();
perInfo["deviceId"] = rec.dev_id.toStdString();
perInfo["photos"] = img_url;
-// perInfo["featureBase"] = feature_base64;
perInfo["featureBase64"] = feature_base64;
perInfo["cardId"] = idcard;//鍥剧墖鎻忚堪
perInfos.append(perInfo);
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
index 30fed97..d094748 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
@@ -115,8 +115,6 @@
<< t_faceCR.confidence);
results.insert(itTR, t_faceCR);
}
-
-
//#todo send message
return results;
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index 4dbacb0..4dac82e 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -100,7 +100,7 @@
}
std::string getTableInfosSql(std::string tableName) {
- std::string sql = "select * from '" + tableName+"';";// + " where del_flag = 0";
+ std::string sql = "select * from '" + tableName + "';";// + " where del_flag = 0";
return sql;
}
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index 1b62fa9..9ba984c 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
--
Gitblit v1.8.0