代码格式化及部分bug修改

pansen

2019-03-05 ed223aee5fe5f3b222488549597976f34c679c3d

 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt

@@ -32,31 +32,31 @@
    ./CasiaFaceWrapper

    #glog
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/glog/include
    ../LocalDBTool
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/crul/include
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/crul/include
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    #    ../../BasicPlatForm/libs/erlang/erl_interface/include


    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/crul/include
    ../../BasicPlatForm/libs/libuuid/include/
    ../../BasicPlatForm/basic/util/curl/
    ../../BasicPlatForm/basic/util/ShareMemory/
    ../../BasicPlatForm/basic/db/Elasticsearch/
    ../../BasicPlatForm/wrapper/casia/include
    ../../BasicPlatForm/libs/libboost/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/crul/include
    ../../../BasicPlatForm/libs/libuuid/include/
    ../../../BasicPlatForm/basic/util/curl/
    ../../../BasicPlatForm/basic/util/ShareMemory/
    ../../../BasicPlatForm/basic/db/Elasticsearch/
    ../../../BasicPlatForm/wrapper/casia/include
    ../../../BasicPlatForm/libs/libboost/include


    ../../../Erlang/syncDBTool/
    ../../syncDBTool/

    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000

    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -73,7 +73,7 @@
    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
    ../../../BasicPlatForm/libs/crul/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/libuuid/lib
@@ -105,6 +105,7 @@
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.h

    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp

    ../LocalDBTool/SqliteFaceEncap.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp