Merge branch 'dev' into 'master'

dev-master

See merge request server/openapi/openapi-cpp-sdk!41

Author: JiaWen Li

CMakeLists.txt

@@ -19,23 +19,35 @@ if(UNIX) # Darwing or Linux
 
     find_package(Boost REQUIRED COMPONENTS system thread log program_options chrono)
     find_package(Threads REQUIRED)
+    find_package(absl REQUIRED)
 
     # cpprest
     find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
     find_library(CPPREST_LIBRARY NAMES cpprest)
     message(CPPREST_INCLUDE_DIR " ${CPPREST_INCLUDE_DIR}")
     message(CPPREST_LIBRARY " ${CPPREST_LIBRARY}")
-
-
+    
+    set(Protobuf_INCLUDE_DIR "/usr/local/opt/protobuf/include")
+    set(Protobuf_LIBRARY "/usr/local/opt/protobuf/lib/libprotobuf.dylib")
+    set(Protobuf_PROTOC_LIBRARY "/usr/local/opt/protobuf/lib/libprotoc.dylib")
+    set(Protobuf_PROTOC_EXECUTABLE "/usr/local/opt/protobuf/bin/protoc")
+
+    # 查找 Protobuf 包
+    find_package(Protobuf REQUIRED)
+    message(STATUS "Protobuf version: ${Protobuf_VERSION}")
+    message(STATUS "Protobuf include dir: ${Protobuf_INCLUDE_DIR}")
+    message(STATUS "Protobuf libraries: ${Protobuf_LIBRARY}")
 
     if(APPLE)
