modify config check

Author: tigersk

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -299,7 +299,7 @@ class TestQuoteClient {
     }
 
     static void test_quote(const std::shared_ptr<QuoteClient> quote_client) {
-        TestQuoteClient::test_get_timeline(quote_client);
+        TestQuoteClient::test_get_quote_delay(quote_client);
     }
 };
 
@@ -334,30 +334,29 @@ int main()
     /************************** set config **********************/
     ClientConfig config = ClientConfig(true);
 
-    config.private_key = U("MIICXQIBAAKBgQC1amZa5YsGTklry7DAsUBOwXJCgrsZZtB21PImw/yLmrbqRfsS3vawvMigLWcCwIDnHa+hpdpeze0eHIwbZzJzUDGvRALYK9t3D8pwPVxpwX1OF8RfHCM7YQvSOvPPnHHuVQvKaR7NNm1/WmvGXC9kVJdkYQ7kCmh52siFoy1MLQIDAQABAoGAVabcmIHTt7ByncBXvUJymDxhE+HhMEcImXJEueTCca8kOUu9FNXMJvmax3VoMzZsJbIwX+OMTEJxd0wHIlEA0gECjDwFK4Q42q+ptO4QABJQVSC6I+dOt2OIY28uvT3rkenOO8KRIDt4F52PFd71ZdB1aaXixORORq1MdSLi8EkCQQDiviAB+L5R/HVxwxvqZfJ530OtFd5IipZC9YZlY1CtXWCmu89LK7UUlEuNXyGsOxyz5jLqFuNRsie5AC23tfEPAkEAzNMCa8axJWfPZIH4tGrbZ1F3I41BQdgp2zBmR7AyUMBDkli86OzmJ7QUCJA/PJxK43/IYUWm4OU5Q+SvXCr3AwJBAJTBj1Y7zwES1CpSitn5EF+MbmX71t1YrsQ3OHkD80YJ4QMCbDkw75gUwox5QSoxjd8ow3Z4laJfc1gYGeZQ41kCQQCCiQwm8cceBq3W6To+iUdw7itWngRz2Ta7uXnFwFYgvpeR4jnq3GfF7+9AkeWrVBQqLtrem0xCUfQP/+N+gudPAkBFLbt78/MpQGEDc7jyu/KE5Mp4wMMDQQwch9VLvsAZwWLysB6rZWpo3jIfp9zZ7c3zOYGNMWAZjtMmNkRJ8COH");
-    config.tiger_id = U("2");
-    config.account = U("402901");
+    config.private_key = U("");
+    config.tiger_id = U("");
+    config.account = U("");
 //    config.lang = U("en_US");
 
 
     /**
      * ʹ�÷�װ�������ӿ� QuoteClient
      */
     std::shared_ptr<QuoteClient> quote_client = std::make_shared<QuoteClient>(config);
-    //    quote_client->grab_quote_permission();
     TestQuoteClient::test_quote(quote_client);
 
     /**
      * ʹ�÷�װ��Ľ��׽ӿ� 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);
 
 
 

include/tigerapi/client_config.h

@@ -47,6 +47,24 @@ namespace TIGER_API {
         utility::string_t lang;
         utility::string_t device_id = Utils::get_device_id();
 
+        void check() {
+            if (this->tiger_id.empty()) {
+                LOG(ERROR) << U("Client Config error: tiger_id can't be empty") << endl;
+                exit(0);
+            }
+            if (this->private_key.empty()) {
+                LOG(ERROR) << U("Client Config error: private_key can't be empty") << endl;
+                exit(0);
+            }
+        }
+
+        void check_account() {
+            if (this->account.empty()) {
+                LOG(ERROR) << U("Client Config error: account can't be empty") << endl;
+                exit(0);
+            }
+        }
+
         void set_server_url(const utility::string_t &url) {
             this->server_url = url;
         }

include/tigerapi/tiger_client.h

@@ -20,7 +20,7 @@ namespace TIGER_API {
     public:
         TigerClient() {};
         TigerClient(const ClientConfig &cf) {
-            client_config = cf;
+            set_config(cf);
         }
         ~TigerClient() {};
 

src/order_util.cpp

@@ -6,38 +6,38 @@
 namespace TIGER_API {
 
     Order
-    market_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity) {
+    OrderUtil::market_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity) {
         // 市价单
         return Order(U("MKT"), account, contract, action, quantity);
     }
 
     Order
-    limit_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
+    OrderUtil::limit_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
                 double limit_price) {
         // 限价单
         return Order(U("LMT"), account, contract, action, quantity, limit_price);
     }
 
-    Order limit_order(Contract &contract, const utility::string_t action, long quantity, double limit_price) {
+    Order OrderUtil::limit_order(Contract &contract, const utility::string_t action, long quantity, double limit_price) {
         // 限价单
         return Order(U("LMT"), U(""), contract, action, quantity, limit_price);
     }
 
-    Order stop_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
+    Order OrderUtil::stop_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
                      double aux_price) {
         // 止损单
         return Order(U("STP"), account, contract, action, quantity, 0, aux_price);
     }
 
     Order
-    stop_limit_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
+    OrderUtil::stop_limit_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
                      double limit_price, double aux_price) {
         // 限价止损单
         return Order(U("STP_LMT"), account, contract, action, quantity, limit_price, aux_price);
     }
 
     Order
-    trail_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
+    OrderUtil::trail_order(const utility::string_t account, Contract &contract, const utility::string_t action, long quantity,
                 double aux_price, double trailing_percent) {
         // 移动止损单
         return Order(U("TRAIL"), account, contract, action, quantity, 0, aux_price, trailing_percent);

src/tiger_client.cpp

@@ -7,6 +7,7 @@ namespace TIGER_API {
 
     void TigerClient::set_config(const ClientConfig &cf) {
         client_config = cf;
+        client_config.check();
     }
 
     utility::string_t TigerClient::build_sign_content(const value &obj) {

src/trade_client.cpp

@@ -7,8 +7,9 @@
 namespace TIGER_API {
     TradeClient::TradeClient() {}
 
-//    TradeClient::TradeClient(Config &cf) : TigerClient(cf) {}
-    TradeClient::TradeClient(const ClientConfig &cf) : TigerClient(cf) {}
+    TradeClient::TradeClient(const ClientConfig &cf) : TigerClient(cf) {
+        this->client_config.check_account();
+    }
 
     value TradeClient::get_prime_asset(const utility::string_t &account, const utility::string_t &base_currency) {
         value obj = value::object(true);