Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -262,6 +262,8 @@
    VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    CamDevController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    //todo
    CamDevController::instance()->nsqMsgProducerSet(nsqMsgProducer);
    VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);