Skip to content

Commit 86a9441

Browse files
wukan1986wukan1986
committed
目录调整第二次
1 parent d82dba5 commit 86a9441

133 files changed

Lines changed: 446 additions & 375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apis/apis.sln renamed to AllCppProjects.sln

Lines changed: 140 additions & 143 deletions
Large diffs are not rendered by default.

‎CopyApiDll.bat‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
xcopy "include\Tdx\win32\*.*" "bin\Debug\x86\Tdx_Trade" /Y
2+
xcopy "include\CTP\win32\*md*.dll" "bin\Debug\x86\CTP_Quote" /Y
3+
xcopy "include\CTP\win32\*tr*.dll" "bin\Debug\x86\CTP_Trade" /Y
4+
xcopy "include\Kingstar\win32\*.dll" "bin\Debug\x86\Kingstar_Quote" /Y
5+
xcopy "include\Kingstar\win32\*.dll" "bin\Debug\x86\Kingstar_Trade" /Y
6+
xcopy "include\LTS_v2\win32\*qu*.dll" "bin\Debug\x86\LTS_Query_v2" /Y
7+
xcopy "include\LTS_v2\win32\*md*.dll" "bin\Debug\x86\LTS_Quote_v2" /Y
8+
xcopy "include\LTS_v2\win32\*tr*.dll" "bin\Debug\x86\LTS_Trade_v2" /Y
9+
pause

‎apis/CTP/Quote/MdUserApi.cpp‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../../include/ApiProcess.h"
1010
#include "../TypeConvert.h"
1111

12-
#include "../../core/Queue/MsgQueue.h"
12+
#include "../../common/Queue/MsgQueue.h"
1313
#ifdef _REMOTE
1414
#include "../../Queue/RemoteQueue.h"
1515
#endif
@@ -162,7 +162,15 @@ int CMdUserApi::_Init()
162162
m_pApi = CThostFtdcMdApi::CreateFtdcMdApi(pszPath, m_ServerInfo.IsUsingUdp, m_ServerInfo.IsMulticast);
163163
delete[] pszPath;
164164

165-
m_msgQueue->Input_NoCopy(ResponeType::ResponeType_OnConnectionStatus, m_msgQueue, m_pClass, ConnectionStatus::ConnectionStatus_Initialized, 0, nullptr, 0, nullptr, 0, nullptr, 0);
165+
HMODULE hModule = GetModuleHandleA(nullptr);
166+
char szPath[MAX_PATH] = { 0 };
167+
GetModuleFileNameA(hModule, szPath, MAX_PATH);
168+
169+
RspUserLoginField* pField = (RspUserLoginField*)m_msgQueue->new_block(sizeof(RspUserLoginField));
170+
pField->RawErrorID = 0;
171+
strncpy(pField->Text, szPath, sizeof(Char256Type));
172+
173+
m_msgQueue->Input_NoCopy(ResponeType::ResponeType_OnConnectionStatus, m_msgQueue, m_pClass, ConnectionStatus::ConnectionStatus_Initialized, 0, pField, sizeof(RspUserLoginField), nullptr, 0, nullptr, 0);
166174

