Skip to content

Commit 5476010

Browse files
author
JiaWen Li
committed
Merge branch 'dev' into 'master'
Dev-master See merge request server/openapi/openapi-cpp-sdk!4
2 parents 95103bf + 645ea4b commit 5476010

File tree

8 files changed

+106
-70
lines changed

8 files changed

+106
-70
lines changed

‎demo/openapi_cpp_test/openapi_cpp_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,15 @@ class TestTigerApi {
328328
static void test_get_positions(std::shared_ptr<TigerClient> tigerapi) {
329329
value obj = value::object(true);
330330
obj[U("market")] = value::string(U("US"));
331-
obj[P_ACCOUNT] = value::string(U("402901"));
331+
obj[P_ACCOUNT] = value::string(U("1111"));
332332
tigerapi->post(POSITIONS, obj);
333333
}
334334
};
335335

336336
int main()
337337
{
338338
/************************** set config **********************/
339-
ClientConfig config = ClientConfig(true);
339+
ClientConfig config = ClientConfig();
340340

341341
config.private_key = U("");
342342
config.tiger_id = U("");

‎demo/openapi_cpp_test/openapi_cpp_test.vcxproj‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
9-
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
128
<ProjectConfiguration Include="Debug|x64">
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
1616
<ProjectConfiguration Include="Release|x64">
1717
<Configuration>Release</Configuration>
1818
<Platform>x64</Platform>
@@ -32,23 +32,23 @@
3232
<PlatformToolset>v140</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
35-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
37-
<UseDebugLibraries>false</UseDebugLibraries>
37+
<UseDebugLibraries>true</UseDebugLibraries>
3838
<PlatformToolset>v140</PlatformToolset>
39-
<WholeProgramOptimization>true</WholeProgramOptimization>
4039
<CharacterSet>Unicode</CharacterSet>
4140
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4342
<ConfigurationType>Application</ConfigurationType>
44-
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v143</PlatformToolset>
43+
<UseDebugLibraries>false</UseDebugLibraries>
44+
<PlatformToolset>v140</PlatformToolset>
45+
<WholeProgramOptimization>true</WholeProgramOptimization>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v143</PlatformToolset>
51+
<PlatformToolset>v140</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -60,22 +60,28 @@
6060
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6161
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6262
</ImportGroup>
63-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
63+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6464
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6565
</ImportGroup>
66-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6767
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6868
</ImportGroup>
69-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
69+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7070
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7171
</ImportGroup>
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<OutDir>$(SolutionDir)output\$(Configuration)\</OutDir>
7575
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
77+
<OutDir>$(SolutionDir)output\$(Platform)\$(Configuration)\</OutDir>
78+
</PropertyGroup>
7679
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7780
<OutDir>$(SolutionDir)output\$(Configuration)\</OutDir>
7881
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
83+
<OutDir>$(SolutionDir)output\$(Platform)\$(Configuration)\</OutDir>
84+
</PropertyGroup>
7985
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8086
<ClCompile>
8187
<WarningLevel>Level3</WarningLevel>
@@ -91,35 +97,38 @@
9197
<AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10d.lib</AdditionalDependencies>
9298
</Link>
9399
</ItemDefinitionGroup>
94-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
100+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
95101
<ClCompile>
96102
<WarningLevel>Level3</WarningLevel>
97-
<FunctionLevelLinking>true</FunctionLevelLinking>
98-
<IntrinsicFunctions>true</IntrinsicFunctions>
99103
<SDLCheck>true</SDLCheck>
100-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101105
<ConformanceMode>true</ConformanceMode>
102106
<AdditionalIncludeDirectories>..\..\include;..\..\..\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103107
</ClCompile>
104108
<Link>
105109
<SubSystem>Console</SubSystem>
106-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
107-
<OptimizeReferences>true</OptimizeReferences>
108110
<GenerateDebugInformation>true</GenerateDebugInformation>
109-
<AdditionalLibraryDirectories>$(SolutionDir)output\$(Configuration)\;..\..\..\vcpkg\installed\x86-windows\lib</AdditionalLibraryDirectories>
110-
<AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10.lib</AdditionalDependencies>
111+
<AdditionalLibraryDirectories>$(SolutionDir)output\$(Platform)\$(Configuration)\;..\..\..\vcpkg\installed\x64-windows\debug\lib</AdditionalLibraryDirectories>
112+
<AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10d.lib</AdditionalDependencies>
111113
</Link>
112114
</ItemDefinitionGroup>
113-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
115+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
114116
<ClCompile>
115117
<WarningLevel>Level3</WarningLevel>
118+
<FunctionLevelLinking>true</FunctionLevelLinking>
119+
<IntrinsicFunctions>true</IntrinsicFunctions>
116120
<SDLCheck>true</SDLCheck>
117-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118122
<ConformanceMode>true</ConformanceMode>
123+
<AdditionalIncludeDirectories>..\..\include;..\..\..\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119124
</ClCompile>
120125
<Link>
121126
<SubSystem>Console</SubSystem>
127+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
128+
<OptimizeReferences>true</OptimizeReferences>
122129
<GenerateDebugInformation>true</GenerateDebugInformation>
130+
<AdditionalLibraryDirectories>$(SolutionDir)output\$(Configuration)\;..\..\..\vcpkg\installed\x86-windows\lib</AdditionalLibraryDirectories>
131+
<AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10.lib</AdditionalDependencies>
123132
</Link>
124133
</ItemDefinitionGroup>
125134
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -128,14 +137,17 @@
128137
<FunctionLevelLinking>true</FunctionLevelLinking>
129138
<IntrinsicFunctions>true</IntrinsicFunctions>
130139
<SDLCheck>true</SDLCheck>
131-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132141
<ConformanceMode>true</ConformanceMode>
142+
<AdditionalIncludeDirectories>..\..\include;..\..\..\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133143
</ClCompile>
134144
<Link>
135145
<SubSystem>Console</SubSystem>
136146
<EnableCOMDATFolding>true</EnableCOMDATFolding>
137147
<OptimizeReferences>true</OptimizeReferences>
138148
<GenerateDebugInformation>true</GenerateDebugInformation>
149+
<AdditionalLibraryDirectories>$(SolutionDir)output\$(Platform)\$(Configuration)\;..\..\..\vcpkg\installed\x64-windows\lib</AdditionalLibraryDirectories>
150+
<AdditionalDependencies>openapi-cpp-sdk.lib;cpprest_2_10.lib</AdditionalDependencies>
139151
</Link>
140152
</ItemDefinitionGroup>
141153
<ItemGroup>

‎include/tigerapi/client_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ namespace TIGER_API {
5050
void check() {
5151
if (this->tiger_id.empty()) {
5252
LOG(ERROR) << U("Client Config error: tiger_id can't be empty") << endl;
53-
exit(0);
53+
throw std::runtime_error("Client Config error: tiger_id can't be empty");
5454
}
5555
if (this->private_key.empty()) {
5656
LOG(ERROR) << U("Client Config error: private_key can't be empty") << endl;
57-
exit(0);
57+
throw std::runtime_error("Client Config error: private_key can't be empty");
5858
}
5959
}
6060

6161
void check_account() {
6262
if (this->account.empty()) {
6363
LOG(ERROR) << U("Client Config error: account can't be empty") << endl;
64-
exit(0);
64+
throw std::runtime_error("Client Config error: account can't be empty");
6565
}
6666
}
6767

‎include/tigerapi/trade_client.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ namespace TIGER_API {
1818
public:
1919
TradeClient();
2020
TradeClient(const ClientConfig &cf);
21+
22+
/** 获取账户列表 **/
23+
value get_accounts();
24+
2125
/**
2226
* 获取资产(适用综合/模拟账户) get asset
2327
* @param account

0 commit comments

Comments
 (0)