Merge branch 'dev' into 'master'

Dev -> master

See merge request !28

Author: zhanggoo9527

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='tigeropen',
-    version='1.1.5',
+    version='1.1.6',
     description='TigerBrokers Open API',
     packages=find_packages(exclude=[]),
     author='TigerBrokers',

tigeropen/common/consts/quote_keys.py

@@ -24,4 +24,4 @@ class QuoteKeyType(Enum):
     ALL = None  # 所有行情数据
     QUOTE = 'askPrice,askSize,bidPrice,bidSize'  # 盘口数据
     TRADE = 'open,high,low,close,preClose,volume,latestPrice'  # 成交数据
-    TIMELINE = 'mi'  # 分钟数据
+    TIMELINE = 'mi'  # 分时数据

tigeropen/push/push_client.py

@@ -211,7 +211,7 @@ def on_error(self, headers, body):
     def _get_subscribe_id(counter):
         return 'sub-' + str(counter)
 
-    def subscribe_asset(self):
+    def subscribe_asset(self, account=None):
         """
         订阅账户资产更新
         :return:
@@ -222,6 +222,8 @@ def subscribe_asset(self):
         headers['destination'] = 'trade/asset'
         headers['subscription'] = 'Asset'
         headers['id'] = sub_id
+        if account:
+            headers['account'] = account
 
         self._stomp_connection.subscribe('trade/asset', id=sub_id, headers=headers)
         return sub_id
@@ -238,7 +240,7 @@ def unsubscribe_asset(self, id=None):
         headers['id'] = sub_id
         self._stomp_connection.unsubscribe(id=sub_id, headers=headers)
 
-    def subscribe_position(self):
+    def subscribe_position(self, account=None):
         """
         订阅账户持仓更新
         :return:
@@ -249,6 +251,8 @@ def subscribe_position(self):
         headers['destination'] = 'trade/position'
         headers['subscription'] = 'Position'
         headers['id'] = sub_id
+        if account:
+            headers['account'] = account
 
         self._stomp_connection.subscribe('trade/position', id=sub_id, headers=headers)
         return sub_id
@@ -266,7 +270,7 @@ def unsubscribe_position(self, id=None):
 
         self._stomp_connection.unsubscribe(id=sub_id, headers=headers)
 
-    def subscribe_order(self):
+    def subscribe_order(self, account=None):
         """
         订阅账户订单更新
         :return:
@@ -277,6 +281,8 @@ def subscribe_order(self):
         headers['destination'] = 'trade/order'
         headers['subscription'] = 'OrderStatus'
         headers['id'] = sub_id
+        if account:
+            headers['account'] = account
 
         self._stomp_connection.subscribe('trade/order', id=sub_id, headers=headers)
         return sub_id