Commit Graph

2237 Commits

Author SHA1 Message Date
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
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
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
vigarbuaa
eb691525fc cancel order successful
send cancel req by rest_client
receive reponse by websocket

...  need to debug
2019-06-18 23:13:41 +08:00
vigarbuaa
1e0248ce5c add swicht {real, paper} url function 2019-06-15 15:07:07 +08:00
vigarbuaa
e8e2e1121d websocket stream and auth and listening stream 2019-06-15 13:45:50 +08:00
vigarbuaa
7be2a90e4c add websocket into alpaca 2019-06-15 11:19:15 +08:00
vigarbuaa
5e5137f9ab add order_dict for cancel_order function
order_dict {local_order_id: remote_order_id}
2019-06-08 07:17:25 +08:00
vigarbuaa
9fbac9dfba format 2019-06-08 06:40:09 +08:00
vigarbuaa
4e30095ac3 modify send_order func to fill limit price order 2019-06-06 23:33:17 +08:00
vigarbuaa
21cc72ac3f add send_order function
1. add send_order function
2. post by json param,  need to modify rest_client.py to support json field
2019-06-06 23:13:39 +08:00
vigarbuaa
8cf23cea4b add query_account and query_positions function , debug OK 2019-06-05 23:33:53 +08:00
vn.py
b6b8207211
Merge pull request #1717 from vnpy/dev
[Mod] update README.md
2019-05-17 13:49:56 +08:00
vn.py
4cc2e7a3e9 [Mod] update README.md 2019-05-17 13:49:37 +08:00
vn.py
b50dff67fe
Merge pull request #1716 from vnpy/dev
Dev
2019-05-17 12:45:24 +08:00
vn.py
8078fde562 [Mod] comment CtptestGateway 2019-05-17 12:43:55 +08:00
vn.py
1a583779d3 [Mod] add module_local for MdApi/TdApi class in pybind wrapper 2019-05-17 10:12:55 +08:00
vn.py
ff7ec980e1 [Add] CtptestGateway for 6.3.13 CTP test environment 2019-05-17 10:06:43 +08:00
vn.py
f04b4862c3 [Mod] remove self reference 2019-05-16 17:31:05 +08:00
vn.py
4d277c71d2
Merge pull request #1706 from vnpy/dev
Dev
2019-05-15 18:13:40 +08:00
vn.py
dff9486998
Merge pull request #1705 from nanoric/python_m_pip
[Mod] 改进Linux的构建脚本
2019-05-15 18:13:13 +08:00
nanoric
8a898c4002 [Mod] make flake8 happy 2019-05-15 17:27:50 +08:00
nanoric
0aed24b403 [Mod] setup.py: use psycopg2-binary instead of psycopg2, and only install when psycopg2 doesn't exists. 2019-05-15 17:22:52 +08:00
nanoric
1f70d34b12 [Fix] fixed osx install 2019-05-15 16:58:18 +08:00
nanoric
4573424e0c [Mod] use python -m pip instead of pip
ibapi & rqdatac is installed from 3rd-party source. old version of pip can't handle this correctly.
upgrading pip might make /usr/bin/pip(3) unable to execute. So python -m pip is safer to run pip.
2019-05-15 16:36:56 +08:00
vn.py
abad26bbdc
Merge pull request #1701 from nanoric/dev
[Add] requirements.txt add EOF blank line
2019-05-15 16:06:33 +08:00
vn.py
952fbfd360
Merge pull request #1704 from 1122455801/index_update_datarecorder
[Add] Index update datarecorder
2019-05-15 14:14:00 +08:00
1122455801
7f1392ee24 Update index.md 2019-05-15 13:41:00 +08:00
1122455801
06a52b734a Update datarecoder.md 2019-05-15 13:33:45 +08:00
1122455801
3cf04bcca9 Update index.md 2019-05-15 13:33:39 +08:00
vn.py
c7f8da4cc9
Merge pull request #1702 from vnpy/dev
[Del] duplicate info
2019-05-15 13:33:07 +08:00
vn.py
37d62160e8 [Del] duplicate info 2019-05-15 13:32:26 +08:00
nanoric
61e526fdd1 [Add] requirements.txt add EOF blank line 2019-05-15 12:25:07 +08:00
vn.py
15a7f93dfc
Merge pull request #1700 from vnpy/dev
Dev
2019-05-15 12:17:20 +08:00
vn.py
1f1f377a20 [Fix] missing empty line 2019-05-15 12:14:19 +08:00
vn.py
a3a387fb45 Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-05-15 12:08:58 +08:00
vn.py
e0b58a9a9f [Mod] update README.md 2019-05-15 12:08:23 +08:00
vn.py
ed9949c7ec
Merge pull request #1699 from vnpy/master
[Merge] master -> dev
2019-05-15 12:07:29 +08:00
vn.py
e9d008c3ef
Merge branch 'dev' into master 2019-05-15 12:07:08 +08:00
vn.py
51614490d5 [Mod] update version number 2019-05-15 11:22:30 +08:00
vn.py
355613c3b7 Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-05-15 11:14:38 +08:00
vn.py
4b87b63e80 [Mod] update index.md 2019-05-15 11:14:35 +08:00
vn.py
ad891ad671
Merge pull request #1698 from nanoric/ctp_se_under_linux
[Fix] fixed ctp_se build under linux
2019-05-15 11:03:24 +08:00
nanoric
b9bb86eef1 [Fix] fixed ctp_se build under linux 2019-05-15 10:50:52 +08:00
vn.py
2ba6edea05
Merge pull request #1697 from 1122455801/tiger_01
[Mod] tiger_gateway.py
2019-05-14 22:15:51 +08:00
vn.py
38a7d2d8d6 [Mod] update index.md 2019-05-14 22:11:20 +08:00