sycommon-python-lib 0.1.28__py3-none-any.whl → 0.1.29__py3-none-any.whl

sycommon/logging/kafka_log.py

@@ -470,12 +470,22 @@ class SYLogger:
         thread_info = SYLogger._get_execution_context()
 
         # 构建日志结构，添加线程/协程信息到threadName字段
-        request_log = {
-            "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
-            "message": msg_str,
-            "level": level,
-            "threadName": thread_info
-        }
+        request_log = {}
+        if level == "ERROR":
+            request_log = {
+                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "message": msg_str,
+                "traceback": traceback.format_exc(),
+                "level": level,
+                "threadName": thread_info
+            }
+        else:
+            request_log = {
+                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "message": msg_str,
+                "level": level,
+                "threadName": thread_info
+            }
 
         # 选择日志级别
         _log = ''

sycommon/rabbitmq/rabbitmq_client.py

@@ -608,6 +608,10 @@ class RabbitMQClient:
         if not self.message_handler or not self._is_consuming:
             logger.warning("未设置消息处理器或已停止消费")
             # await message.ack()
+            try:
+                await message.reject(requeue=True)
+            except Exception as e:
+                logger.error(f"拒绝消息失败: {e}")
             return
 
         message_id = message.message_id or str(id(message))

sycommon/synacos/feign.py

@@ -94,20 +94,21 @@ from sycommon.synacos.nacos_service import NacosService
 #         pass
 #
 #     # ------------------------------
-#     # 场景6: 文件上传 + 表单字段混合
+#     # 场景6: 多文件上传 + 表单字段混合
 #     # 请求示例: POST /products/{product_id}/images (multipart/form-data)
+#     # 支持同时上传多个文件，共用字段名 "image_file"
 #     # ------------------------------
-#     @feign_upload(field_name="image_file")  # 指定文件表单字段名
+#     @feign_upload(field_name="image_file")  # 指定所有文件的表单字段名
 #     @feign_request("POST", "/products/{product_id}/images")
 #     async def upload_product_image(
 #         self,
-#         product_id: int,  # Path参数
-#         file_path: str,  # 本地文件路径（会被转为文件上传）
-#         image_type: str,  # 表单字段（图片类型）
+#         product_id: int,  # Path参数（URL路径中的占位符）
+#         file_paths: str | list[str],  # 本地文件路径（单个路径字符串或多个路径列表）
+#         image_type: str,  # 表单字段（图片类型，如"main"、"detail"）
 #         is_primary: bool = False,  # 表单字段（是否主图）
-#         remark: Optional[str] = None  # 可选表单字段
+#         remark: Optional[str] = None  # 可选表单字段（备注信息）
 #     ) -> Dict[str, Any]:
-#         """上传商品图片（文件+表单字段）"""
+#         """上传商品图片（支持多文件 + 表单字段混合）"""
 #         pass
 #
 #     # ------------------------------
@@ -203,17 +204,18 @@ from sycommon.synacos.nacos_service import NacosService
 #     print(f"场景5 - 批量更新: 成功{batch_result.get('success_count')}个")
 #
 #     # ------------------------------
-#     # 调用场景6: 文件上传 + 表单字段
+#     # 调用场景6: 多文件上传 + 表单字段
+#     # 支持两种调用方式：单文件上传 / 多文件上传
 #     # ------------------------------
 #     if product_id:
-#         upload_result = await ProductServiceClient().upload_product_image(
+#         single_upload_result = await ProductServiceClient().upload_product_image(
 #             product_id=product_id,
-#             file_path="/tmp/product_main.jpg",  # 本地图片路径
+#             file_paths="/tmp/product_main.jpg",  # 单个文件路径或多个路径[""]
 #             image_type="main",
 #             is_primary=True,
-#             remark="商品主图"
+#             remark="商品主图（单文件）"
 #         )
-#         print(f"场景6 - 图片上传: URL={upload_result.get('image_url')}")
+#         print(f"场景6 - 单文件上传: 主图URL={single_upload_result.get('image_urls')[0]}")
 #
 #     # ------------------------------
 #     # 调用场景7: 多Path参数 + DELETE
@@ -392,16 +394,47 @@ def feign_request(method: str, path: str, headers: dict = None):
 
 
 def feign_upload(field_name: str = "file"):
-    """处理文件上传的装饰器"""
+    """处理多文件上传的装饰器（支持同字段名多文件 + 表单字段混合）"""
     def decorator(func):
         async def wrapper(*args, **kwargs):
