From 179b9a2e91e13e5314a91c6989e018ff4fb1843d Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Fri, 23 May 2025 14:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminClient/AdminClientService.cs         | 20 +++++++++----------
 .../Consumer/ConsumerService.cs               |  8 ++++++++
 .../KafkaSubscribeExtensions.cs               | 10 +++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs b/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs
index febc2bf..3ec24ef 100644
--- a/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs
+++ b/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs
@@ -27,7 +27,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     Gets or sets the instance.
+    /// Gets or sets the instance.
     /// </summary>
     /// <value>
     ///     The instance.
@@ -65,7 +65,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     删除Kafka主题
+    /// 删除Kafka主题
     /// </summary>
     /// <param name="topic"></param>
     /// <returns></returns>
@@ -75,7 +75,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     获取Kafka主题列表
+    /// 获取Kafka主题列表
     /// </summary>
     /// <returns></returns>
     public async Task<List<string>> ListTopicsAsync()
@@ -85,7 +85,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     判断Kafka主题是否存在
+    /// 判断Kafka主题是否存在
     /// </summary>
     /// <param name="topic"></param>
     /// <returns></returns>
@@ -96,7 +96,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     检测分区是否存在
+    /// 检测分区是否存在
     /// </summary>
     /// <param name="topic"></param>
     /// <param name="partitions"></param>
@@ -112,7 +112,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     检测分区是否存在
+    /// 检测分区是否存在
     /// </summary>
     /// <param name="topic"></param>
     /// <param name="targetPartition"></param>
@@ -127,7 +127,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     获取主题的分区数量
+    /// 获取主题的分区数量
     /// </summary>
     /// <param name="topic"></param>
     /// <returns></returns>
@@ -140,7 +140,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     Gets the instance.
+    /// Gets the instance.
     /// </summary>
     /// <returns></returns>
     public IAdminClient GetInstance()
@@ -160,7 +160,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     Checks the topic asynchronous.
+    /// Checks the topic asynchronous.
     /// </summary>
     /// <param name="topic">The topic.</param>
     /// <returns></returns>
@@ -171,7 +171,7 @@ public class AdminClientService : IAdminClientService, ISingletonDependency
     }
 
     /// <summary>
-    ///     判断Kafka主题是否存在
+    /// 判断Kafka主题是否存在
     /// </summary>
     /// <param name="topic">主题名称</param>
     /// <param name="numPartitions">副本数量，不能高于Brokers数量</param>
diff --git a/modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs b/modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs
index ce76d19..685915d 100644
--- a/modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs
+++ b/modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs
@@ -135,6 +135,8 @@ namespace JiShe.CollectBus.Kafka.Consumer
         {
             try
             {
+                // 扩展独立线程，避免阻塞
+                _kafkaTaskScheduler.WorkerThreadExpansion();
                 await _kafkaPollyPipeline.KafkaPipeline.ExecuteAsync(async token =>
                 {
                     var consumerKey = $"{groupId}_{string.Join("_", topics)}_{typeof(TKey).Name}_{typeof(TValue).Name}";
@@ -239,6 +241,8 @@ namespace JiShe.CollectBus.Kafka.Consumer
         {
             try
             {
+                // 扩展独立线程，避免阻塞
+                _kafkaTaskScheduler.WorkerThreadExpansion();
                 await _kafkaPollyPipeline.KafkaPipeline.ExecuteAsync(async token =>
                 {
                     var consumerKey = $"{groupId}_{string.Join("_", topics)}_{typeof(Ignore).Name}_{typeof(TValue).Name}";
@@ -367,6 +371,8 @@ namespace JiShe.CollectBus.Kafka.Consumer
         {
             try
             {
+                // 扩展独立线程，避免阻塞
+                _kafkaTaskScheduler.WorkerThreadExpansion();
                 await _kafkaPollyPipeline.KafkaPipeline.ExecuteAsync(async token =>
                 {
 
@@ -538,6 +544,8 @@ namespace JiShe.CollectBus.Kafka.Consumer
         {
             try
             {
+                // 扩展独立线程，避免阻塞
+                _kafkaTaskScheduler.WorkerThreadExpansion();
                 await _kafkaPollyPipeline.KafkaPipeline.ExecuteAsync(async token =>
                 {
 
diff --git a/modules/JiShe.CollectBus.Kafka/KafkaSubscribeExtensions.cs b/modules/JiShe.CollectBus.Kafka/KafkaSubscribeExtensions.cs
index 28b719b..15eb60d 100644
--- a/modules/JiShe.CollectBus.Kafka/KafkaSubscribeExtensions.cs
+++ b/modules/JiShe.CollectBus.Kafka/KafkaSubscribeExtensions.cs
@@ -108,6 +108,8 @@ namespace JiShe.CollectBus.Kafka
                 {
                     logger.LogError(ex, "Kafka任务调度异常");
                 };
+                //logger.LogWarning($"kafka订阅工作线程数：{kafkaTaskScheduler.WorkerThreads},队列任务:{kafkaTaskScheduler.QueuedTasks}数");
+                //        
                 // 订阅调度监控测试可打开
                 //_ = Task.Factory.StartNew(async () =>
                 // {
@@ -235,15 +237,11 @@ namespace JiShe.CollectBus.Kafka
         private static async Task StartConsumerAsync(IServiceProvider provider, KafkaSubscribeAttribute attr, MethodInfo method, object subscribe, ILogger<CollectBusKafkaModule> logger)
         {
             var consumerService = provider.GetRequiredService<IConsumerService>();
-            var kafkaTaskScheduler = provider.GetRequiredService<KafkaTaskScheduler>();
-
+   
             if (attr.EnableBatch)
             {
                 Interlocked.Increment(ref _threadStartCount);
                 logger.LogInformation($"kafka开启线程消费:{_threadStartCount}");
-                // 扩展独立线程，避免阻塞
-                kafkaTaskScheduler.WorkerThreadExpansion();
-
                 await consumerService.SubscribeBatchAsync<dynamic>(attr.Topic, async (message) =>
                 {
                     try
@@ -271,8 +269,6 @@ namespace JiShe.CollectBus.Kafka
             {
                 Interlocked.Increment(ref _threadStartCount);
                 logger.LogInformation($"kafka开启线程消费:{_threadStartCount}");
-                // 扩展独立线程，避免阻塞
-                kafkaTaskScheduler.WorkerThreadExpansion();
                 await consumerService.SubscribeAsync<dynamic>(attr.Topic, async (message) =>
                 {
                     try