Skip to content

Commit d6e92f8

Browse files
author
Cheng Xin
committed
Merge branch 'dev_tcp_client_chengxin' into 'feature_tcp_client'
【FIX】demo wins工程需要依赖pb实现文件 See merge request server/openapi/openapi-cpp-sdk!32
2 parents e16db2b + 364ec0e commit d6e92f8

File tree

5 files changed

+169
-33
lines changed

5 files changed

+169
-33
lines changed

‎demo/openapi_cpp_test/openapi_cpp_test.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,9 @@ class TestPushClient {
467467

468468
void connected_callback() {
469469
ucout << "Connected to push server" << std::endl;
470-
push_client->subscribe_position(push_client->get_client_config().account);
471-
push_client->subscribe_order(push_client->get_client_config().account);
472-
push_client->subscribe_asset(push_client->get_client_config().account);
470+
push_client->subscribe_position(utility::conversions::to_utf8string(push_client->get_client_config().account));
471+
push_client->subscribe_order(utility::conversions::to_utf8string(push_client->get_client_config().account));
472+
push_client->subscribe_asset(utility::conversions::to_utf8string(push_client->get_client_config().account));
473473
// push_client->query_subscribed_symbols();
474474
push_client->subscribe_quote(symbols);
475475
// push_client->subscribe_kline(symbols);
@@ -479,7 +479,7 @@ class TestPushClient {
479479

480480
void position_changed_callback(const tigeropen::push::pb::PositionData& data) {
481481
ucout << "Position changed:" << std::endl;
482-
ucout << "- symbol: " << data.symbol() << std::endl;
482+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
483483
ucout << "- positionqty: " << data.positionqty() << std::endl;
484484
}
485485

@@ -489,7 +489,7 @@ class TestPushClient {
489489
// "status":"PendingSubmit","replaceStatus":"NONE","cancelStatus":"NONE","outsideRth":true,"canModify":true,"canCancel":true,"name":"PDD Holdings","source":"openapi","openTime":"1732177851000","timestamp":"1732177851874"}}
490490
ucout << "Order changed:" << std::endl;
491491
ucout << "- id: " << data.id() << std::endl;
492-
ucout << "- status: " << data.status() << std::endl;
492+
ucout << "- status: " << utility::conversions::to_string_t(data.status()) << std::endl;
493493
ucout << "- avgfillprice: " << data.avgfillprice() << std::endl;
494494
}
495495

@@ -504,44 +504,44 @@ class TestPushClient {
504504

505505
void tick_changed_callback(const TradeTick& data) {
506506
ucout << "TradeTick changed: " << std::endl;
507-
ucout << "- data: " << data.to_string() << std::endl;
507+
ucout << "- data: " << utility::conversions::to_string_t(data.to_string()) << std::endl;
508508
}
509509

510510
void full_tick_changed_callback(const tigeropen::push::pb::TickData& data) {
511511
ucout << "Full TickData changed: " << std::endl;
512-
ucout << "- symbol: " << data.symbol() << std::endl;
512+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
513513
ucout << "- tick size: " << data.ticks_size() << std::endl;
514514
}
515515

516516
void query_subscribed_symbols_changed_callback(const tigeropen::push::pb::Response& data) {
517517
ucout << "QuerySubscribedSymbols changed: " << std::endl;
518-
ucout << "- data: " << data.msg() << std::endl;
518+
ucout << "- data: " << utility::conversions::to_string_t(data.msg()) << std::endl;
519519
}
520520

521521
void quote_changed_callback(const tigeropen::push::pb::QuoteBasicData& data) {
522522
ucout << "BasicQuote changed: " << std::endl;
523-
ucout << "- symbol: " << data.symbol() << std::endl;
523+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
524524
ucout << "- latestPrice: " << data.latestprice() << std::endl;
525525
ucout << "- volume: " << data.volume() << std::endl;
526526
}
527527

528528
void quote_bbo_changed_callback(const tigeropen::push::pb::QuoteBBOData& data) {
529529
ucout << "BBOQuote changed: " << std::endl;
530-
ucout << "- symbol: " << data.symbol() << std::endl;
530+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
531531
ucout << "- bidPrice: " << data.bidprice() << std::endl;
532532
ucout << "- askPrice: " << data.askprice() << std::endl;
533533
}
534534

535535
void quote_depth_changed_callback(const tigeropen::push::pb::QuoteDepthData& data) {
536536
ucout << "QuoteDepth changed: " << std::endl;
537-
ucout << "- symbol: " << data.symbol() << std::endl;
537+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
538538
ucout << "- ask price size: " << data.ask().price_size() << std::endl;
539539
ucout << "- bid price size: " << data.bid().price_size() << std::endl;
540540
}
541541

542542
void kline_changed_callback(const tigeropen::push::pb::KlineData& data) {
543543
ucout << "Kline changed: " << std::endl;
544-
ucout << "- symbol: " << data.symbol() << std::endl;
544+
ucout << "- symbol: " << utility::conversions::to_string_t(data.symbol()) << std::endl;
545545
ucout << "- open: " << data.open() << std::endl;
546546
ucout << "- high: " << data.high() << std::endl;
547547
ucout << "- low: " << data.low() << std::endl;
@@ -575,9 +575,9 @@ class TestPushClient {
575575
push_client->unsubscribe_kline(symbols);
576576
push_client->unsubscribe_quote_depth(symbols);
577577
push_client->unsubscribe_tick(symbols);
578-
push_client->unsubscribe_asset(config.account);
579-
push_client->unsubscribe_position(config.account);
580-
push_client->unsubscribe_order(config.account);
578+
push_client->unsubscribe_asset(utility::conversions::to_utf8string(config.account));
579+
push_client->unsubscribe_position(utility::conversions::to_utf8string(config.account));
580+
push_client->unsubscribe_order(utility::conversions::to_utf8string(config.account));
581581
push_client->disconnect();
582582
}
583583

‎demo/openapi_cpp_test/openapi_cpp_test.vcxproj‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,44 @@
151151
</Link>
152152
</ItemDefinitionGroup>
153153
<ItemGroup>
154+
<ClCompile Include="..\..\include\openapi_pb\pb_source\AssetData.pb.cc" />
155+
<ClCompile Include="..\..\include\openapi_pb\pb_source\KlineData.pb.cc" />
156+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OptionTopData.pb.cc" />
157+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OrderStatusData.pb.cc" />
158+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OrderTransactionData.pb.cc" />
159+
<ClCompile Include="..\..\include\openapi_pb\pb_source\PositionData.pb.cc" />
160+
<ClCompile Include="..\..\include\openapi_pb\pb_source\PushData.pb.cc" />
161+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteBasicData.pb.cc" />
162+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteBBOData.pb.cc" />
163+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteData.pb.cc" />
164+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteDepthData.pb.cc" />
165+
<ClCompile Include="..\..\include\openapi_pb\pb_source\Request.pb.cc" />
166+
<ClCompile Include="..\..\include\openapi_pb\pb_source\Response.pb.cc" />
167+
<ClCompile Include="..\..\include\openapi_pb\pb_source\SocketCommon.pb.cc" />
168+
<ClCompile Include="..\..\include\openapi_pb\pb_source\StockTopData.pb.cc" />
169+
<ClCompile Include="..\..\include\openapi_pb\pb_source\TickData.pb.cc" />
170+
<ClCompile Include="..\..\include\openapi_pb\pb_source\TradeTickData.pb.cc" />
154171
<ClCompile Include="openapi_cpp_test.cpp" />
155172
</ItemGroup>
173+
<ItemGroup>
174+
<ClInclude Include="..\..\include\openapi_pb\pb_source\AssetData.pb.h" />
175+
<ClInclude Include="..\..\include\openapi_pb\pb_source\KlineData.pb.h" />
176+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OptionTopData.pb.h" />
177+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OrderStatusData.pb.h" />
178+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OrderTransactionData.pb.h" />
179+
<ClInclude Include="..\..\include\openapi_pb\pb_source\PositionData.pb.h" />
180+
<ClInclude Include="..\..\include\openapi_pb\pb_source\PushData.pb.h" />
181+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteBasicData.pb.h" />
182+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteBBOData.pb.h" />
183+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteData.pb.h" />
184+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteDepthData.pb.h" />
185+
<ClInclude Include="..\..\include\openapi_pb\pb_source\Request.pb.h" />
186+
<ClInclude Include="..\..\include\openapi_pb\pb_source\Response.pb.h" />
187+
<ClInclude Include="..\..\include\openapi_pb\pb_source\SocketCommon.pb.h" />
188+
<ClInclude Include="..\..\include\openapi_pb\pb_source\StockTopData.pb.h" />
189+
<ClInclude Include="..\..\include\openapi_pb\pb_source\TickData.pb.h" />
190+
<ClInclude Include="..\..\include\openapi_pb\pb_source\TradeTickData.pb.h" />
191+
</ItemGroup>
156192
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
157193
<ImportGroup Label="ExtensionTargets">
158194
</ImportGroup>

‎demo/openapi_cpp_test/openapi_cpp_test.vcxproj.filters‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,123 @@
99
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1010
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1111
</Filter>
12+
<Filter Include="include">
13+
<UniqueIdentifier>{0d98cc4a-f3ec-42a3-a857-23c4af4f0ad1}</UniqueIdentifier>
14+
</Filter>
15+
<Filter Include="include\openapi_pb">
16+
<UniqueIdentifier>{22a3760a-fa84-4396-b345-3566bd36b555}</UniqueIdentifier>
17+
</Filter>
18+
<Filter Include="include\openapi_pb\pb_source">
19+
<UniqueIdentifier>{d8d77245-d133-4bb2-8cef-1f7d4d6c79dd}</UniqueIdentifier>
20+
</Filter>
1221
</ItemGroup>
1322
<ItemGroup>
1423
<ClCompile Include="openapi_cpp_test.cpp">
1524
<Filter>源文件</Filter>
1625
</ClCompile>
26+
<ClCompile Include="..\..\include\openapi_pb\pb_source\AssetData.pb.cc">
27+
<Filter>include\openapi_pb\pb_source</Filter>
28+
</ClCompile>
29+
<ClCompile Include="..\..\include\openapi_pb\pb_source\KlineData.pb.cc">
30+
<Filter>include\openapi_pb\pb_source</Filter>
31+
</ClCompile>
32+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OptionTopData.pb.cc">
33+
<Filter>include\openapi_pb\pb_source</Filter>
34+
</ClCompile>
35+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OrderStatusData.pb.cc">
36+
<Filter>include\openapi_pb\pb_source</Filter>
37+
</ClCompile>
38+
<ClCompile Include="..\..\include\openapi_pb\pb_source\OrderTransactionData.pb.cc">
39+
<Filter>include\openapi_pb\pb_source</Filter>
40+
</ClCompile>
41+
<ClCompile Include="..\..\include\openapi_pb\pb_source\PositionData.pb.cc">
42+
<Filter>include\openapi_pb\pb_source</Filter>
43+
</ClCompile>
44+
<ClCompile Include="..\..\include\openapi_pb\pb_source\PushData.pb.cc">
45+
<Filter>include\openapi_pb\pb_source</Filter>
46+
</ClCompile>
47+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteBasicData.pb.cc">
48+
<Filter>include\openapi_pb\pb_source</Filter>
49+
</ClCompile>
50+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteBBOData.pb.cc">
51+
<Filter>include\openapi_pb\pb_source</Filter>
52+
</ClCompile>
53+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteData.pb.cc">
54+
<Filter>include\openapi_pb\pb_source</Filter>
55+
</ClCompile>
56+
<ClCompile Include="..\..\include\openapi_pb\pb_source\QuoteDepthData.pb.cc">
57+
<Filter>include\openapi_pb\pb_source</Filter>
58+
</ClCompile>
59+
<ClCompile Include="..\..\include\openapi_pb\pb_source\Request.pb.cc">
60+
<Filter>include\openapi_pb\pb_source</Filter>
61+
</ClCompile>
62+
<ClCompile Include="..\..\include\openapi_pb\pb_source\Response.pb.cc">
63+
<Filter>include\openapi_pb\pb_source</Filter>
64+
</ClCompile>
65+
<ClCompile Include="..\..\include\openapi_pb\pb_source\SocketCommon.pb.cc">
66+
<Filter>include\openapi_pb\pb_source</Filter>
67+
</ClCompile>
68+
<ClCompile Include="..\..\include\openapi_pb\pb_source\StockTopData.pb.cc">
69+
<Filter>include\openapi_pb\pb_source</Filter>
70+
</ClCompile>
71+
<ClCompile Include="..\..\include\openapi_pb\pb_source\TickData.pb.cc">
72+
<Filter>include\openapi_pb\pb_source</Filter>
73+
</ClCompile>
74+
<ClCompile Include="..\..\include\openapi_pb\pb_source\TradeTickData.pb.cc">
75+
<Filter>include\openapi_pb\pb_source</Filter>
76+
</ClCompile>
77+
</ItemGroup>
78+
<ItemGroup>
79+
<ClInclude Include="..\..\include\openapi_pb\pb_source\AssetData.pb.h">
80+
<Filter>include\openapi_pb\pb_source</Filter>
81+
</ClInclude>
82+
<ClInclude Include="..\..\include\openapi_pb\pb_source\KlineData.pb.h">
83+
<Filter>include\openapi_pb\pb_source</Filter>
84+
</ClInclude>
85+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OptionTopData.pb.h">
86+
<Filter>include\openapi_pb\pb_source</Filter>
87+
</ClInclude>
88+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OrderStatusData.pb.h">
89+
<Filter>include\openapi_pb\pb_source</Filter>
90+
</ClInclude>
91+
<ClInclude Include="..\..\include\openapi_pb\pb_source\OrderTransactionData.pb.h">
92+
<Filter>include\openapi_pb\pb_source</Filter>
93+
</ClInclude>
94+
<ClInclude Include="..\..\include\openapi_pb\pb_source\PositionData.pb.h">
95+
<Filter>include\openapi_pb\pb_source</Filter>
96+
</ClInclude>
97+
<ClInclude Include="..\..\include\openapi_pb\pb_source\PushData.pb.h">
98+
<Filter>include\openapi_pb\pb_source</Filter>
99+
</ClInclude>
100+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteBasicData.pb.h">
101+
<Filter>include\openapi_pb\pb_source</Filter>
102+
</ClInclude>
103+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteBBOData.pb.h">
104+
<Filter>include\openapi_pb\pb_source</Filter>
105+
</ClInclude>
106+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteData.pb.h">
107+
<Filter>include\openapi_pb\pb_source</Filter>
108+
</ClInclude>
109+
<ClInclude Include="..\..\include\openapi_pb\pb_source\QuoteDepthData.pb.h">
110+
<Filter>include\openapi_pb\pb_source</Filter>
111+
</ClInclude>
112+
<ClInclude Include="..\..\include\openapi_pb\pb_source\Request.pb.h">
113+
<Filter>include\openapi_pb\pb_source</Filter>
114+
</ClInclude>
115+
<ClInclude Include="..\..\include\openapi_pb\pb_source\Response.pb.h">
116+
<Filter>include\openapi_pb\pb_source</Filter>
117+
</ClInclude>
118+
<ClInclude Include="..\..\include\openapi_pb\pb_source\SocketCommon.pb.h">
119+
<Filter>include\openapi_pb\pb_source</Filter>
120+
</ClInclude>
121+
<ClInclude Include="..\..\include\openapi_pb\pb_source\StockTopData.pb.h">
122+
<Filter>include\openapi_pb\pb_source</Filter>
123+
</ClInclude>
124+
<ClInclude Include="..\..\include\openapi_pb\pb_source\TickData.pb.h">
125+
<Filter>include\openapi_pb\pb_source</Filter>
126+
</ClInclude>
127+
<ClInclude Include="..\..\include\openapi_pb\pb_source\TradeTickData.pb.h">
128+
<Filter>include\openapi_pb\pb_source</Filter>
129+
</ClInclude>
17130
</ItemGroup>
18131
</Project>

‎include/tigerapi/push_client.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
#include <memory>
44
#include <functional>
55
#include "../include/tigerapi/win32.h"
6+
#include "../include/tigerapi/model.h"
7+
#include "../include/tigerapi/client_config.h"
8+
#include "../include/tigerapi/enums.h"
9+
#include "../include/openapi_pb/pb_source/Request.pb.h"
10+
#include "../include/openapi_pb/pb_source/Response.pb.h"
611
#include "../include/openapi_pb/pb_source/AssetData.pb.h"
712
#include "../include/openapi_pb/pb_source/PositionData.pb.h"
813
#include "../include/openapi_pb/pb_source/OrderStatusData.pb.h"
@@ -15,8 +20,6 @@
1520
#include "../include/openapi_pb/pb_source/OptionTopData.pb.h"
1621
#include "../include/openapi_pb/pb_source/QuoteDepthData.pb.h"
1722
#include "../include/openapi_pb/pb_source/Response.pb.h"
18-
#include "../include/tigerapi/model.h"
19-
2023

2124
namespace TIGER_API
2225
{

‎include/tigerapi/push_socket/push_client_impl.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,6 @@
44
#include "../model.h"
55
#include "boost/asio/io_service.hpp"
66
#include "../include/tigerapi/push_client.h"
7-
#include "../include/tigerapi/client_config.h"
8-
#include "../include/openapi_pb/pb_source/Request.pb.h"
9-
#include "../include/openapi_pb/pb_source/Response.pb.h"
10-
#include "../include/openapi_pb/pb_source/SocketCommon.pb.h"
11-
#include "../include/openapi_pb/pb_source/QuoteData.pb.h"
12-
#include "../include/openapi_pb/pb_source/QuoteBasicData.pb.h"
13-
#include "../include/openapi_pb/pb_source/QuoteBBOData.pb.h"
14-
#include "../include/openapi_pb/pb_source/QuoteDepthData.pb.h"
15-
#include "../include/openapi_pb/pb_source/AssetData.pb.h"
16-
#include "../include/openapi_pb/pb_source/PositionData.pb.h"
17-
#include "../include/openapi_pb/pb_source/OrderStatusData.pb.h"
18-
#include "../include/openapi_pb/pb_source/StockTopData.pb.h"
19-
#include "../include/openapi_pb/pb_source/OptionTopData.pb.h"
20-
#include "../include/openapi_pb/pb_source/KlineData.pb.h"
21-
#include "../include/openapi_pb/pb_source/TradeTickData.pb.h"
22-
#include "../include/tigerapi/enums.h"
237

248
namespace TIGER_API
259
{

0 commit comments

Comments
 (0)