From e15c4888f720b8781260b901ac82d058f8f7c3b5 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 27 三月 2019 14:34:37 +0800
Subject: [PATCH] 移植nsq到项目中，将最短最长时长的参数修改成nsq配置
---
syncDBTool/ErlangDbTool.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index e736943..85ea1bb 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -11,6 +11,7 @@
#include <QtCore/QString>
#include <QtCore/QDebug>
#include <QtCore/QVariantList>
+#include <basic/util/app/AppPreference.hpp>
using ErlangTool::map_DevDataCache;
using ErlangTool::map_TabDataCache;
@@ -1614,7 +1615,7 @@
}
if (str_tableUuid.size() > 0) {
QString sql = QString::fromStdString(
- "Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enable,b.monitorLevel from '" +
+ "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);");
QSqlQuery query(g_syncDbFile);
@@ -1760,7 +1761,7 @@
ETERM *fromp, *tuplep, *fnp, *argp, *resp;
int port; /* Listen port number */
- port = PORT;
+ port = appPref.getIntData("ErlNodePort");
/* Make a listen socket */
if ((listen = my_listen(port)) <= 0) {
ERR("my_listen is error");
--
Gitblit v1.8.0