Commit Graph

2639 Commits

Author SHA1 Message Date
vn.py
d720d84476
Merge pull request #1881 from hlxstc/dev
修复加载历史数据的bug
2019-06-30 17:17:57 +08:00
vn.py
20a7648622
[Mod] reduce duplicate code line 2019-06-30 17:17:46 +08:00
vn.py
f5dd168a73 [Mod] sync strategy data to file when stopped or receive trade update 2019-06-30 17:10:23 +08:00
xldistance
88ea19d9db
Update onetoken_gateway.py 2019-06-30 13:56:34 +08:00
xldistance
e14672ab8c
Update onetoken_gateway.py 2019-06-30 13:55:11 +08:00
vn.py
1cfbbe5d30 [Fix] add sync_strategy_data function for BacktestingEngine 2019-06-30 13:32:35 +08:00
xldistance
0fae58f333
fix onetoken order.status
fix onetoken order.status
2019-06-30 12:06:59 +08:00
vn.py
2bab750b96 [Mod] add query_hsitory for IbGateway 2019-06-29 23:36:50 +08:00
vn.py
3b1b8d9ffa [Mod] change default value of brokerid 2019-06-29 08:50:06 +08:00
Jokers
85c72c51bd 修复加载历史数据的bug 2019-06-29 01:17:10 +08:00
nanoric
23e4f968b9 [Mod] use autocxxpy 0.4.0 2019-06-28 19:28:47 +08:00
nanoric
dbac32e2af Merge branch 'new_oes' into dev 2019-06-28 16:52:32 +08:00
vn.py
fcaec7d838 [Mod] add filter for wrong data format in on_depth 2019-06-28 16:11:38 +08:00
vn.py
07ed1c44ac
Merge pull request #1876 from LimingFang/mod_md_628
update md
2019-06-28 13:17:55 +08:00
LimingFang
398e08b88e update md 2019-06-28 13:01:37 +08:00
vn.py
021ef86d19
Merge pull request #1875 from nanoric/import_fix
Import fix
2019-06-28 12:54:00 +08:00
nanoric
1410fa1748 [Add] ignore flake8 test for examples/vn_trader/run.py 2019-06-28 11:03:57 +08:00
nanoric
f9c726fed7 Merge remote-tracking branch 'remotes/origin/dev' into import_fix 2019-06-28 10:59:29 +08:00
nanoric
27b97ec55e [Del] remove vntap.lib 2019-06-28 10:58:39 +08:00
nanoric
86fde178b9 [Mod] use newer autocxxpy: Register AsyncDispatchException as module_local
[Mod] recompile pyds for xtp, tora and tap
2019-06-28 10:56:16 +08:00
nanoric
adc4969746 [Mod] update oes api: use new autocxxpy and change its code layout 2019-06-28 10:30:52 +08:00
vn.py
a356cbad1d
Merge pull request #1865 from vnpy/tora
Tora
2019-06-26 21:45:56 +08:00
vn.py
f1b85f5634
Merge branch 'dev' into tora 2019-06-26 21:45:28 +08:00
vn.py
d0bb68fc47 [Mod] complete test of ToraGateway 2019-06-26 21:43:06 +08:00
nanoric
7bfbd842bc [Mod] apply autocxxpy 0.3.4b in ToraApi, XtpApi, TapApi 2019-06-26 18:19:19 +08:00
vn.py
f2c5882e03
Merge pull request #1862 from vnpy/alpaca
Alpaca
2019-06-25 19:42:33 +08:00
vn.py
a9ed153f60
Merge pull request #1861 from nanoric/tora
[Add] ToraGateway
2019-06-25 19:39:26 +08:00
nanoric
b168bd1e39 [Add] added import test for new gateways 2019-06-25 16:59:56 +08:00
nanoric
e22cb9a415 [Add] ToraGateway: TODO list 2019-06-25 16:58:16 +08:00
nanoric
bc47ef7ea4 Merge remote-tracking branch 'remotes/origin/dev' into tora 2019-06-25 16:41:15 +08:00
nanoric
92092c127c [Mod] ToraGateway: Finished & Remove Useless Code 2019-06-25 16:39:29 +08:00
vn.py
a25051087d [Mod] complete test of AlpacaGateway 2019-06-25 16:25:34 +08:00
nanoric
213e35c690 [Add] ToraGateway: cancel_order 2019-06-25 15:29:16 +08:00
nanoric
69bb4bc685 Merge remote-tracking branch 'remotes/nanoric/tora' into tora
# Conflicts:
#	vnpy/gateway/tora/td.py
2019-06-25 15:00:30 +08:00
nanoric
ef49763381 [Add] tora_td: print detail about OnErrRtnOrderInsert,
[Add] tora_td: ignore non-number OrderRef
2019-06-25 14:58:57 +08:00
vn.py
1b139f34a1 [Mod] improve code readability 2019-06-25 10:47:27 +08:00
vn.py
af94e1e186 [Del] remove unnecessary try...catch 2019-06-25 10:37:40 +08:00
vn.py
0d1a536b23
Merge pull request #1858 from vigarbuaa/master
[add] add alpaca gateway to vnpy
2019-06-25 10:31:02 +08:00
vn.py
72b28df57b
Merge pull request #1846 from 1122455801/rest_compatible_json_headers
[Add] rest_client的data参数增加其他格式支持
2019-06-25 10:28:15 +08:00
vn.py
6659719e2d [Add]mainwindow toolbar for apps 2019-06-24 13:29:22 +08:00
vn.py
7682749bba [Fix] bug when close TapGateway 2019-06-22 23:34:53 +08:00
vigarbuaa
985c062549 format code 2019-06-22 10:56:03 +08:00
vigarbuaa
17fe9bf914 remove not used rest_client
1. "json的内容可以通过设置Content-Type为application/json达成,没必要单独增加一个json字段。" remove not used code
2.  在alpaca撤单调试过程中,发生返回值200,但body.text是json的情况,致rest_client解析json报错,加了try/catch做处理
2019-06-22 10:51:50 +08:00
vn.py
8b0b92a091
Merge pull request #1856 from xldistance/patch-26
更新one_token合约交易所代码
2019-06-22 10:51:33 +08:00
vigarbuaa
08d3b26a5d remove debug print info 2019-06-22 10:22:04 +08:00
vigarbuaa
9124302cca add process_timer_event to query account and position 2019-06-21 22:31:30 +08:00
xldistance
922914daa7
更新one_token合约交易所代码 2019-06-21 19:23:40 +08:00
vigarbuaa
2dd33b5ba0 add subscribe func 2019-06-21 13:26:40 +08:00
vigarbuaa
0753e3cfe2 add cancel order fun for alpaca 2019-06-20 22:24:18 +08:00
vigarbuaa
04b0da5ce5 add try/catch to json parse func
rest_client认为每个返回都可解为json,在处理alpaca的撤单操作时报错
2019-06-20 22:24:03 +08:00