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

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 QiaoJiaSystem/FaceDetectServer/main_detect.cpp

@@ -57,7 +57,8 @@
    IceRpcServer<FaceDetectServerI> server("faceServer", appPref.getIntData("RpcFDPort"), "tcp");
    server.setMessageSizeMax(1024 * 1024 * 50);
    server.setPoolInitSize(appPref.getIntData("thread.max"));
    server.setPoolMaxSize(appPref.getIntData("thread.max"));
    DBG("MaxPoolSize: " << std::max(appPref.getIntData("thread.max")*2, 32));
    server.setPoolMaxSize(std::max(appPref.getIntData("thread.max")*2, 32));
    server.runWaitShutDown();
    return 0;
}