Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 QiaoJiaSystem/FaceSearchServer/main.cpp

@@ -1,4 +1,5 @@
//
// 人脸对比主进程入口
// Created by pans on 4/27/18.
//
#include <iostream>
@@ -26,6 +27,8 @@

//    appPref.setStringData("ipAdd", "192.168.1.185");
//    appPref.setIntData("ipPort", 9200);

    //设置es上传ip和端口
    appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
    appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));