mod cmakelist

Author: tigersk

.gitignore

@@ -79,4 +79,6 @@ output/Mac/Release/*.dylib
 output/Mac/Release/*.a
 
 output/Linux/Debug/
-output/Linux/Release/
+output/Linux/Release/
+
+*.properties

CMakeLists.txt

@@ -22,8 +22,10 @@ if(UNIX) # Darwing or Linux
     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)
+    # find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
+    set(CPPREST_INCLUDE_DIR "/usr/local/opt/cpprest/include")
+    set(CPPREST_LIBRARY "/usr/local/opt/cpprest/lib/libcpprest.dylib")
+    # find_library(CPPREST_LIBRARY NAMES cpprest)
     message(CPPREST_INCLUDE_DIR " ${CPPREST_INCLUDE_DIR}")
     message(CPPREST_LIBRARY " ${CPPREST_LIBRARY}")
 

README.md

@@ -43,14 +43,15 @@ cd cpprestsdk
 git submodule update --init
 mkdir build
 cd build
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug-DBOOST_ROOT=/usr/local/ boost_1_81_0  ..
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug-DBOOST_ROOT=/usr/local/boost_1_81_0 -DCMAKE_INSTALL_PREFIX=/usr/local/opt/cpprest ..
 make -j 8
 make install
 ```
-如果找不到openssl或boost 或其他错误，可尝试指定路径，关闭某些模块：
+如果找不到openssl或boost 或其他错误，可尝试指定路径，关闭某些模块 (如果有报错最好删除build目录重新创建)：
 ```
 cmake .. \
   -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_INSTALL_PREFIX=/usr/local/opt/cpprest \
   -DBUILD_SHARED_LIBS=ON \
   -DBUILD_SAMPLES=OFF \
   -DBUILD_TESTS=OFF \
@@ -75,7 +76,7 @@ cd protobuf
 git checkout v3.1.0
 mkdir cmake_build
 cd cmake_build
-cmake ../cmake \
+cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr/local/opt/protobuf \
     -Dprotobuf_BUILD_TESTS=OFF \
@@ -97,7 +98,7 @@ make install
 3. 编译
 ```
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug \
-    -DBOOST_ROOT=/usr/local/boost_1_81_0 ..
+    -DBOOST_ROOT=/usr/local/boost_1_81_0  ..
 make -j 6
 make install
 ```
@@ -109,6 +110,15 @@ make install
 
 ### 验证测试
 编译运行demo项目
+```
+cd demo
+mkdir build
+cd build
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug \
+    -DBOOST_ROOT=/usr/local/boost_1_81_0  ..
+make -j 8
+./openapi_cpp_test
+```
 
 
 

demo/CMakeLists.txt

@@ -6,13 +6,15 @@ project(openapi_cpp_test)
 
 # Configure required libraries ...
 if(UNIX) # Darwing or Linux
-
+    
     find_package(Boost REQUIRED COMPONENTS system thread log program_options chrono)
     find_package(Threads REQUIRED)
 
     # cpprest
-    find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
-    find_library(CPPREST_LIBRARY NAMES cpprest)
+    # find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
+    # find_library(CPPREST_LIBRARY NAMES cpprest)
+    set(CPPREST_INCLUDE_DIR "/usr/local/opt/cpprest/include")
+    set(CPPREST_LIBRARY "/usr/local/opt/cpprest/lib/libcpprest.dylib")
     message(CPPREST_INCLUDE_DIR " ${CPPREST_INCLUDE_DIR}")
     message(CPPREST_LIBRARY " ${CPPREST_LIBRARY}")
 

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -583,23 +583,23 @@ int main()
 {
     //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("");
+    ClientConfig config = ClientConfig(false, U("../openapi_cpp_test/"));
+	// config.private_key = U("");
+	// config.tiger_id = U("");
+	// config.account = U("");
 	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);
+    // 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

include/tigerapi/client_config.h

@@ -19,32 +19,41 @@ using namespace std;
 namespace TIGER_API {
     class OPENAPI_EXPORT ClientConfig {
     public:
-        ClientConfig(bool sandbox_debug = false) : sandbox_debug(sandbox_debug) {
+        explicit ClientConfig(bool sandbox_debug = false) : 
+            sandbox_debug(sandbox_debug) {
             if (sandbox_debug) {
                 LOG(WARNING) << U("SANDBOX IS NOT SUPPORTED") << endl;
                 // server_url = SANDBOX_TIGER_SERVER_URL;
                 // server_public_key = SANDBOX_TIGER_PUBLIC_KEY;
             }
         };
 
-        ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t account) : tiger_id(std::move(tiger_id)),
-                                                                                                 private_key(std::move(
-                                                                                                         private_key)),
-                                                                                                 account(std::move(account)) {};
+        // ClientConfig() : sandbox_debug(false) {};
+
+        ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t account) :
+            tiger_id(std::move(tiger_id)),
+            private_key(std::move(private_key)),
+            account(std::move(account)) {};
 
         ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t account,
-                     bool sandbox_debug = false, utility::string_t lang = U("en_US")) :
-                tiger_id(std::move(tiger_id)), private_key(std::move(private_key)),
-                account(std::move(account)), sandbox_debug(sandbox_debug), lang(lang) {
+            bool sandbox_debug = false, utility::string_t lang = U("en_US")) :
+            tiger_id(std::move(tiger_id)),
+            private_key(std::move(private_key)),
+            account(std::move(account)),
+            sandbox_debug(sandbox_debug),
+            lang(lang) {
             if (sandbox_debug) {
-                server_url = SANDBOX_TIGER_SERVER_URL;
-                server_public_key = SANDBOX_TIGER_PUBLIC_KEY;
-                socket_url = SANDBOX_TIGER_SOCKET_HOST;
-                socket_port = SANDBOX_TIGER_SOCKET_PORT;
+                LOG(WARNING) << U("SANDBOX IS NOT SUPPORTED") << endl;
+                // server_url = SANDBOX_TIGER_SERVER_URL;
+                // server_public_key = SANDBOX_TIGER_PUBLIC_KEY;
+                // socket_url = SANDBOX_TIGER_SOCKET_HOST;
+                // socket_port = SANDBOX_TIGER_SOCKET_PORT;
             }
         };
 
-        ClientConfig(utility::string_t props_path) : props_path(props_path) {
+        explicit ClientConfig(bool sandbox_debug, const utility::string_t props_path) : 
+            sandbox_debug(sandbox_debug),
+            props_path(props_path) {
             load_props();
         };
 
@@ -124,6 +133,7 @@ namespace TIGER_API {
             if (full_path.empty()) {
                 return;
             }
+            LOG(INFO) << U("Loading properties file from: ") << full_path << endl;
 
             try {
                 std::ifstream file(Utils::str16to8(full_path));
@@ -135,13 +145,12 @@ namespace TIGER_API {
                 Properties props;
                 props.load(file);
 
-                // 只在值为空时从配置文件加载
                 if (tiger_id.empty()) {
                     tiger_id = props.get_property(U("tiger_id"));
                 }
                 if (private_key.empty()) {
                     private_key = props.get_property(U("private_key_pk1"));
-                }
+                } 
                 if (account.empty()) {
                     account = props.get_property(U("account"));
                 }
@@ -162,6 +171,7 @@ namespace TIGER_API {
             } catch (const std::exception& e) {
                 LOG(ERROR) << U("Failed to load properties file: ") << Utils::str8to16(e.what()) << endl;
             }
+            LOG(INFO) << U("Loaded properties file successfully, tiger_id: ") << tiger_id << " account: " << account << endl;
         }
 
         utility::string_t get_props_path(const utility::string_t& filename) const {
@@ -173,7 +183,6 @@ namespace TIGER_API {
                     return Utils::path_join(dirname, filename);
                 }
             }
-            return utility::string_t();
         }
 
         utility::string_t get_token_path() const {
@@ -193,7 +202,7 @@ namespace TIGER_API {
                     Properties props;
                     props.load(file);
 
-                    // 获取token值
+                    // get token value
                     token = props.get_property(U("token"));
 
                 } catch (const std::exception& e) {

include/tigerapi/properties.h

@@ -11,14 +11,22 @@ namespace TIGER_API {
     class Properties {
     public:
         void load(std::ifstream& input) {
+            // skip BOM
+            char bom[3];
+            input.read(bom, 3);
+            if (!(bom[0] == (char)0xEF && bom[1] == (char)0xBB && bom[2] == (char)0xBF)) {
+                // if not BOM, reset file pointer to start
+                input.seekg(0);
+            }
+
             std::string line;
             while (std::getline(input, line)) {
-                // 跳过空行和注释行
+                // skip empty line and comment line
                 if (line.empty() || line[0] == '#' || line[0] == '!') {
                     continue;
                 }
 
-                // 查找第一个非转义的等号或冒号
+                // find the first non-escaped equal or colon
                 size_t pos = 0;
                 while ((pos = line.find_first_of("=:", pos)) != std::string::npos) {
                     if (pos == 0 || line[pos - 1] != '\\') {
@@ -31,10 +39,10 @@ namespace TIGER_API {
                     std::string key = trim(line.substr(0, pos));
                     std::string value = trim(line.substr(pos + 1));
 
-                    // 处理转义字符
+                    // handle escape character
                     value = unescape(value);
 
-                    // 存储为 utility::string_t
+                    // store as utility::string_t
                     properties[utility::conversions::to_string_t(key)] = 
                         utility::conversions::to_string_t(value);
                 }
@@ -54,17 +62,17 @@ namespace TIGER_API {
         }
 
         void store(std::ofstream& output) const {
-            // 写入文件头注释
+            // write file header comment
             output << "# Properties" << std::endl;
             output << "# " << get_current_datetime() << std::endl;
             output << std::endl;
 
-            // 写入所有属性
+            // write all properties
             for (const auto& pair : properties) {
                 std::string key = utility::conversions::to_utf8string(pair.first);
                 std::string value = utility::conversions::to_utf8string(pair.second);
 
-                // 转义特殊字符
+                // escape special characters
                 key = escape(key);
                 value = escape(value);