Merge branch 'feature_tcp_client' into 'dev'

添加win/mac编译生成的库

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

Author: JiaWen Li

CMakeListsBak.txt

@@ -0,0 +1,150 @@
+cmake_minimum_required(VERSION 3.0)
+
+
+# Find the source file that contains the version information
+find_file(VERSION_FILE include/tigerapi/version.h PATHS ${CMAKE_SOURCE_DIR})
+
+message(version file " ${VERSION_FILE}")
+# Extract the version information from the source file
+file(READ ${VERSION_FILE} VERSION_FILE_CONTENTS)
+string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])"
+        PROJECT_VERSION "${VERSION_FILE_CONTENTS}")
+message(PROJECT_VERSION " ${PROJECT_VERSION}")
+
+project(tigerapi VERSION ${PROJECT_VERSION})
+
+
+# Configure required libraries ...
+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)
+        # 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 )
+        message(ZLIB_LIBRARY " ${ZLIB_LIBRARY}")
+
+    else()
+        find_package(OpenSSL 1.0.1 REQUIRED)
+        set(OPENSSL_VERSION "1.0.1")
+    endif()
+
+elseif(WIN32)
+    message(FATAL_ERROR "-- please compile via Visual Studio ")
+else()
+    message(FATAL_ERROR "-- Unsupported platform sorry! :( ")
+endif()
+
+# Configure compiler options ...
+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++14 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
+
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+
+    message("-- configuring gcc options")
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -DBOOST_LOG_DYN_LINK")
+
+endif()
+
+# Project construction ...
+# src 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} ${PROTOBUF_INCLUDE_DIR})
+
+
+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}")
+#message(CPPRESTSDK_LIBRARY " ${CPPRESTSDK_LIBRARY}")
+message(ZLIB_LIBRARY " ${ZLIB_LIBRARY}")
+message(LIBRARIES_SEARCH_PATHS " ${LIBRARIES_SEARCH_PATHS}")
+
+include_directories(${HEADER_SEARCH_PATHS})
+if (APPLE)
+    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} PRIVATE
+        ${LIBRARIES_SEARCH_PATHS}
+        OpenSSL::SSL 
+        OpenSSL::Crypto
+    )
+endif()
+
+
+
+
+install(DIRECTORY include/
+        DESTINATION "include"
+        FILES_MATCHING 
+        PATTERN "*.h"
+        # PATTERN "*.cc"
+        )
+
+install(TARGETS ${PROJECT_NAME}
+        EXPORT ${PROJECT_NAME}Targets
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION bin
+        INCLUDES DESTINATION include
+        )
+install(EXPORT ${PROJECT_NAME}Targets
+        FILE ${PROJECT_NAME}Targets.cmake
+        NAMESPACE ${PROJECT_NAME}::
+        DESTINATION lib/cmake/${PROJECT_NAME}
+        )

changlog.md

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

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -14,7 +14,6 @@
 #include <chrono>
 #include <thread>
 
-
 using namespace std;
 using namespace web;
 using namespace web::json;
@@ -116,18 +115,17 @@ class TestTradeClient {
         //Contract contract = ContractUtil::option_contract(U("AAPL 230721C00185000"));
         //Contract contract = ContractUtil::option_contract(U("AAPL 230721P00185000"));
         Order order = OrderUtil::limit_order(contract, U("BUY"), 3, U("0.18"));
-       // order.adjust_limit = 0.01;
+        //order.adjust_limit = 0.01;
         value res = trade_client->place_order(order);                          
         //unsigned long long id = res[U("id")].as_number().to_uint64();
         ucout << U("order id: ") << order.id << endl;
         ucout << U("place order result: ") << res << endl;
     }
