From ed223aee5fe5f3b222488549597976f34c679c3d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 14:00:47 +0800
Subject: [PATCH] 代码格式化及部分bug修改

---
 QiaoJiaSystem/DataManagerServer/CMakeLists.txt |   93 +++++++++++++++++++++++++---------------------
 1 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index dd5cd26..e36f449 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -16,31 +16,31 @@
 
     #
     ../LocalDBTool/
-    ../../BasicPlatForm/basic/db/sqlite/
-    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
+    ../../../BasicPlatForm/basic/db/sqlite/
+    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
 
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/libs/crul/include
-    ../../BasicPlatForm/libs/FastDFS/include
-    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
-    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
-    ../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/crul/include
+    ../../../BasicPlatForm/libs/FastDFS/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/libs/ffmpeg/include
 
-    ../../BasicPlatForm/basic/util/fastdfs/
-    ../../BasicPlatForm/basic/util/curl/
-    ../../BasicPlatForm/basic/http_server/
-    ../../BasicPlatForm/libs/libuuid/include
-    ../../BasicPlatForm/libs/uniview/include
+    ../../../BasicPlatForm/basic/util/fastdfs/
+    ../../../BasicPlatForm/basic/util/curl/
+    ../../../BasicPlatForm/basic/http_server/
+    ../../../BasicPlatForm/libs/libuuid/include
+    ../../../BasicPlatForm/libs/uniview/include
 
-    ../../../Erlang/syncDBTool
+    ../../syncDBTool
 
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
 
-    ../../BasicPlatForm/libs/libboost/include
+    ../../../BasicPlatForm/libs/libboost/include
 
     /usr/include/x86_64-linux-gnu/qt5
     /usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -48,34 +48,38 @@
 
 
     #glog
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/mysqlpp/include
+    ../../../BasicPlatForm/libs/mysql/include/mysql/
+    ../../../BasicPlatForm/basic/util/app/
 
 )
 
 link_directories(
     #glog
-    ../../BasicPlatForm/libs/glog/lib
+    ../../../BasicPlatForm/libs/glog/lib
 
     /usr/lib/erlang/lib/erl_interface-3.8.2/lib/
     /usr/local/cuda/lib64
 
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
-    ../../BasicPlatForm/libs/crul/lib
-    ../../BasicPlatForm/libs/FastDFS/lib
-    ../../BasicPlatForm/libs/jsoncpp/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
-    ../../BasicPlatForm/libs/libuuid/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
+    ../../../BasicPlatForm/libs/crul/lib
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
 
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
-    ../../BasicPlatForm/libs/uniview/lib
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
+    ../../../BasicPlatForm/libs/uniview/lib
 
-    ../../BasicPlatForm/libs/libboost/lib
+    ../../../BasicPlatForm/libs/libboost/lib
 
 
-    ../../BasicPlatForm/basic/db/sqlite/
-    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+    ../../../BasicPlatForm/basic/db/sqlite/
+    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+    ../../../BasicPlatForm/libs/mysqlpp/lib
 )
 
 add_executable(DataWebServer
@@ -89,21 +93,23 @@
     ./AppPipeController.cpp
     ./AppPipeController.h
 
-    ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+    ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
     ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
     ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
 
 
-    ../../../Erlang/syncDBTool/ErlangDbTool.cpp
+
+    ../../syncDBTool/ErlangDbTool.cpp
     #
     ../LocalDBTool/GetUUId.cpp
     ../LocalDBTool/SqliteFaceEncap.cpp
-    ../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
-    ../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
+    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
+    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
     )
 
 target_link_libraries(DataWebServer
@@ -148,6 +154,7 @@
     HCCore
     hcnetsdk
     pthread
+    mysqlpp
     )
 
 #add_executable(Apptest

--
Gitblit v1.8.0