Merge branch 'feature_cgplay' into 'dev'

Feature cgplay

See merge request server/openapi/openapi-python-sdk!105

Author: tigersk

tigeropen/common/util/web_utils.py

@@ -53,16 +53,26 @@ def get_http_connection(url, query_string, timeout):
 
 
 def do_post(url, query_string=None, headers=None, params=None, timeout=15, charset=None):
+    return do_request('POST', url=url, query_string=query_string, headers=headers, params=params, timeout=timeout,
+                      charset=charset)
+
+
+def do_get(url, query_string=None, headers=None, params=None, timeout=15, charset=None):
+    return do_request('GET', url=url, query_string=query_string, headers=headers, params=params, timeout=timeout,
+                      charset=charset)
+
+
+def do_request(method, url, query_string=None, headers=None, params=None, timeout=15, charset=None):
     url, connection = get_http_connection(url, query_string, timeout)
 
     try:
         connection.connect()
     except Exception as e:
-        raise RequestException('[' + THREAD_LOCAL.uuid + ']post connect failed. ' + str(e))
+        raise RequestException('[' + THREAD_LOCAL.uuid + ']' + method + ' connect failed. ' + str(e))
     try:
-        connection.request("POST", url, body=json.dumps(params), headers=headers)
+        connection.request(method, url, body=json.dumps(params), headers=headers)
     except Exception as e:
-        raise RequestException('[' + THREAD_LOCAL.uuid + ']post request failed. ' + str(e))
+        raise RequestException('[' + THREAD_LOCAL.uuid + ']' + method + ' request failed. ' + str(e))
     response = connection.getresponse()
     result = response.read()
 

tigeropen/tiger_open_config.py

