From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 793079d..559119b 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -19,6 +19,7 @@
#include <atomic>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
+#include "NsqMsgTool.hpp"
typedef std::shared_ptr<HttpServer::Response> PResponse;
@@ -154,6 +155,10 @@
FastFdsWithLock fdfsClient;
+ //nsq
+ BasicMsg::Nsq::NsqMsgProducer *nsqMsgProducer;
+
+
bool getDevSerialNumber(const char *ip, const int port, const char *username, \
const char *passwd, const char *brand, unsigned char *serialNumber) const;
--
Gitblit v1.8.0