-            file_path = kwargs.get('file_path')
-            if not file_path or not os.path.exists(file_path):
-                raise ValueError(f"文件路径不存在: {file_path}")
-            with open(file_path, 'rb') as f:
-                files = {field_name: (os.path.basename(file_path), f.read())}
-                kwargs['files'] = files
-                return await func(*args, **kwargs)
+            # 获取文件路径列表（支持单个文件路径字符串或多个文件路径列表）
+            file_paths = kwargs.get('file_paths')
+            if not file_paths:
+                raise ValueError("缺少文件路径参数: file_paths（可为单个路径字符串或列表）")
+
+            # 统一转为列表格式（兼容单个文件的情况）
+            if isinstance(file_paths, str):
+                file_paths = [file_paths]
+            if not isinstance(file_paths, list):
+                raise ValueError("file_paths 必须是字符串或列表")
+
+            # 验证所有文件是否存在
+            for path in file_paths:
+                if not os.path.exists(path):
+                    raise FileNotFoundError(f"文件不存在: {path}")
+
+            # 构建 multipart/form-data 表单数据
+            form_data = aiohttp.FormData()
+
+            # 添加所有文件（共用同一个 field_name）
+            for file_path in file_paths:
+                with open(file_path, 'rb') as f:
+                    form_data.add_field(
+                        field_name,  # 所有文件使用相同的表单字段名
+                        f.read(),
+                        filename=os.path.basename(file_path)  # 保留原文件名
+                    )
+
+            # 添加其他表单字段（从 kwargs 中提取非文件参数）
+            form_fields = {k: v for k, v in kwargs.items() if k !=
+                           'file_paths'}
+            for key, value in form_fields.items():
+                if value is not None:
+                    form_data.add_field(key, str(value))  # 表单字段转为字符串
+
+            # 将构建好的表单数据传入原函数
+            kwargs['form_data'] = form_data
+            return await func(*args, **kwargs)
         return wrapper
     return decorator
 
@@ -457,8 +490,25 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
                     for key, value in form_data.items():
                         data.add_field(key, value)
                 if files:
-                    for field_name, (filename, content) in files.items():
-                        data.add_field(field_name, content, filename=filename)
+                    # 兼容处理：同时支持字典（单文件）和列表（多文件）
+                    if isinstance(files, dict):
+                        # 处理原有字典格式（单文件）
+                        # 字典格式：{field_name: (filename, content)}
+                        for field_name, (filename, content) in files.items():
+                            data.add_field(field_name, content,
+                                           filename=filename)
+                    elif isinstance(files, list):
+                        # 处理新列表格式（多文件）
+                        # 列表格式：[(field_name, filename, content), ...]
+                        for item in files:
+                            if len(item) != 3:
+                                raise ValueError(
+                                    f"列表元素格式错误，需为 (field_name, filename, content)，实际为 {item}")
+                            field_name, filename, content = item
+                            data.add_field(field_name, content,
+                                           filename=filename)
+                    else:
+                        raise TypeError(f"files 参数必须是字典或列表，实际为 {type(files)}")
                 if file_path:
                     filename = os.path.basename(file_path)
                     with open(file_path, 'rb') as f:

sycommon/synacos/nacos_service.py

@@ -87,12 +87,18 @@ class NacosService(metaclass=SingletonMeta):
             # 心跳相关
             self._last_heartbeat_time = 0
             self._heartbeat_fail_count = 0
-            self._heartbeat_lock = threading.Lock()  # 控制心跳线程创建的锁
+            self._heartbeat_lock = threading.Lock()
             self._heartbeat_thread = None
 
             self.max_heartbeat_timeout = self.nacos_config.get(
-                'maxHeartbeatTimeout', 30)  # 最大无心跳时间(秒)
-            self._last_successful_heartbeat = time.time()  # 上次成功心跳时间戳
+                'maxHeartbeatTimeout', 30)
+            self._last_successful_heartbeat = time.time()
+            # 连接监控检查间隔（新增配置，默认30秒，避免硬编码）
+            self.connection_check_interval = self.nacos_config.get(
+                'connectionCheckInterval', 30)
+            # 配置监视线程检查间隔（默认30秒）
+            self.config_watch_interval = self.nacos_config.get(
+                'configWatchInterval', 30)
 
             # 启动配置监视线程
             self._watch_thread = threading.Thread(
@@ -586,10 +592,9 @@ class NacosService(metaclass=SingletonMeta):
 
     def monitor_connection(self):
         """优化的连接监控线程，缩短检查间隔"""
-        # 缩短检查间隔（5秒一次）
-        check_interval = self.nacos_config.get('checkInterval', 5)
-        thread_start_time = time.time()  # 线程启动时间
-        check_counter = 0  # 检查计数器
+        check_interval = self.connection_check_interval
+        thread_start_time = time.time()
+        check_counter = 0
 
         while not self._shutdown_event.is_set():
             try:
@@ -739,7 +744,7 @@ class NacosService(metaclass=SingletonMeta):
 
     def _watch_configs(self):
         """配置监听线程"""
-        check_interval = 5  # 固定检查间隔
+        check_interval = self.config_watch_interval
 
         while not self._shutdown_event.is_set():
             try:
@@ -750,7 +755,7 @@ class NacosService(metaclass=SingletonMeta):
                         self._config_cache[data_id] = new_config
             except Exception as e:
                 SYLogger.error(f"nacos:配置监视线程异常: {str(e)}")
-            self._shutdown_event.wait(check_interval)  # 检查间隔
+            self._shutdown_event.wait(check_interval)
 
     def discover_services(self, service_name: str, group: str = "DEFAULT_GROUP", version: str = None) -> List[Dict]:
         """发现服务实例列表 (与Java格式兼容)"""

{sycommon_python_lib-0.1.28.dist-info → sycommon_python_lib-0.1.29.dist-info}/METADATA

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.28
+Version: 0.1.29
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika>=9.5.7
-Requires-Dist: aiohttp>=3.12.15
+Requires-Dist: aiohttp>=3.13.1
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.118.0
+Requires-Dist: fastapi>=0.120.0
 Requires-Dist: kafka-python>=2.2.15
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: mysql-connector-python>=9.4.0
+Requires-Dist: mysql-connector-python>=9.5.0
 Requires-Dist: nacos-sdk-python>=2.0.9
-Requires-Dist: pydantic>=2.11.9
-Requires-Dist: python-dotenv>=1.1.1
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: sqlalchemy>=2.0.43
-Requires-Dist: starlette>=0.46.2
+Requires-Dist: sqlalchemy>=2.0.44
+Requires-Dist: starlette>=0.48.0
 Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.37.0
+Requires-Dist: uvicorn>=0.38.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.1.28.dist-info → sycommon_python_lib-0.1.29.dist-info}/RECORD

