Commit a8ba769a authored by Savorboard's avatar Savorboard

move controller services finder to DefaultConsumerServiceSelector

parent 583f6c54
...@@ -82,15 +82,6 @@ namespace Microsoft.Extensions.DependencyInjection ...@@ -82,15 +82,6 @@ namespace Microsoft.Extensions.DependencyInjection
{ {
services.AddTransient(service.Key, service.Value); services.AddTransient(service.Key, service.Value);
} }
var types = Assembly.GetEntryAssembly().ExportedTypes;
foreach (var type in types)
{
if (Helper.IsController(type.GetTypeInfo()))
{
services.AddTransient(typeof(object), type);
}
}
} }
} }
} }
\ No newline at end of file
...@@ -67,17 +67,16 @@ namespace DotNetCore.CAP.Internal ...@@ -67,17 +67,16 @@ namespace DotNetCore.CAP.Internal
IServiceProvider provider) IServiceProvider provider)
{ {
var executorDescriptorList = new List<ConsumerExecutorDescriptor>(); var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
// at cap startup time, find all Controller into the DI container,the type is object.
var controllers = provider.GetServices<object>();
foreach (var controller in controllers)
{
var typeInfo = controller.GetType().GetTypeInfo();
//double check
if (!Helper.IsController(typeInfo)) continue;
var types = Assembly.GetEntryAssembly().ExportedTypes;
foreach (var type in types)
{
var typeInfo = type.GetTypeInfo();
if (Helper.IsController(typeInfo))
{
executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo)); executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo));
} }
}
return executorDescriptorList; return executorDescriptorList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment