i2up-python-sdk 9.1.3.1__tar.gz → 9.1.3.2__tar.gz

{i2up_python_sdk-9.1.3.1/i2up_Python_SDK.egg-info → i2up_python_sdk-9.1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: i2up-python-sdk
-Version: 9.1.3.1
+Version: 9.1.3.2
 Summary: 英方统一数据管理平台python版本SDK
 Author: wanghl
 Author-email: wanghl@info2soft.com

{i2up_python_sdk-9.1.3.1 → i2up_python_sdk-9.1.3.2}/README.md

@@ -102,6 +102,11 @@ config.set_default(None, None, None, 'https://172.0.0.1:58086/api')
     # sk = 'your sk' # 英方平台 Secret Key
     # a = Auth('', '', 'ak', ak, sk)
 
+    # 3. 使用 ak + sk 模拟token的方式创建 Auth 对象
+    # ak = 'your ak' # 英方平台 Access Key
+    # sk = 'your sk' # 英方平台 Secret Key
+    # a = Auth.ak(ak, sk)
+
     # 参考 API 文档，构造请求参数
     body = {
         'search_value': '',

{i2up_python_sdk-9.1.3.1 → i2up_python_sdk-9.1.3.2/i2up_Python_SDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: i2up-python-sdk
-Version: 9.1.3.1
+Version: 9.1.3.2
 Summary: 英方统一数据管理平台python版本SDK
 Author: wanghl
 Author-email: wanghl@info2soft.com

{i2up_python_sdk-9.1.3.1 → i2up_python_sdk-9.1.3.2}/info2soft/common/Auth.py

@@ -40,7 +40,11 @@ class Auth(object):
     def get_token(self):
         user = self._username
         pwd = self._pwd
-        r = getToken(user, pwd)
+        # 如果有 access_key 和 secret_key，则使用 ak/sk 方式获取 token
+        if self.access_key and self.secret_key:
+            r = getToken(user, pwd, self.access_key, self.secret_key)
+        else:
+            r = getToken(user, pwd)
         self._token = r[0]
         self._ssoToken = r[1]
         self.token = r[0]
@@ -50,7 +54,11 @@ class Auth(object):
     def refresh_token(self):
         r = refreshToken()
         if r[0] is None:
-            r = getToken(self._username, self._pwd)
+            # 如果刷新失败，重新获取 token
+            if self.access_key and self.secret_key:
+                r = getToken(self._username, self._pwd, self.access_key, self.secret_key)
+            else:
+                r = getToken(self._username, self._pwd)
         self._token = r[0]
         self._ssoToken = r[1]
         self.token = r[0]
@@ -180,6 +188,33 @@ class Auth(object):
 
         return '{0}'.format(self._token)
 
+    @staticmethod
+    def ak(access_key, secret_key):
+        if not (access_key and secret_key):
+            raise ValueError('access_key and secret_key are required')
+        
+        # 创建一个 Auth 对象，使用 token 方式
+        # username 和 pwd 设置为空字符串，因为我们使用 ak/sk 来获取 token
+        auth = Auth.__new__(Auth)
+        auth._username = ''
+        auth._pwd = ''
+        auth._token = ''
+        auth._ssoToken = ''
+        auth.auth_type = 'token'
+        auth.access_key = access_key
+        auth.secret_key = secret_key
+        auth.token = ''
+        auth.ssoToken = ''
+
+        # 使用 ak/sk 获取 token
+        r = getToken('', '', access_key, secret_key)
+        auth._token = r[0]
+        auth._ssoToken = r[1]
+        auth.token = r[0]
+        auth.ssoToken = r[1]
+
+        return auth
+
     @staticmethod
     def __checkKey(username, pwd, access_key, secret_key):
         if (not (username and pwd)) and (not (access_key and secret_key)):

i2up_python_sdk-9.1.3.2/info2soft/common/Cache.py

@@ -0,0 +1,152 @@
+import linecache
+import os
+import json
+import struct
+import random
+import requests
+
+from info2soft.common.Rsa import Rsa
+from info2soft import https
+from info2soft import config
+
+
+def getToken(username, pwd, access_key='', secret_key=''):
+    token = ''
+    ssoToken = ''
+    # path = os.path.split(os.path.realpath(__file__))[0] + '/token.dat'
+    path = os.sep.join([os.path.split(os.path.realpath(__file__))[0], 'token.dat'])
+    # token文件不存在
+    if not os.path.exists(path):
+        lists = []
+        code = -1
+    else:
+        lists = linecache.getlines(path)
+        code = 0
+    # 鉴定 token.txt 不为空
+    if len(lists) != 0:
+        token = lists[0].strip('\n')
+        ssoToken = lists[1].strip('\n')
+        # token文件有就用本地的，防止每个接口重新获取token
+        if token is not None:
+            return [token, ssoToken]
+        url = '{0}/auth/token'.format(config.get_default('default_api_host'))
+        data = {
+            'access_token': ssoToken
+        }
+        res = https._get(url, data)
+        if res is not None:
+            code = res[0]['data']['code']
+        else:
+            code = -1
+    if code != 0 or token == '':
+        url = '{0}/auth/token'.format(config.get_default('default_api_host'))
+        # 如果提供了 access_key 和 secret_key，使用 ak/sk 方式获取 token
+        if access_key and secret_key:
+            token, ssoToken = _get_token_by_ak(url, access_key, secret_key, path)
+        else:
+            # 使用用户名密码方式获取 token
+            rsa = Rsa()
+            data = {
+                'username': username,
+                'pwd': rsa.rsaEncrypt(pwd)
+            }
+            r = https._post(url, data)
+            if r[0] is not None and r[0]['ret'] == 200 and r[0]['data']['code'] == 0:
+                # 密码错误处理
+                token = r[0]['data']['token']
+                ssoToken = ''
+                refreshToken = r[0]['data']['refresh_token']
+                with open(path, mode='w+', encoding='UTF-8') as tokenFile:
+                    tokenFile.write(token + '\n' + ssoToken + '\n' + refreshToken)
+                    tokenFile.close()
+            else:
+                if r[0] is None:
+                    print('Can Not Connect Host')
+                else:
+                    print(r[0]['data']['message'])
+                exit()
+    return [token, ssoToken]
+
+
+def _get_token_by_ak(url, access_key, secret_key, token_file_path):
+    """使用 AK/SK 方式获取 token
+    
+    Args:
+        url: auth/token 的完整 URL
+        access_key: 访问密钥
+        secret_key: 安全密钥
+        token_file_path: token 文件保存路径
+        
+    Returns:
+        [token, ssoToken] 元组
+    """
+    # 生成随机参数
+    data = {}
+    data['_'] = hex(struct.unpack('<I', struct.pack('<f', random.random()))[0])[2:]
+    
+    # 直接调用 https.py 中的 _generate_header 函数生成请求头和签名
+    # 注意：这里使用 'ak' 作为 auth_type，这样 _generate_header 会使用 secret_key 进行签名
+    from info2soft.https import _generate_header
+    headers = _generate_header('ak', '', access_key, secret_key, 'post', url, data['_'], data)
+    
+    # 发送请求
+    requests.packages.urllib3.disable_warnings()
+    response = requests.post(
+        url,
+        data=json.dumps(data),
+        headers=headers,
+        timeout=config.get_default('connection_timeout'),
+        verify=False
+    )
+    
+    # 处理响应
+    if response.status_code == 200:
+        result = response.json()
+        if result.get('data', {}).get('code') == 0:
+            token = result['data']['token']
+            ssoToken = ''
+            refresh_token = result['data']['refresh_token']
+            with open(token_file_path, mode='w+', encoding='UTF-8') as token_file:
+                token_file.write(token + '\n' + ssoToken + '\n' + refresh_token)
+            return token, ssoToken
+        else:
+            print(result['data']['message'])
+            exit()
+    else:
+        print('Can Not Connect Host')
+        exit()
+
+
+def refreshToken():
+    token = ''
+    ssoToken = ''
+    path = os.sep.join([os.path.split(os.path.realpath(__file__))[0], 'token.dat'])
+    lists = linecache.getlines(path)
+    refresh_token = lists[2].strip('\n')
+    # 删除token文件
+    os.remove(path)
+    url = '{0}/auth/refresh_token'.format(config.get_default('default_api_host'))
+    data = {
+        'refresh_token': refresh_token,
+    }
+    r = https._put(url, data)
+    if r[0] is not None and r[0]['ret'] == 200 and r[0]['data']['code'] == 0:
+        # 密码错误处理
+        token = r[0]['data']['token']
+        ssoToken = ''
+        refreshToken = r[0]['data']['refresh_token']
+        with open(path, mode='w+', encoding='UTF-8') as tokenFile:
+            tokenFile.write(token + '\n' + ssoToken + '\n' + refreshToken)
+            tokenFile.close()
+    elif r[0] is not None and r[0]['ret'] == 200 and (r[0]['data']['code'] == 'auth.refresh_token_invalid' or r[0]['data']['code'] == 1010001109):
+        print('refresh_token is invalid, need to get token again')
+        # 返回None，用于后续判断是否需要重新获取token
+        return [None, None]
+    else:
+        if r[0] is None:
+            print('Can Not Connect Host')
+        else:
+            print(r[0]['data']['message'])
+        exit()
+    return [token, ssoToken]
+

{i2up_python_sdk-9.1.3.1 → i2up_python_sdk-9.1.3.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="i2up-python-sdk", # 模块名称
-    version = "9.1.3.1", # 当前版本
+    version = "9.1.3.2", # 当前版本
     author="wanghl", # 作者
     author_email="wanghl@info2soft.com", # 作者邮箱
     description="英方统一数据管理平台python版本SDK", # 简短介绍

i2up_python_sdk-9.1.3.1/info2soft/common/Cache.py

@@ -1,93 +0,0 @@
-from info2soft.common.Rsa import Rsa
-from info2soft import https
-from info2soft import config
-import linecache
-import os
-
-
-def getToken(username, pwd):
-    token = ''
-    ssoToken = ''
-    # path = os.path.split(os.path.realpath(__file__))[0] + '/token.dat'
-    path = os.sep.join([os.path.split(os.path.realpath(__file__))[0], 'token.dat'])
-    # token文件不存在
-    if not os.path.exists(path):
-        lists = []
-        code = -1
-    else:
-        lists = linecache.getlines(path)
-        code = 0
-    # 鉴定 token.txt 不为空
-    if len(lists) != 0:
-        token = lists[0].strip('\n')
-        ssoToken = lists[1].strip('\n')
-        # token文件有就用本地的，防止每个接口重新获取token
-        if token is not None:
-            return [token, ssoToken]
-        url = '{0}/auth/token'.format(config.get_default('default_api_host'))
-        data = {
-            'access_token': ssoToken
-        }
-        res = https._get(url, data)
-        if res is not None:
-            code = res[0]['data']['code']
-        else:
-            code = -1
-    if code != 0 or token == '':
-        url = '{0}/auth/token'.format(config.get_default('default_api_host'))
-        rsa = Rsa()
-        data = {
-            'username': username,
-            'pwd': rsa.rsaEncrypt(pwd)
-        }
-        r = https._post(url, data)
-        if r[0] is not None and r[0]['ret'] == 200 and r[0]['data']['code'] == 0:
-            # 密码错误处理
-            token = r[0]['data']['token']
-            ssoToken = ''
-            refreshToken = r[0]['data']['refresh_token']
-            with open(path, mode='w+', encoding='UTF-8') as tokenFile:
-                tokenFile.write(token + '\n' + ssoToken + '\n' + refreshToken)
-                tokenFile.close()
-        else:
-            if r[0] is None:
-                print('Can Not Connect Host')
-            else:
-                print(r[0]['data']['message'])
-            exit()
-    return [token, ssoToken]
-
-
-def refreshToken():
-    token = ''
-    ssoToken = ''
-    path = os.sep.join([os.path.split(os.path.realpath(__file__))[0], 'token.dat'])
-    lists = linecache.getlines(path)
-    refresh_token = lists[2].strip('\n')
-    # 删除token文件
-    os.remove(path)
-    url = '{0}/auth/refresh_token'.format(config.get_default('default_api_host'))
-    data = {
-        'refresh_token': refresh_token,
-    }
-    r = https._put(url, data)
-    if r[0] is not None and r[0]['ret'] == 200 and r[0]['data']['code'] == 0:
-        # 密码错误处理
-        token = r[0]['data']['token']
-        ssoToken = ''
-        refreshToken = r[0]['data']['refresh_token']
-        with open(path, mode='w+', encoding='UTF-8') as tokenFile:
-            tokenFile.write(token + '\n' + ssoToken + '\n' + refreshToken)
-            tokenFile.close()
-    elif r[0] is not None and r[0]['ret'] == 200 and (r[0]['data']['code'] == 'auth.refresh_token_invalid' or r[0]['data']['code'] == 1010001109):
-        print('refresh_token is invalid, need to get token again')
-        # 返回None，用于后续判断是否需要重新获取token
-        return [None, None]
-    else:
-        if r[0] is None:
-            print('Can Not Connect Host')
-        else:
-            print(r[0]['data']['message'])
-        exit()
-    return [token, ssoToken]
-