167175
if (m_pApi)
168176
{

‎apis/CTP/Quote/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void* __stdcall XRequest(char type, void* pApi1, void* pApi2, double double1, do
1616
RequestType rt = (RequestType)type;
1717
switch (rt)
1818
{
19-
case RequestType_GetApiType:
19+
case RequestType_GetApiTypes:
2020
return (void*)(ApiType::ApiType_MarketData | ApiType::ApiType_QuoteRequest);
2121
case RequestType_GetApiVersion:
2222
return (void*)API_VERSION;

‎apis/CTP/Trade/TraderApi.cpp‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "../../include/toolkit.h"
1111

12-
#include "../../core/Queue/MsgQueue.h"
12+
#include "../../common/Queue/MsgQueue.h"
1313

1414
#include "../CTP/TypeConvert.h"
1515

@@ -247,7 +247,15 @@ int CTraderApi::_Init()
247247
m_pApi = CThostFtdcTraderApi::CreateFtdcTraderApi(pszPath);
248248
delete[] pszPath;
249249

250-
m_msgQueue->Input_NoCopy(ResponeType::ResponeType_OnConnectionStatus, m_msgQueue, m_pClass, ConnectionStatus::ConnectionStatus_Initialized, 0, nullptr, 0, nullptr, 0, nullptr, 0);
250+
HMODULE hModule = GetModuleHandleA(nullptr);
251+
char szPath[MAX_PATH] = { 0 };
252+
GetModuleFileNameA(hModule, szPath, MAX_PATH);
253+
254+
RspUserLoginField* pField = (RspUserLoginField*)m_msgQueue->new_block(sizeof(RspUserLoginField));
255+
pField->RawErrorID = 0;
256+
strncpy(pField->Text, szPath, sizeof(Char256Type));
257+
258+
m_msgQueue->Input_NoCopy(ResponeType::ResponeType_OnConnectionStatus, m_msgQueue, m_pClass, ConnectionStatus::ConnectionStatus_Initialized, 0, pField, sizeof(RspUserLoginField), nullptr, 0, nullptr, 0);
251259

252260
if (m_pApi)
253261
{

‎apis/CTP/Trade/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void* __stdcall XRequest(char type, void* pApi1, void* pApi2, double double1, do
1313
RequestType rt = (RequestType)type;
1414
switch (rt)
1515
{
16-
case RequestType_GetApiType:
16+
case RequestType_GetApiTypes:
1717
return (void*)(ApiType::ApiType_Trade | ApiType::ApiType_Instrument | ApiType::ApiType_Query);
1818
case RequestType_GetApiVersion:
1919
return (void*)API_VERSION;

‎apis/CTP_Trade/CTP_Trade.vcxproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<LinkIncremental>true</LinkIncremental>
125125
<OutDir>..\..\bin\$(Configuration)\$(PlatformTarget)\$(ProjectName)</OutDir>
126126
<IncludePath>./;../../include/cryptopp/;$(IncludePath)</IncludePath>
127+
<TargetName>$(ProjectName)_$(PlatformTarget)</TargetName>
127128
</PropertyGroup>
128129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
129130
<LinkIncremental>true</LinkIncremental>
@@ -293,7 +294,7 @@
293294
<Text Include="ReadMe.txt" />
294295
</ItemGroup>
295296
<ItemGroup>
296-
<ClInclude Include="..\..\core\License\License.h" />
297+
<ClInclude Include="..\..\common\License\License.h" />
297298
<ClInclude Include="..\..\include\inirw.h" />
298299
<ClInclude Include="..\..\include\toolkit.h" />
299300
<ClInclude Include="..\CTP\Trade\TraderApi.h" />
@@ -305,7 +306,7 @@
305306
<ClInclude Include="targetver.h" />
306307
</ItemGroup>
307308
<ItemGroup>
308-
<ClCompile Include="..\..\core\License\License.cpp" />
309+
<ClCompile Include="..\..\common\License\License.cpp" />
309310
<ClCompile Include="..\..\include\inirw.cpp" />
310311
<ClCompile Include="..\..\include\toolkit.cpp" />
311312
<ClCompile Include="..\CTP\dllmain.cpp" />

‎apis/CTP_Trade/CTP_Trade.vcxproj.filters‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<ClInclude Include="..\..\include\toolkit.h">
4646
<Filter>Header Files</Filter>
4747
</ClInclude>
48-
<ClInclude Include="..\..\core\License\License.h">
48+
<ClInclude Include="..\..\include\inirw.h">
4949
<Filter>Header Files</Filter>
5050
</ClInclude>
51-
<ClInclude Include="..\..\include\inirw.h">
51+
<ClInclude Include="..\..\common\License\License.h">
5252
<Filter>Header Files</Filter>
5353
</ClInclude>
5454
</ItemGroup>
@@ -71,10 +71,10 @@
7171
<ClCompile Include="..\..\include\toolkit.cpp">
7272
<Filter>Source Files</Filter>
7373
</ClCompile>
74-
<ClCompile Include="..\..\core\License\License.cpp">
74+
<ClCompile Include="..\..\include\inirw.cpp">
7575
<Filter>Source Files</Filter>
7676
</ClCompile>
77-
<ClCompile Include="..\..\include\inirw.cpp">
77+
<ClCompile Include="..\..\common\License\License.cpp">
7878
<Filter>Source Files</Filter>
7979
</ClCompile>
8080
</ItemGroup>

‎apis/LTS_Query_v2/QueryApi.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "../../include/toolkit.h"
1111

12-
#include "../../core/Queue/MsgQueue.h"
12+
#include "../../common/Queue/MsgQueue.h"
1313

1414
// 这里用的是与交易同一个类型转换
1515
#include "../LTS_Trade_v2/TypeConvert.h"

‎apis/LTS_Query_v2/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void* __stdcall XRequest(char type, void* pApi1, void* pApi2, double double1, do
1313
RequestType rt = (RequestType)type;
1414
switch (rt)
1515
{
16-
case RequestType_GetApiType:
16+
case RequestType_GetApiTypes:
1717
return (void*)(ApiType::ApiType_Query | ApiType::ApiType_Instrument);
1818
case RequestType_GetApiVersion:
1919
return (void*)"0.1.0.20151116";

0 commit comments

Comments
 (0)