From bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 14:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index bc9b6f0..4c2e5ef 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -23,6 +23,12 @@
#include <dirent.h>
#include "basic/pipe_element/ffmpeg/basic_struct_for_video_image.h"
+#include "vss/controller/VssDevTblController.h"
+#include "vss/controller/VssChannelTblController.h"
+#include "vss/controller/VssDomainUnitTblController.h"
+#include "vss/controller/VssLocalSettingTblController.h"
+#include "vss/controller/VssUpperSvrTblController.h"
+
using namespace std;
devHttpServer_c::devHttpServer_c()
@@ -243,6 +249,14 @@
std::placeholders::_3, std::placeholders::_4));
+ BaseDao::initConnection();
+ VssLocalSettingTblSqliteDao::instance()->setLDBTool(&db_c);
+ VssDevTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssChannelTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+
_HttpSrvRetRecieve.start();
_HttpSrvRetRecieve.waitForShutDown();
}
--
Gitblit v1.8.0