From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3

---
 syncDBTool/ErlangDbTool.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index e736943..b3cdeea 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -11,6 +11,8 @@
 #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 +1616,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 +1762,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