sycommon-python-lib 0.1.20__py3-none-any.whl → 0.1.21__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_client.py

@@ -517,7 +517,9 @@ class RabbitMQClient:
             logger.debug("已经在消费中，返回现有consumer_tag")
             if self._consumer_tag:
                 return self._consumer_tag
-            raise Exception("消费已启动但未获取到consumer_tag")
+            # 如果_is_consuming为True但无consumer_tag，重置状态并重新启动
+            logger.warning("检测到消费状态异常（无consumer_tag），重置状态后重试")
+            self._is_consuming = False  # 重置状态
 
         if not self.is_connected:
             await self.connect()
@@ -532,16 +534,21 @@ class RabbitMQClient:
         logger.info(f"开始消费队列: {self.actual_queue_name}")
 
         try:
+            # 调用队列的consume方法，确保获取到consumer_tag
             self._consumer_tag = await self.queue.consume(
                 self._message_wrapper,
                 no_ack=False  # 手动确认消息
             )
 
+            # 确保consumer_tag有效
+            if not self._consumer_tag:
+                raise Exception("未能获取到有效的consumer_tag")
+
             logger.info(
                 f"消费者已启动，队列: {self.actual_queue_name}, tag: {self._consumer_tag}")
             return self._consumer_tag
         except Exception as e:
-            self._is_consuming = False
+            self._is_consuming = False  # 异常时重置状态
             logger.error(f"启动消费失败: {str(e)}", exc_info=True)
             raise
 

sycommon/rabbitmq/rabbitmq_service.py

@@ -97,10 +97,10 @@ class RabbitMQService:
                 password=cls._config.get('password', ""),
                 virtualhost=cls._config.get('virtual-host', "/"),
                 connection_pool_size=cls._config.get(
-                    'connection_pool_size', 2),  # 连接池大小
+                    'connection_pool_size', 5),  # 连接池大小
                 channel_pool_size=cls._config.get(
                     'channel_pool_size', 10),       # 通道池大小
-                heartbeat=cls._config.get('heartbeat', 10),
+                heartbeat=cls._config.get('heartbeat', 30),
                 app_name=cls._config.get("APP_NAME", "")
             )
 
@@ -116,9 +116,6 @@ class RabbitMQService:
 
     @classmethod
     async def _create_client(cls, queue_name: str, **kwargs) -> RabbitMQClient:
-        """
-        创建RabbitMQ客户端实例（基于连接池）
-        """
         if not cls._connection_pool:
             # 等待连接池初始化
             start_time = asyncio.get_event_loop().time()
@@ -150,8 +147,9 @@ class RabbitMQService:
             f"允许创建: {create_if_not_exists}"
         )
 
-        return RabbitMQClient(
-            connection_pool=cls._connection_pool,  # 传入连接池实例
+        # 创建客户端实例
+        client = RabbitMQClient(
+            connection_pool=cls._connection_pool,
             exchange_name=cls._config.get(
                 'exchange_name', "system.topic.exchange"),
             exchange_type=kwargs.get('exchange_type', "topic"),
@@ -172,6 +170,10 @@ class RabbitMQService:
                 'consumption_stall_threshold', 10)
         )
 
