senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,181 Commits 3 Branches 0 Tags 589 MiB
4b87b63e80
Commit Graph

2181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vn.py
a79a2019f2 [Mod]修改回调函数的参数命名 2018-10-26 15:08:57 +08:00
vn.py
7ded11666f Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-10-26 12:26:42 +08:00
vn.py
8c6b842e32
Merge pull request #1194 from nanoric/network_fix_errorhanding 
[Mod] 将websocket._connect移动到工作线程中
 2018-10-26 11:55:48 +08:00
vn.py
a45a55d2f6
Merge pull request #1193 from nanoric/okexv3 
[Add] OkexGateway:增加深度信息
 2018-10-26 11:54:58 +08:00
nanoric
759489b1fd [Mod] 将websocket._connect移动到工作线程中 
[Mod] 修改错误处理方式：onError将会捕捉更多异常

onError目前比以前能够多捕获两种异常：
 * websocket首次连接时的异常
 * RestClient._createSession中产生的异常
 2018-10-25 04:25:40 -04:00
nanoric
59d82042c5 [Add] OkexGateway:增加深度信息 2018-10-25 00:33:28 -04:00
vn.py
3e479e460c [Fix]修复close函数错误 2018-10-24 16:55:45 +08:00
vn.py
8f83b6dcf2 [Mod]使用RestClient和WebsocketClient重新实现 2018-10-24 16:54:12 +08:00
vn.py
309a7e2c0a
Merge pull request #1191 from nanoric/okexv3 
OkexGateway
 2018-10-24 14:01:21 +08:00
nanoric
3fd5d398a8 Merge branch 'dev' of https://github.com/vnpy/vnpy into okexv3 2018-10-23 21:33:52 -04:00
nanoric
661d557bf3 [Add] okexv3 
将API层删除了，全部放到Gateway里面。
将V1RestAPI全部弃用，改为V3API。

因为V3API还不完善，目前还不支持主动的持仓查询
 2018-10-23 21:33:25 -04:00
nanoric
cab8fd1e0e [Mod] WebSocket改名为Websocket 2018-10-23 21:31:17 -04:00
nanoric
d68529dacd [Mod] 修正typehint 2018-10-23 21:26:54 -04:00
vn.py
1c4ab27d57
Merge pull request #1186 from nanoric/okex.websocket 
Okex.websocket
 2018-10-23 09:39:22 +08:00
nanoric
b702f77af9 [Mod] OkexFuture改名为OkexFutures 
[Add] 增加V3版本的OkexRestApi
 2018-10-21 22:42:20 -04:00
nanoric
f17793ed17 [Add] VtContractData.createFromGateway 2018-10-21 22:33:07 -04:00
nanoric
7c83a1e9be [Mod] RestClient、WebSocket重构 2018-10-21 22:32:34 -04:00
nanoric
35518106a2 [Mod] 重构RestClient, WebSocketClient 
主要有：
* beforeRequest改名为sign
* onFailed, onError由函数指针改为函数（利用Python的特性，可以重载，也可以仍然当函数指针用）
* sendData改名为sendBinary
* 优化了WebSocketClient的循环逻辑
 2018-10-18 05:30:30 -04:00
vn.py
7a71f602d0
Merge pull request #1160 from joans321/dev 
简化 setup.py 查找子模块代码
 2018-10-17 21:03:02 +08:00
vn.py
4541673f58
Merge pull request #1170 from nanoric/okex.websocket 
Okex.websocket
 2018-10-17 21:01:08 +08:00