-        # Prefer a homebrew version of OpenSSL over the one in /usr/lib
         # file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
         file(GLOB OPENSSL_ROOT_DIR /usr/local/opt/openssl/* /opt/homebrew/Cellar/openssl@3/*)
         # Prefer the latest (make the latest one first)
         list(REVERSE OPENSSL_ROOT_DIR)
 
         find_package(OpenSSL REQUIRED)
+        message(OPENSSL_ROOT_DIR " ${OPENSSL_ROOT_DIR}")
+        message(OPENSSL_LIBRARIES " ${OPENSSL_LIBRARIES}")
+    
 #        set(OPENSSL_VERSION "1.1.1q")
 
         set(ZLIB_LIBRARY  /opt/homebrew/Cellar/zlib/1.2.13/lib/libz.dylib )
@@ -57,7 +69,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     message("-- configuring clang options")
 #    set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
-    set(CMAKE_CXX_FLAGS "-arch arm64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
+    set(CMAKE_CXX_FLAGS "-arch arm64 -std=c++14 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
 
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 
@@ -69,29 +81,24 @@ endif()
 
 # Project construction ...
 # src files ...
-file(GLOB MY_SOURCE_FILES "include/cpprest/*.h" "include/cpprest/details/*.h")
-add_library(${PROJECT_NAME}
-        src/tiger_client.cpp include/tigerapi/tiger_client.h include/tigerapi/constants.h
-        include/tigerapi/utils.h src/utils.cpp include/tigerapi/service_types.h include/tigerapi/quote_client.h
-        src/quote_client.cpp src/trade_client.cpp include/tigerapi/model.h src/order_util.cpp
-        include/tigerapi/order_util.h src/contract_util.cpp include/tigerapi/contract_util.h
-        include/tigerapi/client_config.h include/tigerapi/sign_util.h
-        include/tigerapi/easylogging++.h cpprest/ src/easylogging++.cc ${MY_SOURCE_FILES})
+file(GLOB MY_SOURCE_FILES "include/cpprest/*.h" "include/cpprest/details/*.h" "include/openapi_pb/pb_source/*.*" 
+"include/tigerapi/push_socket/*.h" "include/tigerapi/*.h" "src/*.cpp" "src/push_socket/*.cpp")
+add_library(${PROJECT_NAME} cpprest/ ${MY_SOURCE_FILES})
+message(MY_SOURCE_FILES " ${MY_SOURCE_FILES}")
+# 确保生成动态库
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    SOVERSION ${PROJECT_VERSION}
+    VERSION ${PROJECT_VERSION}
+)
 
 # headers search paths ...
 #set(HEADER_SEARCH_PATHS ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
-set(HEADER_SEARCH_PATHS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+set(HEADER_SEARCH_PATHS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIR})
 
-# library search paths ...
-if(APPLE)
-    set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
-#    set(ZIP_LIBRARY ZLIB::ZLIB)
 
-    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${CPPREST_LIBRARY} ${ZIP_LIBRARY})
-else()
-    set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
-    set(LIBRARIES_SEARCH_PATHS ${CPPREST_LIBRARY} ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY})
-endif()
+set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
+set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${CPPREST_LIBRARY} ${ZIP_LIBRARY} ${Protobuf_LIBRARY} ${Protobuf_PROTOC_LIBRARY})
+
 
 message(BOOST_LIBS " ${Boost_LIBRARIES}")
 message(OPENSSL_LIBS " ${OPENSSL_LIBRARIES}")
@@ -101,22 +108,32 @@ message(LIBRARIES_SEARCH_PATHS " ${LIBRARIES_SEARCH_PATHS}")
 
 include_directories(${HEADER_SEARCH_PATHS})
 if (APPLE)
-    target_link_libraries(${PROJECT_NAME} "-framework CoreFoundation")
-    target_link_libraries(${PROJECT_NAME} "-framework Security")
-    target_link_libraries(${PROJECT_NAME} ${LIBRARIES_SEARCH_PATHS})
-    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-W1, -F/Library/Frameworks ")
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        "-framework CoreFoundation"
+        "-framework Security"
+        ${LIBRARIES_SEARCH_PATHS}
+        absl::base
+        absl::utility
+    )
+    set_target_properties(${PROJECT_NAME} PROPERTIES 
+        LINK_FLAGS "-W1, -F/Library/Frameworks"
+    )
 else()
-    target_link_libraries(${PROJECT_NAME} ${LIBRARIES_SEARCH_PATHS})
-    target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
-
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        ${LIBRARIES_SEARCH_PATHS}
+        OpenSSL::SSL 
+        OpenSSL::Crypto
+    )
 endif()
 
 
 
 
 install(DIRECTORY include/
         DESTINATION "include"
-        FILES_MATCHING PATTERN "*.h"
+        FILES_MATCHING 
+        PATTERN "*.h"
+        # PATTERN "*.cc"
         )
 
 install(TARGETS ${PROJECT_NAME}

README.md

@@ -1,4 +1,9 @@
 # 编译步骤
+## 环境要求
+- Linux/Mac: GCC/Clang, CMake 3.0+
+- Windows: Visual Studio 2015+, vcpkg
+
+
 
 ## Linux/Mac
 
@@ -47,6 +52,24 @@ make install
 [参考文档](https://github.com/Microsoft/cpprestsdk/wiki/Getting-Started-Tutorial)
 直接通过包管理软件安装的 cpprestsdk 可能不是最新版本， 可能会有未知问题
 
+### 编译安装 protobuf
+使用 v3.1.0 版本
+```
+cd /tmp  # 选择暂存源码的目录，此处用 /tmp，也可根据本机环境指定其他系统路径
+git clone https://github.com/protocolbuffers/protobuf
+cd protobuf
+git checkout v3.1.0
+mkdir cmake_build
+cd cmake_build
+cmake ../cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local/opt/protobuf \
+    -Dprotobuf_BUILD_TESTS=OFF \
+    -Dprotobuf_BUILD_SHARED_LIBS=ON
+make -j 8
+make install
+```
+
 ### 编译 tigerapi sdk
 若使用编译好的sdk，此步骤可跳过  
 准备工作：根据系统环境调整 CMakeLists.txt 的相关路径
@@ -99,6 +122,18 @@ vcpkg install openssl
 ```
 PS> vcpkg install cpprestsdk cpprestsdk:x64-windows
 ```
+### 编译protobuf
+git clone https://github.com/protocolbuffers/protobuf
+```
+git checkout v3.1.0
+
+使用cmake-gui生成windows解决方案
+```
+解决方案中选择“libprotobuf”工程生成pb依赖库，代码生成配置为/MDd和/MD,
+解决方案下创建lib目录，按需依次创建其他层级为：lib/x86/Debug、lib/x86/Release、lib/x64/Debug、lib/x64/Release
+将pb解决方案编译好的lib库依次拷贝到对应的层级目录，Debug：libprotobufd.lib，Release：libprotobuf.lib
+```
+```
 
 ### 安装 tigerapi sdk
 源码output里的dll或lib为sdk编译后的库，项目配置引入后即可调用sdk

changlog.md

@@ -1,3 +1,7 @@
+## 1.0.0 (2024-11-28)
+### New
+- 支持长连接推送
+
 ## 0.1.6 (2024-03-08)
 ### New
 - 新增根据ticksize调整下单价格的工具 PriceUtil

demo/CMakeLists.txt

@@ -17,20 +17,30 @@ if(UNIX) # Darwing or Linux
     message(CPPREST_LIBRARY " ${CPPREST_LIBRARY}")
 
     # tigerapi
-    find_path(TIGERAPI_INCLUDE_DIR NAMES common/easylogging++.h tigerapi/client_config.h )
+    find_path(TIGERAPI_INCLUDE_DIR NAMES tigerapi/easylogging++.h tigerapi/client_config.h )
+    message(TIGERAPI_INCLUDE_DIR " ${TIGERAPI_INCLUDE_DIR}")
     find_library(TIGERAPI_LIBRARY NAMES libtigerapi.a)
 
+    # 可使用系统库或sdk output中的库
+    set(Protobuf_INCLUDE_DIR "/usr/local/opt/protobuf/include")
+    set(Protobuf_LIBRARY "/usr/local/opt/protobuf/lib/libprotobuf.dylib")
+    # find_path(Protobuf_INCLUDE_DIR NAMES google/protobuf/service.h)
+    # find_library(Protobuf_LIBRARY NAMES protobuf)
+    message(STATUS "Protobuf version: ${Protobuf_VERSION}")
+    message(STATUS "Protobuf include dir: ${Protobuf_INCLUDE_DIR}")
+    message(STATUS "Protobuf libraries: ${Protobuf_LIBRARY}")
+
+
     if(APPLE)
-        # Prefer a homebrew version of OpenSSL over the one in /usr/lib
+#        set(CMAKE_OSX_DEPLOYMENT_TARGET "13.7")
         # file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
         file(GLOB OPENSSL_ROOT_DIR /usr/local/opt/openssl/* /opt/homebrew/Cellar/openssl@3/*)
         # Prefer the latest (make the latest one first)
         list(REVERSE OPENSSL_ROOT_DIR)
 
         find_package(OpenSSL REQUIRED)
-#        set(OPENSSL_VERSION "1.1.1q")
-
-
+        message(OPENSSL_ROOT_DIR " ${OPENSSL_ROOT_DIR}")
+        message(OPENSSL_LIBRARIES " ${OPENSSL_LIBRARIES}")
     else()
         find_package(OpenSSL 1.0.1 REQUIRED)
         set(OPENSSL_VERSION "1.0.1")
@@ -48,7 +58,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     message("-- configuring clang options")
 #    set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
     set(CMAKE_CXX_FLAGS "-arch arm64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
-
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 
     message("-- configuring gcc options")
@@ -61,16 +70,16 @@ endif()
 add_executable(${PROJECT_NAME} openapi_cpp_test/openapi_cpp_test.cpp)
 
 # headers search paths ...
-set(HEADER_SEARCH_PATHS ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${TIGERAPI_INCLUDE_DIR})
+set(HEADER_SEARCH_PATHS ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${TIGERAPI_INCLUDE_DIR} ${Protobuf_INCLUDE_DIR})
 
 # library search paths ...
 if(APPLE)
     set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
 #    set(ZIP_LIBRARY "/usr/local/Cellar/zlib/1.2.12/lib/libz.dylib")
-    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY})
+    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY} ${Protobuf_LIBRARY} )
 else()
     set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
-    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY})
+    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY} ${Protobuf_LIBRARY} )
 endif()
 
 message(LIBRARIES_SEARCH_PATHS " ${LIBRARIES_SEARCH_PATHS}")