From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
syncDBTool/ErlangDbTool.cpp | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 173fd83..b42a94b 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -190,7 +190,6 @@
// c erlang init
erl_init(NULL, 0);
-
struct in_addr addr;
addr.s_addr = inet_addr("127.0.0.1");
@@ -231,7 +230,6 @@
std::cout << m_ret << std::endl;
// 鍒ゆ柇鑺傜偣鏄惁鍚姩鎴愬姛
m_ret = waitNode();
-// erl_close_connection(m_fd);
resetConn();
return m_ret;
} else {
@@ -1623,6 +1621,7 @@
"Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enabled,b.monitorLevel from '" +
str_tableUuid +
"_fea' as a ,'" + str_tableUuid + "' as b where a.uuid = b.uuid and ( a.del_flag=0 AND b.del_flag=0);");
+ //Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enabled,b.monitorLevel from '0cd82a8b-5285-5737-ab19-8c07247c797e_fea' as a ,'0cd82a8b-5285-5737-ab19-8c07247c797e' as b where a.uuid = b.uuid and ( a.del_flag=0 AND b.del_flag=0);
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
if (!query.exec()) {
--
Gitblit v1.8.0