admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

dev #2

Merged
admin merged 176 commits from dev into master 2025-04-18 01:31:49 +00:00
Conversation 0 Commits 176 Files Changed 427 +86 -53
4 changed files with 86 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa18377f10 - Show all commits

4
src/JiShe.CollectBus.Host/appsettings.json
View File

@ -86,8 +86,8 @@
"BootstrapServers": "192.168.1.9:29092,192.168.1.9:39092,192.168.1.9:49092",
"EnableFilter": true,
"EnableAuthorization": false,
"SecurityProtocol": "SASL_PLAINTEXT",
"SaslMechanism": "PLAIN",
"SecurityProtocol": "SaslPlaintext",
"SaslMechanism": "Plain",
"SaslUserName": "lixiao",
"SaslPassword": "lixiao1980"
//"Topic": {

58
src/JiShe.CollectBus.KafkaProducer/CollectBusKafkaModule.cs
View File

@ -35,38 +35,38 @@ namespace JiShe.CollectBus.Kafka
{
var app = context.GetApplicationBuilder();
// 程序运行目录
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
if (!string.IsNullOrWhiteSpace(assemblyPath))
{
var dllFiles = Directory.GetFiles(assemblyPath, "*.dll");
var kafkaSubscriberAssemblies = new List<Assembly>();
foreach (var file in dllFiles)
{
try
{
// 跳过已加载的程序集
var assemblyName = AssemblyName.GetAssemblyName(file);
var existingAssembly = AppDomain.CurrentDomain.GetAssemblies()
.FirstOrDefault(a => a.GetName().FullName == assemblyName.FullName);
var assembly = existingAssembly ?? Assembly.LoadFrom(file);
//var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
//if (!string.IsNullOrWhiteSpace(assemblyPath))
//{
// var dllFiles = Directory.GetFiles(assemblyPath, "*.dll");
// var kafkaSubscriberAssemblies = new List<Assembly>();
// foreach (var file in dllFiles)
// {
// try
// {
// // 跳过已加载的程序集
// var assemblyName = AssemblyName.GetAssemblyName(file);
// var existingAssembly = AppDomain.CurrentDomain.GetAssemblies()
// .FirstOrDefault(a => a.GetName().FullName == assemblyName.FullName);
// var assembly = existingAssembly ?? Assembly.LoadFrom(file);
// 检查程序集是否包含 IKafkaSubscribe 的实现类
var hasSubscriber = assembly.GetTypes()
.Any(type =>
typeof(IKafkaSubscribe).IsAssignableFrom(type) && // 实现接口
!type.IsAbstract && !type.IsInterface); // 排除抽象类和接口本身
// // 检查程序集是否包含 IKafkaSubscribe 的实现类
// var hasSubscriber = assembly.GetTypes()
// .Any(type =>
// typeof(IKafkaSubscribe).IsAssignableFrom(type) && // 实现接口
// !type.IsAbstract && !type.IsInterface); // 排除抽象类和接口本身
if (hasSubscriber)
{
kafkaSubscriberAssemblies.Add(assembly);
}
}
catch{}
app.UseKafkaSubscribers(kafkaSubscriberAssemblies.ToArray());
}
}
// if (hasSubscriber)
// {
// kafkaSubscriberAssemblies.Add(assembly);
// }
// }
// catch{}
// app.UseKafkaSubscribers(kafkaSubscriberAssemblies.ToArray());
// }
//}
// 获取程序集
//app.UseKafkaSubscribers(new[] { Assembly.Load("JiShe.CollectBus.Application")});
app.UseKafkaSubscribers(Assembly.Load("JiShe.CollectBus.Application"));
}
}
}

50
src/JiShe.CollectBus.KafkaProducer/KafkaSubcribesExtensions.cs
View File

@ -12,12 +12,47 @@ namespace JiShe.CollectBus.Kafka
{
public static class KafkaSubcribesExtensions
{
/// <summary>
/// 添加Kafka订阅
/// </summary>
/// <param name="app"></param>
/// <param name="assembly"></param>
public static void UseKafkaSubscribers(this IApplicationBuilder app, Assembly[] assemblys)
///// <summary>
///// 添加Kafka订阅
///// </summary>
///// <param name="app"></param>
///// <param name="assembly"></param>
//public static void UseKafkaSubscribers(this IApplicationBuilder app, Assembly[] assemblys)
//{
// var provider = app.ApplicationServices;
// var lifetime = provider.GetRequiredService<IHostApplicationLifetime>();
// lifetime.ApplicationStarted.Register(() =>
// {
// var logger = provider.GetRequiredService<ILogger<CollectBusKafkaModule>>();
// int threadCount = 0;
// int topicCount = 0;
// foreach (Assembly assembly in assemblys)
// {
// var subscribeTypes = assembly.GetTypes()
// .Where(t => typeof(IKafkaSubscribe).IsAssignableFrom(t))
// .ToList();
// if (subscribeTypes.Count == 0) return;
// foreach (var subscribeType in subscribeTypes)
// {
// var subscribes = provider.GetServices(subscribeType).ToList();
// subscribes.ForEach(subscribe => {
// if (subscribe is IKafkaSubscribe)
// {
// Tuple<int, int> tuple = BuildKafkaSubscriber(subscribe, provider, logger);
// threadCount += tuple.Item1;
// topicCount += tuple.Item2;
// }
// });
// }
// }
// logger.LogInformation($"kafka订阅主题:{topicCount}数,共启动:{threadCount}线程");
// });
//}
public static void UseKafkaSubscribers(this IApplicationBuilder app, Assembly assembly)
{
var provider = app.ApplicationServices;
var lifetime = provider.GetRequiredService<IHostApplicationLifetime>();
@ -27,8 +62,6 @@ namespace JiShe.CollectBus.Kafka
var logger = provider.GetRequiredService<ILogger<CollectBusKafkaModule>>();
int threadCount = 0;
int topicCount = 0;
foreach (Assembly assembly in assemblys)
{
var subscribeTypes = assembly.GetTypes()
.Where(t => typeof(IKafkaSubscribe).IsAssignableFrom(t))
.ToList();
@ -47,7 +80,6 @@ namespace JiShe.CollectBus.Kafka
}
});
}
}
logger.LogInformation($"kafka订阅主题:{topicCount}数,共启动:{threadCount}线程");
});
}

1
src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs
View File

@ -12,6 +12,7 @@ using JiShe.CollectBus.IotSystems.MessageReceiveds;
using JiShe.CollectBus.IotSystems.Protocols;
using MassTransit;
using DotNetCore.CAP;
using JiShe.CollectBus.Kafka.Producer;
namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
{