-
-
+    
     static void test_get_order(const std::shared_ptr<TradeClient>& trade_client) {
-        //        Contract contract = stock_contract(U("AAPL"), U("USD"));
-        //        Order order = OrderUtil::limit_order(contract, U("BUY"), 1, 100.0);
-        //        trade_client->place_order(order);
+        //Contract contract = stock_contract(U("AAPL"), U("USD"));
+        //Order order = OrderUtil::limit_order(contract, U("BUY"), 1, 100.0);
+        //trade_client->place_order(order);
         Order my_order = trade_client->get_order(31318009878020096);
         ucout << U("order id ") << my_order.id << endl;
         ucout << U("order : ") << my_order.to_string() << endl;
@@ -187,11 +185,9 @@ class TestTradeClient {
 
 };
 
-
 /**
  * Test Quote Client
  */
-
 class TestQuoteClient {
 public:
     static void test_grab_quote_permission(std::shared_ptr<QuoteClient> quote_client) {
@@ -236,8 +232,7 @@ class TestQuoteClient {
         value result = quote_client->get_history_timeline(symbols, U("2023-01-10"));
         ucout << U("result: ") << result << endl;
     }
-
-
+    
     static void test_get_quote_real_time(const std::shared_ptr<QuoteClient> quote_client) {
         value symbols = value::array();
         symbols[0] = value::string(U("AAPL"));
@@ -276,7 +271,7 @@ class TestQuoteClient {
         symbols[0] = value::string(U("AAPL"));
         symbols[1] = value::string(U("JD"));
         //ucout << U("symbols ") << symbols << endl;
-//        value result = quote_client->get_kline(symbols, U("day"), -1, -1, U("br"), 5);
+        //value result = quote_client->get_kline(symbols, U("day"), -1, -1, U("br"), 5);
         vector<Kline> result = quote_client->get_kline(symbols, U("day"), -1, -1, 5);
         ucout << result.at(0).to_string() << endl;
     }
@@ -355,7 +350,7 @@ class TestQuoteClient {
         value symbols = value::array();
         symbols[0] = value::string(U("CL2303"));
         ucout << U("symbols ") << symbols << endl;
-//        value result = quote_client->get_future_real_time_quote(symbols);
+        //value result = quote_client->get_future_real_time_quote(symbols);
         auto result = quote_client->get_future_real_time_quote(symbols);
         ucout << U("result: ") << result.at(0).to_string() << endl;
     }
@@ -382,7 +377,7 @@ class TestQuoteClient {
     static void test_get_option_kline(std::shared_ptr<QuoteClient> quote_client) {
         value identifiers = value::array();
         identifiers[0] = value::string(U("AAPL 230224C000150000"));
-//        value result = quote_client->get_option_kline(identifiers, 1639026000000, 1649026000000);
+        //value result = quote_client->get_option_kline(identifiers, 1639026000000, 1649026000000);
         vector<Kline> result = quote_client->get_option_kline(identifiers, 1639026000000, 1649026000000);
         ucout << U("result: ") << result.at(0).to_string() << endl;
     }
@@ -441,9 +436,7 @@ class TestTigerApi {
     }
 };
 
-
 std::atomic<bool> keep_running(true);
-
 void signal_handler(int signal)
 {
     if (signal == SIGINT || signal == SIGTERM)
@@ -452,7 +445,6 @@ void signal_handler(int signal)
     }
 }
 
-
 class TestPushClient {
 private:
     std::shared_ptr<IPushClient> push_client;
@@ -587,27 +579,22 @@ class TestPushClient {
     }
 };
 
-
 int main()
 {
-    /************************** set config **********************/
-    ClientConfig config = ClientConfig();
-#if 1
-	// config.private_key = U("");
-	// config.tiger_id = U("");
-	// config.account = U("");
-    config.use_full_tick = true;
-
-#else
+    //Set Tiger OpenAPI SDK configuration
+    bool sand_box = false;
+    ClientConfig config = ClientConfig(sand_box);
 	config.private_key = U("");
 	config.tiger_id = U("");
 	config.account = U("");
-#endif
-
+	config.use_full_tick = true;
     //config.lang = U("en_US");
 
+    //Create a push client instance
     auto push_client = IPushClient::create_push_client(config);
+    //Run some push test cases
     TestPushClient::test_push_client(push_client, config);
+
     /**
      *  QuoteClient
      */
@@ -617,16 +604,14 @@ int main()
     /**
      * TradeClient
      */
-     //std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
-     //TestTradeClient::test_trade(trade_client);
-
-     /**
-      *  TigerApi
-      */
-      //    std::shared_ptr<TigerClient> tigerapi = std::make_shared<TigerClient>(config);
-      //    TestTigerApi::test_grab_quote_permission(tigerapi);
-	
+    //std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
+    //TestTradeClient::test_trade(trade_client);
 
+    /**
+    *  TigerApi
+    */
+    //std::shared_ptr<TigerClient> tigerapi = std::make_shared<TigerClient>(config);
+    //TestTigerApi::test_grab_quote_permission(tigerapi);
 
     return 0;
 }