joans321
05bb5d44c4 add mac support 2018-10-17 20:27:09 +08:00
xuejianqing
95ffad8d92 安装过程增加错误检查 2018-10-17 20:04:12 +08:00
xuejianqing
a05e222cc4 忽略 python setup.py install 临时文件 2018-10-17 20:04:12 +08:00
xuejianqing
d5e7533789 精简setup.py查找子模块函数 2018-10-17 20:04:12 +08:00
nanoric
028d344fc0 [Add] 增加订阅用户自己交易信息的接口：OkexFutureApi.OkexFutureWebSocketClient.subscribeUserTrade 2018-10-17 05:48:14 -04:00
nanoric
b90d997456 [Fix] 修复start后响应两次onConnected的错误 2018-10-17 05:46:03 -04:00
nanoric
1f37a5ebeb [Add] 增加okexFutureApi.trade 
[Add] okexFutureApi:增加自动登录
 2018-10-17 05:45:13 -04:00
nanoric
46dda98d07 [Add] 增加VtTradeData.createFromGateway 2018-10-17 05:26:28 -04:00
vn.py
9aa7521e11
Merge pull request #1171 from joans321/docker 
增加 Docker GUI 支持
 2018-10-17 15:41:00 +08:00
vn.py
9d124ed196 Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-10-17 14:22:18 +08:00
vn.py
72bba04d5d [Add]增加BitmexGateway的主动行情订阅功能 2018-10-17 14:22:15 +08:00
nanoric
04068256d3 Merge branch 'dev' of https://github.com/vnpy/vnpy into okex.websocket 2018-10-16 22:01:05 -04:00
joans321
58d18133c7 增加 Docker GUI 支持 2018-10-16 19:27:26 +08:00
nanoric
c141360847 [Add] OkexFutureGateway.subscribe 
[Add] OkexFutureApi增加WebSocket客户端实现
 2018-10-16 05:49:36 -04:00
nanoric
e8ded9edf5 [Add] 增加VtTickData的静态初始化函数 
[Fix] 修复一个潜在BUG：仅仅载入vtObject.py并初始化VtLogData时有可能提示INFO字段不存在
 2018-10-16 05:48:44 -04:00
nanoric
eb844d4b9b [Mod] 将WebSocketClient.init(host)函数提前到__init__中调用 2018-10-16 05:46:42 -04:00
nanoric
1cc5c8b16e [Fix] 修复一个BUG：WebSocketClient无法初始化：onDisconnected赋值错误 2018-10-16 05:45:45 -04:00
vn.py
663f699537
Merge pull request #1169 from nanoric/okex.websocketclient.devel 
Okex.websocketclient.devel
 2018-10-16 14:43:25 +08:00
nanoric
995d994e8e [Mod] 不用简写：req改名为request 2018-10-16 02:19:30 -04:00
nanoric
713c183a14 [Mod] 将RestClient和WebSocketClient的默认回调改为可赋值的函数 2018-10-16 01:15:43 -04:00
nanoric
a5fc1bdba0 准备写okex的websocket api 2018-10-15 05:58:30 -04:00
nanoric
4cec0f6540 [Fix] okex:修复一个BUG：在传参的时候不应传apiSecret 2018-10-15 05:42:33 -04:00
nanoric
dc340d19b6 [Add] WebSocketClient:增加setCreateConnection 
[Add] WebSocketClient:增加一些注释
 2018-10-15 04:58:27 -04:00
nanoric
788677370f [Mod] WebsocketClient改名为WebSocketClient 2018-10-15 04:45:57 -04:00
nanoric
90d25fa536 Merge branch 'refactor.network.devel' into okex.devel 2018-10-15 04:39:39 -04:00
nanoric
562fae9a25 [Mod] WebSocketClient:非纯虚函数不使用abstractmethod 2018-10-15 04:39:09 -04:00
nanoric
c50c31a6bd [Mod] sendRequest改名为sendPacket 
和onPacket对应。
 2018-10-15 04:37:55 -04:00
nanoric
b8c6c92c43 [Mod] 使用一些VtObject相关的静态函数 2018-10-15 04:36:37 -04:00
nanoric
4d7c3bf417 [Add] WebSocketClient:增加onDisconnected 2018-10-15 04:35:55 -04:00
nanoric
a55246eb77 [Mod] WebSocketClient.onMessage改名为onPacket，以免和正常WebSocket的onMessage搞混。 2018-10-15 04:30:06 -04:00