Merge branch 'dev' into level2

Author: tigersk

tigeropen/examples/quote_client_demo.py

@@ -24,8 +24,8 @@
 
 def get_quote():
     # 抢占行情权限
-    is_grab_quote_success = openapi_client.grab_quote_permission()
-    print(is_grab_quote_success)
+    quote_permissions = openapi_client.grab_quote_permission()
+    print(quote_permissions)
 
     market_status_list = openapi_client.get_market_status(Market.US)
     print(market_status_list)

tigeropen/quote/quote_client.py

@@ -1137,15 +1137,19 @@ def get_stock_industry(self, symbol, market=Market.US):
     def grab_quote_permission(self):
         """
         抢占行情权限
-        :return: 是否抢占成功, bool 类型
+        :return: 权限列表
+        示例: [{'name': 'usQuoteBasic', 'expireAt': 1621931026000},
+              {'name': 'usStockQuoteLv2Totalview', 'expireAt': 1621931026000},
+              {'name': 'usOptionQuote', 'expireAt': 1621931026000},
+              {'name': 'hkStockQuoteLv2', 'expireAt': 1621931026000}]
         """
         request = OpenApiRequest(GRAB_QUOTE_PERMISSION)
         response_content = self.__fetch_data(request)
         if response_content:
             response = QuoteGrabPermissionResponse()
             response.parse_response_content(response_content)
             if response.is_success():
-                return response.is_master
+                return response.permissions
             else:
                 raise ApiException(response.code, response.message)
         return False

tigeropen/quote/response/quote_grab_permission_response.py

@@ -9,7 +9,7 @@
 class QuoteGrabPermissionResponse(TigerResponse):
     def __init__(self):
         super(QuoteGrabPermissionResponse, self).__init__()
-        self.is_master = False
+        self.permissions = None
         self._is_success = None
 
     def parse_response_content(self, response_content):
@@ -18,5 +18,4 @@ def parse_response_content(self, response_content):
             self._is_success = response['is_success']
 
         if self.data:
-            data_json = json.loads(self.data)
-            self.is_master = data_json.get('is_master')
+            self.permissions = json.loads(self.data)