Merge branch 'dev_token_chengxin' into 'feat_token'

【FIX】解决easylog实例引起的编译问题

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

Author: tigersk

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -10,9 +10,9 @@
 #include "tigerapi/utils.h"
 #include "cpprest/details/basic_types.h"
 #include "tigerapi/price_util.h"
-#include "tigerapi/easylogging++.h"
 #include <chrono>
 #include <thread>
+#include "tigerapi/logger.h"
 
 using namespace std;
 using namespace web;
@@ -595,25 +595,13 @@ class TestPushClient {
 };
 
 int main(int argc, char* argv[]) {
-
-    // log settings
-    el::Configurations defaultConf;
-    defaultConf.setToDefault();
-
-    defaultConf.set(el::Level::Global, el::ConfigurationType::Enabled, "true");
-    defaultConf.set(el::Level::Debug, el::ConfigurationType::Enabled, "true");
-    defaultConf.set(el::Level::Info, el::ConfigurationType::Enabled, "true");
-    defaultConf.set(el::Level::Warning, el::ConfigurationType::Enabled, "true");
-    defaultConf.set(el::Level::Error, el::ConfigurationType::Enabled, "true");
-
-    el::Loggers::reconfigureLogger("default", defaultConf);
-    
+    LoggerConfig::set_log_level(el::Level::Debug);
     //Set Tiger OpenAPI SDK configuration
     bool sand_box = false;
-//    ClientConfig config = ClientConfig(false, U("../openapi_cpp_test/"));
-//    config.set_server_url(U("http://127.0.0.1:8085/gateway"));
-//    config.set_server_public_key(SANDBOX_TIGER_PUBLIC_KEY);
-    ClientConfig config = ClientConfig(false);
+    ClientConfig config = ClientConfig(false, U("D:/test package/"));
+    //config.set_server_url(U("http://127.0.0.1:8085/gateway"));
+    //config.set_server_public_key(SANDBOX_TIGER_PUBLIC_KEY);
+    //ClientConfig config = ClientConfig(false);
 
 	// config.private_key = U("");
 	// config.tiger_id = U("");

include/tigerapi/client_config.h

@@ -8,55 +8,20 @@
 #include <string>
 #include <utility>
 #include "constants.h"
-#include "easylogging++.h"
+#include "logger.h"
 #include "utils.h"
 #include "win32.h"
-#include <fstream>
-#include "properties.h"
 
 using namespace std;
 
 namespace TIGER_API {
     class OPENAPI_EXPORT ClientConfig {
     public:
-        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() : 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(bool sandbox_debug = false);
+        ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t 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) {
-            if (sandbox_debug) {
-                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;
-            }
-        };
-
-        explicit ClientConfig(bool sandbox_debug, const utility::string_t props_path) :
-                sandbox_debug(sandbox_debug),
-                props_path(props_path) {
-            load_props();
-            load_token();
-        };
+            bool sandbox_debug = false, utility::string_t lang = U("en_US"));
+        ClientConfig(bool sandbox_debug, const utility::string_t props_path);
 
         utility::string_t tiger_id;
         utility::string_t private_key;
@@ -74,60 +39,26 @@ namespace TIGER_API {
         utility::string_t token;
         utility::string_t props_path;
 
-        void check() {
-            if (this->tiger_id.empty()) {
-                LOG(ERROR) << U("Client Config error: tiger_id can't be empty") << endl;
-                throw std::runtime_error("Client Config error: tiger_id can't be empty");
-            }
-            if (this->private_key.empty()) {
-                LOG(ERROR) << U("Client Config error: private_key can't be empty") << endl;
-                throw std::runtime_error("Client Config error: private_key can't be empty");
-            }
-        }
-
-        void check_account() {
-            if (this->account.empty()) {
-                LOG(ERROR) << U("Client Config error: account can't be empty") << endl;
-                throw std::runtime_error("Client Config error: account can't be empty");
-            }
-        }
-
-        void set_server_url(const utility::string_t &url) {
-            this->server_url = url;
-        }
-
-        void set_socket_url(const utility::string_t &url) {
-            this->socket_url = url;
-        }
-
-        void set_socket_port(const utility::string_t &port) {
-            this->socket_port = port;
-        }
-
-        void set_server_public_key(const utility::string_t &key) {
-            this->server_public_key = key;
-        }
-
-        void set_token(const utility::string_t &token) {
-            this->token = token;
-        }
-
-        const utility::string_t &get_server_url() {
-            return this->server_url;
-        }
-
-        const utility::string_t &get_server_pub_key() {
-            return this->server_public_key;
-        }
-
-        const utility::string_t &get_socket_url() {
-            return this->socket_url;
-        }
-
-        const utility::string_t &get_socket_port() {
-            return this->socket_port;
-        }
+        void check();
+        void check_account();
+
+        void set_server_url(const utility::string_t& url);
+
+        void set_socket_url(const utility::string_t& url);
+
+        void set_socket_port(const utility::string_t& port);
+
+        void set_server_public_key(const utility::string_t& key);
+
+        void set_token(const utility::string_t& token);
+
+        const utility::string_t& get_server_url();
 
+        const utility::string_t& get_server_pub_key();
+
+        const utility::string_t& get_socket_url();
+
+        const utility::string_t& get_socket_port();
 
     private:
         bool sandbox_debug = false;
@@ -136,113 +67,15 @@ namespace TIGER_API {
         utility::string_t socket_url = TIGER_SOCKET_HOST;
         utility::string_t socket_port = TIGER_SOCKET_PORT;
 
-        void load_props() {
-            utility::string_t full_path = get_props_path(DEFAULT_PROPS_FILE);
-            if (full_path.empty()) {
-                return;
-            }
-            LOG(INFO) << U("Loading properties file from: ") << full_path << endl;
-
-            try {
-                std::ifstream file(Utils::str16to8(full_path));
-                if (!file.is_open()) {
-                    LOG(ERROR) << U("Failed to open properties file: ") << full_path << endl;
-                    return;
-                }
-
-                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"));
-                }
-                if (license.empty()) {
-                    license = props.get_property(U("license"));
-                }
-
-                utility::string_t env = props.get_property(U("env"));
-                std::transform(env.begin(), env.end(), env.begin(), ::toupper);
-                if (env == U("SANDBOX")) {
-                    sandbox_debug = true;
-                    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;
-                }
-
-            } 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 {
-            if (!props_path.empty()) 
-            {
-                if (Utils::is_directory(props_path)) {
-                    return props_path + filename;
-                }  
-            }
-            return U("");
-        }
-
-        utility::string_t get_token_path() const {
-            return get_props_path(DEFAULT_TOKEN_FILE);
-        }
-
-        void load_token() {
-            utility::string_t full_path = get_token_path();
-            if (full_path.empty()) {
-                return;
-            }
-            try {
-                std::ifstream file(Utils::str16to8(full_path));
-                if (!file.is_open()) {
-                    LOG(ERROR) << U("Failed to open token file: ") << full_path << endl;
-                    return;
-                }
-
-                Properties props;
-                props.load(file);
-
-                // get token value
-                token = props.get_property(U("token"));
-                LOG(INFO) << U("Loaded token successfully, token: ") << token << endl;
-            } catch (const std::exception &e) {
-                LOG(ERROR) << U("Failed to load token file: ") << Utils::str8to16(e.what()) << endl;
-            }
-        }
-
-        void save_token(const utility::string_t &new_token) {
-            utility::string_t full_path = get_token_path();
-            if (full_path.empty()) {
-                return;
-            }
-            try {
-                Properties props;
-                    props.set_property(U("token"), new_token);
-
-                    std::ofstream file(Utils::str16to8(full_path));
-                    if (!file.is_open()) {
-                        LOG(ERROR) << U("Failed to open token file for writing: ") << full_path << endl;
-                        return;
-                    }
-
-                props.store(file);
-                token = new_token;
-                LOG(INFO) << U("Saved token successfully, token: ") << token << endl;
-            } catch (const std::exception &e) {
-                LOG(ERROR) << U("Failed to save token file: ") << Utils::str8to16(e.what()) << endl;
-            }
-        }
+        void load_props();
+
+        utility::string_t get_props_path(const utility::string_t& filename) const;
+
+        utility::string_t get_token_path() const;
+
+        void load_token();
+
+        void save_token(const utility::string_t& new_token);
     };
 }
-
 #endif //TIGERAPI_CLIENT_CONFIG_H

include/tigerapi/logger.h

@@ -0,0 +1,17 @@
+#ifndef LOGGER_H
+#define LOGGER_H
+#include "easylogging++.h"
+#include "win32.h"
+
+namespace TIGER_API
+{
+	class OPENAPI_EXPORT LoggerConfig
+	{
+	public:
+		LoggerConfig() {};
+		~LoggerConfig() {};
+
+		static void set_log_level(el::Level level);
+	};
+}
+#endif

include/tigerapi/properties.h

@@ -5,6 +5,7 @@
 #include <map>
 #include <fstream>
 #include <sstream>
+#include <ctime>
 #include "utils.h"
 
 namespace TIGER_API {
@@ -43,8 +44,9 @@ namespace TIGER_API {
                     value = unescape(value);
 
                     // store as utility::string_t
-                    properties[utility::conversions::to_string_t(key)] = 
-                        utility::conversions::to_string_t(value);
+                    utility::string_t key_t = utility::conversions::to_string_t(key);
+                    utility::string_t value_t = utility::conversions::to_string_t(value);
+                    properties[key_t] = value_t;
                 }
             }
         }

