diff --git a/vn.archive/vn.cs/vncshshlp/test/CITICs_HsT2Hlp.dll b/vn.archive/vn.cs/test/CITICs_HsT2Hlp.dll similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/CITICs_HsT2Hlp.dll rename to vn.archive/vn.cs/test/CITICs_HsT2Hlp.dll diff --git a/vn.archive/vn.cs/vncshshlp/test/Hsconfig.ini b/vn.archive/vn.cs/test/Hsconfig.ini similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/Hsconfig.ini rename to vn.archive/vn.cs/test/Hsconfig.ini diff --git a/vn.archive/vn.cs/vncshshlp/test/cslog/20150331.log b/vn.archive/vn.cs/test/cslog/20150331.log similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/cslog/20150331.log rename to vn.archive/vn.cs/test/cslog/20150331.log diff --git a/vn.archive/vn.cs/test/cslog/20170411.log b/vn.archive/vn.cs/test/cslog/20170411.log new file mode 100644 index 00000000..59bd7b46 --- /dev/null +++ b/vn.archive/vn.cs/test/cslog/20170411.log @@ -0,0 +1 @@ +[114.251.228.136:20008 h0302ce38/t2818]22:52:07.954 -10099.03ms [-11] !Connect HSAR Server [-11] ͬ²½Á¬½Ó³¬Ê±»ò·¢Éú´íÎó¡£...... diff --git a/vn.archive/vn.cs/vncshshlp/test/cslog/cserror.log b/vn.archive/vn.cs/test/cslog/cserror.log similarity index 75% rename from vn.archive/vn.cs/vncshshlp/test/cslog/cserror.log rename to vn.archive/vn.cs/test/cslog/cserror.log index 06b4fa5e..c839a1e8 100644 --- a/vn.archive/vn.cs/vncshshlp/test/cslog/cserror.log +++ b/vn.archive/vn.cs/test/cslog/cserror.log @@ -13,3 +13,5 @@ 20150401 13:48:50.439 1: [h04557720/t3530] the Connection has been disconnected. 20150401 13:49:13.822 1: [h045f7720/t317c] the Connection has been disconnected. 20150401 14:34:59.175 1: [h045a7720/t2f80] the Connection has been disconnected. +2017-04-11 22:51:57.843: --The license infomation is error. This machine ID is:[16ec65f21e6068d6e3d4de7a6ce6979b] and you can find this ID code in 'cserror.log' file! +2017-04-11 22:51:57.844: --'CITICs_HsT2Hlp.dll' Moudle is not licensed. The date of license to:[2017-06-11] , The all functions is not limited on the trail period! diff --git a/vn.archive/vn.cs/vncshshlp/test/cstest.py b/vn.archive/vn.cs/test/cstest.py similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/cstest.py rename to vn.archive/vn.cs/test/cstest.py diff --git a/vn.archive/vn.cs/vncshshlp/test/t2sdk.dll b/vn.archive/vn.cs/test/t2sdk.dll similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/t2sdk.dll rename to vn.archive/vn.cs/test/t2sdk.dll diff --git a/vn.archive/vn.cs/vncshshlp/test/t2sdk.ini b/vn.archive/vn.cs/test/t2sdk.ini similarity index 100% rename from vn.archive/vn.cs/vncshshlp/test/t2sdk.ini rename to vn.archive/vn.cs/test/t2sdk.ini diff --git a/vn.archive/vn.cs/vncshshlp/test/vncshshlp.pyd b/vn.archive/vn.cs/test/vncshshlp.pyd similarity index 98% rename from vn.archive/vn.cs/vncshshlp/test/vncshshlp.pyd rename to vn.archive/vn.cs/test/vncshshlp.pyd index aeff0f61..be1d8a07 100644 Binary files a/vn.archive/vn.cs/vncshshlp/test/vncshshlp.pyd and b/vn.archive/vn.cs/test/vncshshlp.pyd differ diff --git a/vn.archive/vn.cs/vncshshlp/Visual Studio 2013/settings/Windows Azure Subscriptions.xml b/vn.archive/vn.cs/vncshshlp/Visual Studio 2013/settings/Windows Azure Subscriptions.xml new file mode 100644 index 00000000..05fe7b9b --- /dev/null +++ b/vn.archive/vn.cs/vncshshlp/Visual Studio 2013/settings/Windows Azure Subscriptions.xml @@ -0,0 +1,5 @@ + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA25n/ahjWHUaDiThcqA7VUAAAAAACAAAAAAAQZgAAAAEAACAAAACp8rAE6Rs+eDDGKoeibA0/oqMmdaA7onKWWZ9vNCMEegAAAAAOgAAAAAIAACAAAAArczqvArBQ6ZrDcryIUkYKHoCnxCFdBrwI86J8FMUqgxAAAADeYX9RIZdGPQWXXdIuo+DqQAAAAJVN3ajzOqDwXdZ1xR01lsdwXOYV0Tmyho0kIwaDp6GC5AH0RbotPHV7hgmKRkWjOR/bALilvW6H6V42wNTqvb8= + \ No newline at end of file diff --git a/vn.archive/vn.cs/vncshshlp/test/(20130403)ZXZQ-TESTsfjrt-ALL-0001_3rd.dat b/vn.archive/vn.cs/vncshshlp/test/(20130403)ZXZQ-TESTsfjrt-ALL-0001_3rd.dat deleted file mode 100644 index 8effa775..00000000 Binary files a/vn.archive/vn.cs/vncshshlp/test/(20130403)ZXZQ-TESTsfjrt-ALL-0001_3rd.dat and /dev/null differ diff --git a/vn.archive/vn.cs/vncshshlp/test/csauthor.dat b/vn.archive/vn.cs/vncshshlp/test/csauthor.dat deleted file mode 100644 index 503bb365..00000000 --- a/vn.archive/vn.cs/vncshshlp/test/csauthor.dat +++ /dev/null @@ -1,16 +0,0 @@ -[auth_info] -ProfileCode=af2ebd99da3c6636171ea72747a5e32d -LimitDate=20300101 -AllowPushTransation=0 -AllowWbp=0 -AuthCode=AQAAAABo23AyYmI1MWQ2ZGFhN2ExMjI1OTQyODgzZjA2OWFhNDBmOQAAAAAAAAAAAAAAAA== -[functions] -func= -;[ProcessInfo_0] -;ProcessName=HsT2Hlp_Demo.exe,Hs.exe -;NetIP=172.23.123.9 -;NetMask=255.255.255.0 -;[ProcessInfo_0] -;ProcessName=Option_Demo.exe -;NetIP=10.0.0.0 -;NetMask=255.0.0.0 diff --git a/vn.archive/vn.cs/vncshshlp/test/license.dat b/vn.archive/vn.cs/vncshshlp/test/license.dat deleted file mode 100644 index 1bff812c..00000000 Binary files a/vn.archive/vn.cs/vncshshlp/test/license.dat and /dev/null differ diff --git a/vn.archive/vn.cs/vncshshlp/vncshshlp.sln b/vn.archive/vn.cs/vncshshlp/vncshshlp.sln new file mode 100644 index 00000000..c9940863 --- /dev/null +++ b/vn.archive/vn.cs/vncshshlp/vncshshlp.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vncshshlp", "vncshshlp\vncshshlp.vcxproj", "{982DF24C-BCD1-4F25-BDE8-84ADB719588B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {982DF24C-BCD1-4F25-BDE8-84ADB719588B}.Debug|Win32.ActiveCfg = Debug|Win32 + {982DF24C-BCD1-4F25-BDE8-84ADB719588B}.Debug|Win32.Build.0 = Debug|Win32 + {982DF24C-BCD1-4F25-BDE8-84ADB719588B}.Release|Win32.ActiveCfg = Release|Win32 + {982DF24C-BCD1-4F25-BDE8-84ADB719588B}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj b/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj new file mode 100644 index 00000000..772453c2 --- /dev/null +++ b/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {982DF24C-BCD1-4F25-BDE8-84ADB719588B} + Win32Proj + vncshshlp + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + true + + + false + X:\GithubProject\vnpy\vn.archive\vn.cs\hshlp;D:\Anaconda2\include;D:\boost_1_57_0;$(IncludePath) + D:\boost_1_57_0\libs;D:\Anaconda2\libs;X:\GithubProject\vnpy\vn.archive\vn.cs\hshlp;$(ReferencePath) + .pyd + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VNCSHSHLP_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VNCSHSHLP_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + X:\GithubProject\vnpy\vn.archive\vn.cs\hshlp;D:\Anaconda2\libs;D:\boost_1_57_0\stage\lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + false + + + false + + + + + Create + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj.filters b/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj.filters new file mode 100644 index 00000000..d886f6be --- /dev/null +++ b/vn.archive/vn.cs/vncshshlp/vncshshlp/vncshshlp.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + Resource Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/vn.trader/gateway/ctpGateway/CTP_connect.json b/vn.trader/gateway/ctpGateway/CTP_connect.json index 0f3215d3..fe1ffded 100644 --- a/vn.trader/gateway/ctpGateway/CTP_connect.json +++ b/vn.trader/gateway/ctpGateway/CTP_connect.json @@ -1,7 +1,7 @@ { "brokerID": "9999", "tdAddress": "tcp://180.168.146.187:10000", - "password": "19890624", - "mdAddress": "tcp://180.168.146.187:10010", - "userID": "000300" + "password": "simnow申请", + "mdAddress": "tcp://180.168.212.228:41213", + "userID": "simnow申请" } \ No newline at end of file