@@ -15,7 +15,7 @@ sycommon/health/health_check.py,sha256=EhfbhspRpQiKJaxdtE-PzpKQO_ucaFKtQxIm16F5M
 sycommon/health/metrics.py,sha256=fHqO73JuhoZkNPR-xIlxieXiTCvttq-kG-tvxag1s1s,268
 sycommon/health/ping.py,sha256=FTlnIKk5y1mPfS1ZGOeT5IM_2udF5aqVLubEtuBp18M,250
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/logging/kafka_log.py,sha256=3HjBg3WoDd3DmjtAlpyLcAVTKI-AHKrKlKmmPerq9tU,20751
+sycommon/logging/kafka_log.py,sha256=qHq4sU42aGrTm9DWYKxGDp1pe9ENfYSbzI4iPDPNvJQ,21128
 sycommon/logging/logger_wrapper.py,sha256=TiHsrIIHiQMzXgXK12-0KIpU9GhwQJOoHslakzmq2zc,357
 sycommon/logging/sql_logger.py,sha256=aEU3OGnI_51Tjyuuf4FpUi9KPTceFRuKAOyQbPzGhzM,2021
 sycommon/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,21 +35,21 @@ sycommon/models/mqlistener_config.py,sha256=PPwhAVJ2AWvVAvNox_1t0fuBKTyRH3Ui9cuu
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
-sycommon/rabbitmq/rabbitmq_client.py,sha256=Grjl_vDFe8fzyjw-bjOE_0keQwi-MQgB_GejCcBssTQ,27099
+sycommon/rabbitmq/rabbitmq_client.py,sha256=kiQBMwLJW1sx9llxHUMXHHKXY5SJdafIHyVrEOu6OO4,27259
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=_NMOO4CZy-I_anMqpzfYinz-8373_rg5FM9eqzdjGyU,3598
 sycommon/rabbitmq/rabbitmq_service.py,sha256=NWoMtRhvLjEsIX3sMgaSkrguE3gT5wLYj0u7laWZh8c,29997
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sse/event.py,sha256=k_rBJy23R7crtzQeetT0Q73D8o5-5p-eESGSs_BPOj0,2797
 sycommon/sse/sse.py,sha256=__CfWEcYxOxQ-HpLor4LTZ5hLWqw9-2X7CngqbVHsfw,10128
 sycommon/synacos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/synacos/feign.py,sha256=qALBl3YwVGvAzgx6tvwW84GptfS1u8WpapTRTygZROM,21282
-sycommon/synacos/nacos_service.py,sha256=kFGtOTKL6ZuFLebDK6gK6YNqdthhFW0aaXfG2eWzrzY,34493
+sycommon/synacos/feign.py,sha256=g2Mt3Iyxrk8doQsuIRNYMoHi-TP-k6FO5SDMWAbyqTo,24208
+sycommon/synacos/nacos_service.py,sha256=SO1s83Y8A5jyQNFhk7ZZ_BrGQyGZ8TXBKtzRYxI-uDQ,34661
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.28.dist-info/METADATA,sha256=25Dhh0fnddmOjm3MDD5YepikVWa2lZH13ER0aWSIRqA,7038
-sycommon_python_lib-0.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.28.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.28.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.28.dist-info/RECORD,,
+sycommon_python_lib-0.1.29.dist-info/METADATA,sha256=iun0vsoi2Xdi4hRDNxwAldSoOhVsM8mEdqNIoQ0Vwg8,7037
+sycommon_python_lib-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.29.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.29.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.29.dist-info/RECORD,,