CloudApiRequest 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

cloud/CloudSignUtil.py

@@ -1,7 +1,5 @@
 import hashlib
-import json
 import time
-from urllib.parse import urlparse
 
 from cloud.CloudLogUtil import log
 
@@ -12,10 +10,19 @@ class CloudSignUtil:
     鉴权方式：MD5({enterpriseId}+{timestamp}+{token})
     """
     
+    @staticmethod
+    def _generate_md5_hash(sign_string):
+        """
+        生成MD5签名的内部方法
+        :param sign_string: 签名字符串
+        :return: 32位小写MD5签名
+        """
+        return hashlib.md5(sign_string.encode('utf-8')).hexdigest()
+    
     @staticmethod
     def generate_md5_signature(enterprise_id, timestamp, token):
         """
-        生成MD5签名
+        生成MD5签名（按企业编号）
         :param enterprise_id: 企业ID
         :param timestamp: 时间戳
         :param token: 访问token
@@ -23,11 +30,28 @@ class CloudSignUtil:
         """
         # 构建签名字符串：{enterpriseId}+{timestamp}+{token}
         sign_string = f"{enterprise_id}{timestamp}{token}"
-        log.info(f"签名字符串: {sign_string}")
+        return CloudSignUtil._generate_md5_hash(sign_string)
+    
+    @staticmethod
+    def generate_md5_signature_by_validate_type(validate_type, enterprise_id, department_id, timestamp, token):
+        """
+        根据验证类型生成MD5签名
+        :param validate_type: 验证类型 (1=部门编号, 2=企业编号)
+        :param enterprise_id: 企业ID
+        :param department_id: 部门编号
+        :param timestamp: 时间戳
+        :param token: 访问token
+        :return: 32位小写MD5签名
+        """
+        if validate_type == 1:
+            # validateType=1时，sign=MD5({departmentId}+{timestamp}+{部门token值})
+            sign_string = f"{department_id}{timestamp}{token}"
+        else:
+            # validateType=2时，sign=MD5({enterpriseId}+{timestamp}+{企业token值})
+            sign_string = f"{enterprise_id}{timestamp}{token}"
         
-        # 生成MD5签名
-        signature = hashlib.md5(sign_string.encode('utf-8')).hexdigest()
-        log.info(f"生成的MD5签名: {signature}")
+        signature = CloudSignUtil._generate_md5_hash(sign_string)
+        log.info(f"签名计算: validateType={validate_type}, sign_string={sign_string}, signature={signature}")
         
         return signature
     
@@ -60,8 +84,6 @@ class CloudSignUtil:
         # 添加企业ID到请求头（如果需要）
         headers['X-Enterprise-Id'] = str(enterprise_id)
         
-        log.info(f"生成的请求头: {headers}")
-        
         return headers
     
     @staticmethod
@@ -76,8 +98,23 @@ class CloudSignUtil:
         # 获取当前时间戳（秒级）
         timestamp = int(time.time())
         
-        # 生成MD5签名
-        signature = CloudSignUtil.generate_md5_signature(enterprise_id, timestamp, token)
+        # 检查验证类型
+        validate_type = 2  # 默认按企业编号验证
+        department_id = None
+        
+        if additional_params:
+            validate_type = int(additional_params.get('validateType', 2))
+            department_id = additional_params.get('departmentId')
+        
+        # 根据验证类型生成签名
+        if validate_type == 1 and department_id:
+            # 按部门编号验证
+            signature = CloudSignUtil.generate_md5_signature_by_validate_type(
+                validate_type, enterprise_id, department_id, timestamp, token
+            )
+        else:
+            # 按企业编号验证
+            signature = CloudSignUtil.generate_md5_signature(enterprise_id, timestamp, token)
         
         # 构建基础参数
         params = {
@@ -90,8 +127,6 @@ class CloudSignUtil:
         if additional_params:
             params.update(additional_params)
         
-        log.info(f"生成的请求参数: {params}")
-        
         return params
     
     @staticmethod

cloud/CloudYamlUtil.py

@@ -144,14 +144,41 @@ class CloudPlaceholderYaml:
         return self
 
     def jsonLoad(self):
-        # 把replaced_str中的"[]"替换为[]  "{}"替换为{}   "'"替换为"/""  'None换为 null'
-        replaced_str = self.replaced_str.replace('"[', '[').replace(']"', ']').replace('"{', '{').replace('}"', '}').replace("'", "\"").replace('None','null')
+        # 先将单引号替换为双引号，None替换为null
+        temp_str = self.replaced_str.replace("'", "\"").replace('None', 'null')
+        
+        # 在解析之前，检测并保护JSON字符串参数
+        # 查找模式："key": "{...}" 或 "key": "[...]"
+        # 将内部的引号转义，使其成为合法的JSON字符串
+        def escape_json_string_values(match):
+            key = match.group(1)
+            json_str = match.group(2)
+            # 转义内部的双引号
+            escaped_json_str = json_str.replace('"', '\\"')
+            return f'"{key}": "{escaped_json_str}"'
+        
+        # 匹配 "key": "{...}" 或 "key": "[...]" 的模式
+        # 使用非贪婪匹配，并且只匹配value部分被双引号包裹的情况
+        # .*? 可以匹配包含双引号的内容
+        pattern = r'"(\w+)"\s*:\s*"(\{.*?\}|\[.*?\])"'
+        temp_str = re.sub(pattern, escape_json_string_values, temp_str)
+        log.info(f"转义后的字符串: {temp_str[:300]}")
+        
         try:
-            replaced_str = json.loads(replaced_str)
-            log.info("替换后jsonLoad的str内容为：{}".format(replaced_str))
-            return replaced_str
-        except:
-            log.info(f'*************替换失败-YAML,请检查格式{replaced_str}******************')
+            # 尝试直接解析
+            parsed_result = json.loads(temp_str)
+            log.info("替换后jsonLoad的str内容为：{}".format(parsed_result))
+            return parsed_result
+        except json.JSONDecodeError as e:
+            # 如果直接解析失败，尝试旧的替换逻辑（兼容旧用例）
+            log.warning(f"JSON解析失败: {e}, 尝试旧的替换逻辑")
+            try:
+                replaced_str = self.replaced_str.replace('"[', '[').replace(']"', ']').replace('"{', '{').replace('}"', '}').replace("'", "\"").replace('None','null')
+                replaced_str = json.loads(replaced_str)
+                log.info("替换后jsonLoad的str内容为：{}".format(replaced_str))
+                return replaced_str
+            except:
+                log.info(f'*************替换失败-YAML,请检查格式{replaced_str}******************')
 
     def textLoad(self):
         return json.loads(self.replaced_str)

{cloudapirequest-1.0.0.dist-info → cloudapirequest-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CloudApiRequest
-Version: 1.0.0
+Version: 1.1.0
 Summary: 天润cloud接口测试库
 Home-page: https://www.ti-net.com.cn/
 Author: 天润-测试

cloudapirequest-1.1.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+cloud/CloudAPIRequest.py,sha256=tacJg_mSrRr7ZkGxWivcGBeAJ4QwHtrOEmySg2xBwTM,24152
+cloud/CloudApiConfig.py,sha256=s4VjgJT8cwCU2IZdZm5u5pgRxs8gp9ia5kW6P9txUWI,13027
+cloud/CloudLogUtil.py,sha256=EXnU6QXFxl_npCcJgQvhtlG8uR57NmbOovFjVMHPOpQ,935
+cloud/CloudRequestUtil.py,sha256=bsbI74p1iu4weXbDKqwhXvH1KwezvxYXdrXBMc9L3sE,4827
+cloud/CloudSignUtil.py,sha256=dyUESxWYgcvTt-nOnI3mEboVispEF0cl_vX-1d3kUOU,5493
+cloud/CloudYamlUtil.py,sha256=-WoOBSVsTQG9nbeEPocwh4eFV0Iilj1IcqXGYw5DYxs,9787
+cloud/__init__.py,sha256=RgNAN_vKhCHnwcBy0hc1ttrr5x58bO_u6TNICZDSfFw,306
+cloud/cli.py,sha256=VId1s29djJu7QrkXJc2je4fRV030vqD3nwuI23AN8Ig,1986
+cloudapirequest-1.1.0.dist-info/LICENSE,sha256=hMjjUYpALQY0E8hzysmZszKwYy2mt8tUvAFQfIIbwV4,1099
+cloudapirequest-1.1.0.dist-info/METADATA,sha256=PvbPs39nNOGRbmvDT7pLOX4gYp2MqxrXFI27D2pRGOA,608
+cloudapirequest-1.1.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+cloudapirequest-1.1.0.dist-info/top_level.txt,sha256=lBiHHi76sKOBY-DmE0iDypxZxv-TTCnvHeiFleC_PuA,6
+cloudapirequest-1.1.0.dist-info/RECORD,,

cloudapirequest-1.0.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-cloud/CloudAPIRequest.py,sha256=bji5WJJ4UQPO7EhQ2IsFMAOcG1aHtxjRU-0zwzNek2U,19441
-cloud/CloudApiConfig.py,sha256=6mF-guPi92UyjE0o7pXVd5cZKZAJHmohv16CvziVkGs,9138
-cloud/CloudLogUtil.py,sha256=EXnU6QXFxl_npCcJgQvhtlG8uR57NmbOovFjVMHPOpQ,935
-cloud/CloudRequestUtil.py,sha256=bsbI74p1iu4weXbDKqwhXvH1KwezvxYXdrXBMc9L3sE,4827
-cloud/CloudSignUtil.py,sha256=3D2etwvk1LYRE3GzoU6qXfTIM4FhEFjmT-i458Q2uCA,3849
-cloud/CloudYamlUtil.py,sha256=_WmtzLOBznwYNY02JOQxOB3B8WvgJONk-PV7grw2C_U,8392
-cloud/__init__.py,sha256=RgNAN_vKhCHnwcBy0hc1ttrr5x58bO_u6TNICZDSfFw,306
-cloud/cli.py,sha256=VId1s29djJu7QrkXJc2je4fRV030vqD3nwuI23AN8Ig,1986
-cloudapirequest-1.0.0.dist-info/LICENSE,sha256=hMjjUYpALQY0E8hzysmZszKwYy2mt8tUvAFQfIIbwV4,1099
-cloudapirequest-1.0.0.dist-info/METADATA,sha256=3uFgDtx9S2odQlKmBxEKJULLQKq-rxcix41RpnET33I,608
-cloudapirequest-1.0.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-cloudapirequest-1.0.0.dist-info/top_level.txt,sha256=lBiHHi76sKOBY-DmE0iDypxZxv-TTCnvHeiFleC_PuA,6
-cloudapirequest-1.0.0.dist-info/RECORD,,