@@ -4,13 +4,24 @@
 
 @author: gaoan
 """
+import json
+
 from tigeropen.common.consts import Language
 from tigeropen.common.util.signature_utils import read_private_key
+from tigeropen.common.util.web_utils import do_get
+
+DEFAULT_DOMAIN = 'openapi.tigerfintech.com'
+DEFAULT_SANDBOX_DOMAIN = 'openapi-sandbox.tigerfintech.com'
+DOMAIN_GARDEN_ADDRESS = 'https://cg.play-analytics.com/'
+
+HTTPS_PROTOCAL = 'https://'
+SSL_PROTOCAL = 'ssl'
+GATEWAY_SUFFIX = '/gateway'
 
 # 老虎证券开放平台网关地址
-SERVER_URL = 'https://openapi.skytigris.cn/gateway'
+SERVER_URL = HTTPS_PROTOCAL + DEFAULT_DOMAIN + GATEWAY_SUFFIX
 # 老虎证券开放平台 socket 连接域名端口
-SOCKET_HOST_PORT = ('ssl', 'openapi.skytigris.cn', 8883)
+SOCKET_HOST_PORT = (SSL_PROTOCAL, DEFAULT_DOMAIN, 9883)
 # 老虎证券开放平台公钥
 TIGER_PUBLIC_KEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNF3G8SoEcCZh2rshUbayDgLLrj6rKgzNMxDL2HS' \
                    'nKcB0+GPOsndqSv+a4IBu9+I3fyBp5hkyMMG2+AXugd9pMpy6VxJxlNjhX1MYbNTZJUT4nudki4uh+LM' \
@@ -25,15 +36,15 @@
 TIMEOUT = 15
 
 # sandbox 环境配置
-SANDBOX_SERVER_URL = 'https://openapi-sandbox.skytigris.cn/gateway'
-SANDBOX_SOCKET_HOST_PORT = ('ssl', 'openapi-sandbox.skytigris.cn', 8885)
+SANDBOX_SERVER_URL = HTTPS_PROTOCAL + DEFAULT_SANDBOX_DOMAIN + GATEWAY_SUFFIX
+SANDBOX_SOCKET_HOST_PORT = (SSL_PROTOCAL, DEFAULT_SANDBOX_DOMAIN, 9885)
 SANDBOX_TIGER_PUBLIC_KEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbm21i11hgAENGd3/f280PSe4g9YGkS3TEXBY' \
                            'MidihTvHHf+tJ0PYD0o3PruI0hl3qhEjHTAxb75T5YD3SGK4IBhHn/Rk6mhqlGgI+bBrBVYaXixm' \
                            'HfRo75RpUUuWACyeqQkZckgR0McxuW9xRMIa2cXZOoL1E4SL4lXKGhKoWbwIDAQAB'
 
 
 class TigerOpenClientConfig:
-    def __init__(self, sandbox_debug=False):
+    def __init__(self, sandbox_debug=False, enable_dynamic_domain=True):
         # 开发者应用id
         self._tiger_id = ''
         # 授权账户
@@ -44,102 +55,102 @@ def __init__(self, sandbox_debug=False):
         self._sign_type = SIGN_TYPE
         # 机构交易员专有密钥
         self._secret_key = ''
-
-        # 老虎证券开放平台网关地址
-        self._server_url = SERVER_URL
-        self._socket_host_port = SOCKET_HOST_PORT
-        # 老虎证券开放平台公钥
-        self._tiger_public_key = TIGER_PUBLIC_KEY
-
-        if sandbox_debug:
-            self._server_url = SANDBOX_SERVER_URL
-            self._socket_host_port = SANDBOX_SOCKET_HOST_PORT
-            self._tiger_public_key = SANDBOX_TIGER_PUBLIC_KEY
         # 请求字符集，默认utf-8
         self._charset = CHARSET
         # 语言
         self._language = LANGUAGE
-        
         # 以下为可选参数
         # 请求读取超时，单位秒，默认15s
         self._timeout = TIMEOUT
-    
+        self._sandbox_debug = sandbox_debug
+        # 老虎证券开放平台公钥
+        self._tiger_public_key = TIGER_PUBLIC_KEY
+        # 老虎证券开放平台网关地址
+        self._server_url = SERVER_URL
+        self._socket_host_port = SOCKET_HOST_PORT
+        if sandbox_debug:
+            self._tiger_public_key = SANDBOX_TIGER_PUBLIC_KEY
+            self._server_url = SANDBOX_SERVER_URL
+            self._socket_host_port = SANDBOX_SOCKET_HOST_PORT
+        if enable_dynamic_domain:
+            self.refresh_domains()
+
     @property
     def tiger_id(self):
         return self._tiger_id
-    
+
     @tiger_id.setter
     def tiger_id(self, value):
         self._tiger_id = value
-    
+
     @property
     def account(self):
         return self._account
-    
+
     @account.setter
     def account(self, value):
         self._account = value
-    
+
     @property
     def sign_type(self):
         return self._sign_type
-    
+
     @sign_type.setter
     def sign_type(self, value):
         self._sign_type = value
-    
+
     @property
     def private_key(self):
         return self._private_key
-    
+
     @private_key.setter
     def private_key(self, value):
         self._private_key = value
-    
+
     @property
     def tiger_public_key(self):
         return self._tiger_public_key
-    
+
     @tiger_public_key.setter
     def tiger_public_key(self, value):
         self._tiger_public_key = value
-    
+
     @property
     def server_url(self):
         return self._server_url
-    
+
     @server_url.setter
     def server_url(self, value):
         self._server_url = value
-    
+
     @property
     def socket_host_port(self):
         return self._socket_host_port
-    
+
     @socket_host_port.setter
     def socket_host_port(self, value):
         self._socket_host_port = value
-    
+
     @property
     def charset(self):
         return self._charset
-    
+
     @charset.setter
     def charset(self, value):
         self._charset = value
-    
+
     @property
     def language(self):
         return self._language
-    
+
     @language.setter
     def language(self, value):
         self._language = value
-    
+
     @property
     def timeout(self):
         return self._timeout
-    
+
     @timeout.setter
     def timeout(self, value):
         self._timeout = value
@@ -152,9 +163,45 @@ def secret_key(self):
     def secret_key(self, value):
         self._secret_key = value
 
+    def refresh_domains(self):
+        """
+        domains data like:
+        {
+            "ret": 0,
+            "serverTime": 1650966832923,
+            "items": [
+                {
+                    "openapi": {
+                        "socket_port": 9883,
+                        "COMMON": "https://openapi.tigerfintech.com"
+                    },
+                    "openapi-sandbox": {
+                        "socket_port": 9885,
+                        "COMMON": "https://openapi-sandbox.tigerfintech.com"
+                    }
+                }
+            ]
+        }
+        :return:
+        """
+        try:
+            result = json.loads(do_get(DOMAIN_GARDEN_ADDRESS, headers=dict(), params=dict(), timeout=1).decode()) \
+                .get('items')
+            if result:
+                for item in result:
+                    conf = item.get('openapi-sandbox', dict()) if self._sandbox_debug else item.get('openapi', dict())
+                    host = conf.get('COMMON')
+                    socket_port = conf.get('socket_port')
+                    if host and socket_port:
+                        self._server_url = host + GATEWAY_SUFFIX
+                        self._socket_host_port = (SSL_PROTOCAL, host.rpartition(HTTPS_PROTOCAL)[-1], socket_port)
+        except:
+            pass
+
 
 def get_client_config(private_key_path, tiger_id, account, sandbox_debug=False, sign_type=None, timeout=None,
-                      language=None, charset=None, server_url=None, socket_host_port=None, secret_key=None):
+                      language=None, charset=None, server_url=None, socket_host_port=None, secret_key=None,
+                      enable_dynamic_domain=True):
     """
     生成客户端配置
     :param private_key_path: 私钥文件路径, 如 '/Users/tiger/.ssh/rsa_private_key.pem'
@@ -168,9 +215,10 @@ def get_client_config(private_key_path, tiger_id, account, sandbox_debug=False,
     :param server_url: 网关地址
     :param socket_host_port: 推送长连接的域名端口, 值为协议, 域名, 端口构成的三元组
     :param secret_key: 机构交易员专有密钥 (个人开发者无需指定)
+    :param enable_dynamic_domain: 是否初始化时拉取服务域名
     :return:
     """
-    config = TigerOpenClientConfig(sandbox_debug=sandbox_debug)
+    config = TigerOpenClientConfig(sandbox_debug=sandbox_debug, enable_dynamic_domain=enable_dynamic_domain)
     config.private_key = read_private_key(private_key_path)
     config.tiger_id = tiger_id
     config.account = account
@@ -189,4 +237,3 @@ def get_client_config(private_key_path, tiger_id, account, sandbox_debug=False,
     if secret_key:
         config.secret_key = secret_key
     return config
-