openapi-cpp-sdk.vcxproj

@@ -533,6 +533,7 @@
     <ClInclude Include="include\tigerapi\contract_util.h" />
     <ClInclude Include="include\tigerapi\easylogging++.h" />
     <ClInclude Include="include\tigerapi\enums.h" />
+    <ClInclude Include="include\tigerapi\logger.h" />
     <ClInclude Include="include\tigerapi\model.h" />
     <ClInclude Include="include\tigerapi\order_util.h" />
     <ClInclude Include="include\tigerapi\push_client.h" />
@@ -569,8 +570,10 @@
     <ClCompile Include="include\openapi_pb\pb_source\TickData.pb.cc" />
     <ClCompile Include="include\openapi_pb\pb_source\TradeTickData.pb.cc" />
     <ClCompile Include="include\openssl\applink.c" />
+    <ClCompile Include="src\client_config.cpp" />
     <ClCompile Include="src\contract_util.cpp" />
     <ClCompile Include="src\easylogging++.cpp" />
+    <ClCompile Include="src\logger.cpp" />
     <ClCompile Include="src\order_util.cpp" />
     <ClCompile Include="src\push_socket\push_client_impl.cpp" />
     <ClCompile Include="src\push_socket\push_frame_serialize.cpp" />

openapi-cpp-sdk.vcxproj.filters

@@ -678,6 +678,9 @@
     <ClInclude Include="include\tigerapi\push_socket\push_client_impl.h">
       <Filter>include\tigerapi\push_socket</Filter>
     </ClInclude>
+    <ClInclude Include="include\tigerapi\logger.h">
+      <Filter>include\tigerapi</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\contract_util.cpp">
@@ -767,6 +770,12 @@
     <ClCompile Include="src\easylogging++.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\logger.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\client_config.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="include\cpprest\details\http_constants.dat">