Merge branch 'feat_us_support' into 'dev'

Feat us support

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

Author: tigersk

.gitignore

@@ -81,4 +81,5 @@ output/Mac/Release/*.a
 output/Linux/Debug/
 output/Linux/Release/
 
-*.properties
+*.properties
+temp/

changlog.md

@@ -1,3 +1,7 @@
+## 1.1.0 (2025-08-08)
+### New
+- 支持 TBUS 配置
+
 ## 1.0.4 (2025-05-12)
 ### Breaking
 - 长连接订阅请求由 bool 改为 unsigned int，表示订阅请求的 id

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -180,7 +180,7 @@ class TestTradeClient {
     }
 
     static void test_trade(const std::shared_ptr<TradeClient>& trade_client) {
-        TestTradeClient::test_price_util(trade_client);
+        TestTradeClient::test_place_order(trade_client);
     }
 
 };
@@ -406,7 +406,7 @@ class TestQuoteClient {
 
 
     static void test_quote(const std::shared_ptr<QuoteClient> quote_client) {
-        TestQuoteClient::test_get_quote_delay(quote_client);
+        TestQuoteClient::test_get_kline(quote_client);
     }
 };
 
@@ -454,7 +454,8 @@ class TestPushClient {
     TestPushClient(std::shared_ptr<IPushClient> client) : push_client(client) {
         std::vector<std::string> hk_option_symbols = {"TCH.HK 20241230 410.00 CALL"};
         std::vector<std::string> future_symbols = {"CL2412"};
-        symbols = future_symbols;
+        std::vector<std::string> stock_symbols = {"AAPL", "TSLA"};
+        symbols = stock_symbols;
     }
 
     void connected_callback() {
@@ -613,20 +614,20 @@ int main(int argc, char* argv[]) {
     //config.lang = U("en_US");
 
     //Create a push client instance
-    auto push_client = IPushClient::create_push_client(config);
-    TestPushClient::test_push_client(push_client, config);
+    //auto push_client = IPushClient::create_push_client(config);
+    //TestPushClient::test_push_client(push_client, config);
 
     /**
      *  QuoteClient
      */
-//     std::shared_ptr<QuoteClient> quote_client = std::make_shared<QuoteClient>(config);
-//     TestQuoteClient::test_quote(quote_client);
+     std::shared_ptr<QuoteClient> quote_client = std::make_shared<QuoteClient>(config);
+     TestQuoteClient::test_quote(quote_client);
 
     /**
      * TradeClient
      */
-    //std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
-    //TestTradeClient::test_trade(trade_client);
+//    std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
+//    TestTradeClient::test_trade(trade_client);
 
     /**
     *  TigerApi

demo/openapi_cpp_test/openapi_cpp_test.vcxproj

@@ -193,12 +193,12 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcpkg\installed\x64-windows\include;..\..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\..\\output\Windows\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\vcpkg\installed\x64-windows\lib;..\..\\output\Windows\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
       <AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10d.lib;libprotobufd.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

include/tigerapi/client_config.h

@@ -60,6 +60,8 @@ namespace TIGER_API {
 
         const utility::string_t& get_socket_port();
 
+        bool is_us();
+
     private:
         bool sandbox_debug = false;
         utility::string_t server_url = TIGER_SERVER_URL;

include/tigerapi/constants.h

@@ -73,15 +73,22 @@ static utility::string_t SANDBOX_TIGER_PUBLIC_KEY = U("MIGfMA0GCSqGSIb3DQEBAQUAA
                            "MidihTvHHf+tJ0PYD0o3PruI0hl3qhEjHTAxb75T5YD3SGK4IBhHn/Rk6mhqlGgI+bBrBVYaXixm"
                            "HfRo75RpUUuWACyeqQkZckgR0McxuW9xRMIa2cXZOoL1E4SL4lXKGhKoWbwIDAQAB");
 
+static utility::string_t TIGER_HOST = U("openapi.tigerfintech.com");
+static utility::string_t SANDBOX_TIGER_HOST = U("openapi-sandbox.tigerfintech.com");
+static utility::string_t US_TIGER_HOST = U("openapi.tradeup.com");
+
 /** HTTP interface service address **/
-static utility::string_t TIGER_SERVER_URL = U("https://openapi.tigerfintech.com/gateway");
-static utility::string_t SANDBOX_TIGER_SERVER_URL = U("https://openapi-sandbox.tigerfintech.com/gateway");
+static utility::string_t TIGER_SERVER_URL = U("https://") + TIGER_HOST + U("/gateway");
+static utility::string_t SANDBOX_TIGER_SERVER_URL = U("https://") + SANDBOX_TIGER_HOST + U("/gateway");
+static utility::string_t US_TIGER_SERVER_URL = U("https://") + US_TIGER_HOST + U("/gateway");
 
 /** Push service address **/ 
-static utility::string_t TIGER_SOCKET_HOST = U("openapi.tigerfintech.com");
-static utility::string_t SANDBOX_TIGER_SOCKET_HOST = U("openapi-sandbox.tigerfintech.com");
+static utility::string_t TIGER_SOCKET_HOST = TIGER_HOST;
+static utility::string_t SANDBOX_TIGER_SOCKET_HOST = SANDBOX_TIGER_HOST;
+static utility::string_t US_TIGER_SOCKET_HOST = US_TIGER_HOST;
 static utility::string_t TIGER_SOCKET_PORT = U("9883");
 static utility::string_t SANDBOX_TIGER_SOCKET_PORT = U("9885");
+static utility::string_t US_TIGER_SOCKET_PORT = U("9983");
 
 #define DEFAULT_TOKEN_FILE U("tiger_openapi_token.properties")
 #define DEFAULT_PROPS_FILE U("tiger_openapi_config.properties")

include/tigerapi/enums.h

@@ -41,6 +41,30 @@ namespace TIGER_API {
         }
     }
 
+    enum class License {
+        TBNZ,
+        TBSG,
+        TBHK,
+        TBAU,
+        TBUS
+    };
+
+    inline utility::string_t enum_to_str(License license) {
+        switch (license) {
+            case License::TBNZ:
+                return U("TBNZ");
+            case License::TBSG:
+                return U("TBSG");
+            case License::TBHK:
+                return U("TBHK");
+            case License::TBAU:
+                return U("TBAU");
+            case License::TBUS:
+                return U("TBUS");
+            default:
+                return U("");
+        }
+    }
 
     enum class TradingSession {
         PreMarket,  // PreMarket

include/tigerapi/version.h

@@ -5,6 +5,6 @@
 #ifndef TIGERAPI_VERSION_H
 #define TIGERAPI_VERSION_H
 
-#define PROJECT_VERSION "1.0.4"
+#define PROJECT_VERSION "1.1.0"
 
 #endif //TIGERAPI_VERSION_H