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 |
|
nanoric
|
66cb55ef26
|
[Add] 增加一些用于创建VtObject的静态方法
|
2018-10-15 03:56:20 -04:00 |
|
nanoric
|
f2f4669123
|
[Fix] 修正错误的对websocket的引用
|
2018-10-15 03:20:54 -04:00 |
|
nanoric
|
a3129a8007
|
[Mod] sendReq改名为sendRequest（同步），addReq改名为addRequest（异步）
|
2018-10-15 03:12:05 -04:00 |
|
vn.py
|
a9f1a7c649
|
[Add]新增CryptoCompare的数字货币数据服务
|
2018-10-12 15:43:15 +08:00 |
|
nanoric
|
c8a071f38e
|
[Mod] 整理格式
|
2018-10-12 03:11:10 -04:00 |
|
nanoric
|
7cf5825bbe
|
[Add] OkexFutureGateway:增加持仓查询接口
|
2018-10-12 03:08:12 -04:00 |
|
vn.py
|
69606087c5
|
Merge branch 'dev' of https://github.com/vnpy/vnpy into dev
|
2018-10-12 14:46:55 +08:00 |
|
vn.py
|
bd6447a708
|
[Mod]调整DataService相关Demo的目录结构
|
2018-10-12 14:45:18 +08:00 |
|
vn.py
|
449c0284de
|
Merge pull request #1164 from nanoric/refactor.network.devel
Refactor.network.devel 2018-10-11
|
2018-10-12 14:42:44 +08:00 |
|
nanoric
|
e51e03f910
|
[Fix] 修正对齐
|
2018-10-12 02:21:44 -04:00 |
|
nanoric
|
86586a71c7
|
[Add] OkexFutureGateway增加了queryOrders的接口
|
2018-10-12 02:19:57 -04:00 |
|
nanoric
|
c88f5b497a
|
[Mod] errorCode2String改名为errorCodeToString
|
2018-10-12 02:04:39 -04:00 |
|
nanoric
|
abc82ecd96
|
[Fix] 修改一下typeHint
|
2018-10-12 01:30:58 -04:00 |
|
nanoric
|
aad3b6c51e
|
[Fix] 将OkexzFutureRestClient.queryOrders变为可用
[Mod] 修改一些注释
|
2018-10-12 00:02:44 -04:00 |
|
nanoric
|
63c8401931
|
[Fix] 修复OkexFutureClient缺少签名的错误
|
2018-10-12 00:02:36 -04:00 |
|
nanoric
|
4878b3291b
|
[Mod] 将Enum改为普通的object
[Mod] onFailed增加一个errorCode参数
|
2018-10-11 23:39:01 -04:00 |
|
nanoric
|
8c971c7d81
|
[Add] 增加OkexFutureSymbol类以表示可支持的合约（无法直接从API查询）
|
2018-10-11 23:10:00 -04:00 |
|
nanoric
|
6e0e1c116b
|
[Mod] 将RestClient和WebClient移动到api文件夹中，并修改import方式
|
2018-10-11 22:53:48 -04:00 |
|
nanoric
|
a396b55f8e
|
[Add] 完成OkexFutureApi.queryOrders
|
2018-10-11 22:50:04 -04:00 |
|
nanoric
|
0ee13bf862
|
[Add] RestClient:增加了Join函数
[Mod] 将processReq改为保护方法：改名为_processReq
|
2018-10-11 22:06:30 -04:00 |
|
vn.py
|
051f00f051
|
Merge pull request #1161 from raycool/raycool-dev
套利交易逻辑对冲函数逻辑被动腿错误
|
2018-10-12 09:08:39 +08:00 |
|
vn.py
|
9d834b040e
|
Merge pull request #1159 from nanoric/refactor.network
Refactor.network
|
2018-10-12 09:04:26 +08:00 |
|
huguanghui
|
100700257b
|
fix symbol error
|
2018-10-11 20:34:27 +08:00 |
|
huguanghui
|
72fef7f1ff
|
fix symbol error
|
2018-10-11 20:30:59 +08:00 |
|
nanoric
|
d9b5de31f3
|
[Add] 准备增加queryOrders
|
2018-10-11 06:13:40 -04:00 |
|
nanoric
|
0749007dc7
|
[Add] 修改部分注释
|
2018-10-11 06:12:41 -04:00 |
|
nanoric
|
694317b663
|
[Mod] 修改order的字段获取顺序：按字母顺序排列
|
2018-10-11 05:50:28 -04:00 |
|
nanoric
|
cf546672fd
|
[Add] 完成okexFutureGateway.sendOrder
|
2018-10-11 04:05:26 -04:00 |
|
nanoric
|
a4859a94eb
|
[Fix] OkexFutureApi:将onFailed参数变为真的可选
|
2018-10-11 04:04:33 -04:00 |
|
nanoric
|
26cfc17255
|
[Mod] OkexFutureApi:修改部分onFailed的智能提示
|
2018-10-11 03:52:03 -04:00 |
|
nanoric
|
fe99a3ddd8
|
[Fix] Fix:如果没有杠杆倍数，就不传这个参数
|
2018-10-11 03:46:32 -04:00 |
|