+        # 使用declare_queue控制是否声明队列（发送器不声明，监听器声明）
+        await client.connect(declare_queue=not is_sender)
+        return client
+
     @classmethod
     async def get_client(
         cls,
@@ -572,11 +574,31 @@ class RabbitMQService:
         # 确保连接有效
         if not sender.is_connected:
             logger.info(f"发送器 '{queue_name}' 连接已关闭，尝试重新连接")
-            try:
-                await sender.connect(force_reconnect=True)
-            except Exception as e:
-                logger.error(f"发送器 '{queue_name}' 重新连接失败: {str(e)}")
-                raise
+            max_retry = 3  # 最大重试次数
+            retry_count = 0
+            last_exception = None
+
+            while retry_count < max_retry:
+                try:
+                    # 尝试重连，每次重试间隔1秒
+                    await sender.connect(force_reconnect=True, declare_queue=False)
+                    logger.info(
+                        f"发送器 '{queue_name}' 第 {retry_count + 1} 次重连成功")
+                    break  # 重连成功则退出循环
+                except Exception as e:
+                    last_exception = e
+                    retry_count += 1
+                    logger.warning(
+                        f"发送器 '{queue_name}' 第 {retry_count} 次重连失败: {str(e)}"
+                    )
+                    if retry_count < max_retry:
+                        await asyncio.sleep(1)  # 重试前等待1秒
+
+            # 所有重试都失败则抛出异常
+            if retry_count >= max_retry and not sender.is_connected:
+                error_msg = f"发送器 '{queue_name}' 经过 {max_retry} 次重连仍失败"
+                logger.error(f"{error_msg}: {str(last_exception)}")
+                raise Exception(error_msg) from last_exception
 
         try:
             # 处理消息数据

sycommon/tools/snowflake.py

@@ -2,10 +2,32 @@ import uuid
 
 
 class Snowflake:
+    """基于UUID生成兼容Java long类型的唯一ID"""
+    _MAX_JAVA_LONG = 9223372036854775807  # Java long最大值（18位）
+
     @staticmethod
-    def next_id():
-        hex = uuid.uuid4().hex
-        uuid_int = int(hex, 16)
-        uuid_str = str(uuid_int).zfill(32)
-        id_str = uuid_str[:19]
-        return str(int(id_str))
+    def next_id() -> str:
+        """生成不超过Java long最大值的唯一ID字符串（18位以内）"""
+        while True:
+            # 生成UUID并转换为整数
+            uuid_int = int(uuid.uuid4().hex, 16)
+
+            # 取低63位，并强制限制不超过Java long最大值
+            id_num = uuid_int & ((1 << 63) - 1)  # 取低63位
+            id_num = min(id_num, Snowflake._MAX_JAVA_LONG)  # 强制限制最大值
+
+            # 转换为字符串并验证长度（确保18位以内）
+            id_str = str(id_num)
+            if len(id_str) <= 18:
+                return id_str
+
+
+# 使用示例
+if __name__ == "__main__":
+    # 生成1000个ID并验证
+    for _ in range(1000):
+        id_str = Snowflake.next_id()
+        id_num = int(id_str)
+        print(f"ID: {id_str} (长度: {len(id_str)})")
+        assert len(id_str) <= 18, f"ID长度超过18位: {id_str}"
+        assert id_num <= Snowflake._MAX_JAVA_LONG, f"ID超过Java long最大值: {id_num}"

{sycommon_python_lib-0.1.20.dist-info → sycommon_python_lib-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.20
+Version: 0.1.21
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.1.20.dist-info → sycommon_python_lib-0.1.21.dist-info}/RECORD

@@ -34,9 +34,9 @@ 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=XWAzQ2A6AxTwISin2biqAzbGnN6XA9T25UX0iXdxb9s,26677
+sycommon/rabbitmq/rabbitmq_client.py,sha256=Grjl_vDFe8fzyjw-bjOE_0keQwi-MQgB_GejCcBssTQ,27099
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=_NMOO4CZy-I_anMqpzfYinz-8373_rg5FM9eqzdjGyU,3598
-sycommon/rabbitmq/rabbitmq_service.py,sha256=lpYSavAwl-UOmz5gTgS3yj2ulfF-s7boL3lsMibN-JM,28881
+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
@@ -45,10 +45,10 @@ sycommon/synacos/feign.py,sha256=qALBl3YwVGvAzgx6tvwW84GptfS1u8WpapTRTygZROM,212
 sycommon/synacos/nacos_service.py,sha256=WylpKPd6Q7xsqcvxWWwsLTauuQ1H94p596IQZVT429k,33863
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
-sycommon/tools/snowflake.py,sha256=rc-VUjBMMpdAvbnHroVwfVt1xzApJbTCthUy9mglAuw,237
+sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.20.dist-info/METADATA,sha256=XzvaWcMuGVeU3zRoPoG6p0Vci9X_n9nhE68mVonmrsE,7038
-sycommon_python_lib-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.20.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.20.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.20.dist-info/RECORD,,
+sycommon_python_lib-0.1.21.dist-info/METADATA,sha256=vKk2qu8-OnQz-uQ_L215FTYtyJnvfD2noOfJjO4jfH4,7038
+sycommon_python_lib-0.1.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.21.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.21.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.21.dist-info/RECORD,,