Skip to content

丁松杰 / Pole

Go to a project
Commit 88875948 by dingsongjie
Options

修复 bug

parent 4ffee379
Inline Side-by-side
Showing with 42 additions and 16 deletions
samples/apis/Backet.Api/Domain/Event/BacketCreatedEvent.cs → samples/apis/Backet.Api/Domain/Events/BacketCreatedEvent.cs
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Backet.Api.Domain.Event namespace Backet.Api.Domain.Event
{ {
public class BacketCreatedEvent:IEvent [EventInfo(EventName = "Backet")]
public class BacketCreatedEvent : IEvent
{ {
public string BacketId { get; set; } public string BacketId { get; set; }
} }
......
src/Pole.Core/EventBus/Event/EventAttribute.cs → src/Pole.Core/EventBus/Event/EventInfoAttribute.cs
...@@ -5,7 +5,7 @@ using System.Text; ...@@ -5,7 +5,7 @@ using System.Text;
namespace Pole.Core.EventBus.Event namespace Pole.Core.EventBus.Event
{ {
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
public class EventAttribute: Attribute public class EventInfoAttribute: Attribute
{ {
public string EventName { get; set; } public string EventName { get; set; }
} }
......
src/Pole.Core/EventBus/ObserverUnitContainer.cs
...@@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection; ...@@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
using Pole.Core.EventBus.EventHandler; using Pole.Core.EventBus.EventHandler;
using System.Linq; using System.Linq;
using Pole.Core.Exceptions; using Pole.Core.Exceptions;
using Pole.Core.EventBus.Event;
namespace Pole.Core.EventBus namespace Pole.Core.EventBus
{ {
...@@ -16,17 +17,28 @@ namespace Pole.Core.EventBus ...@@ -16,17 +17,28 @@ namespace Pole.Core.EventBus
readonly ConcurrentDictionary<string, List<object>> unitDict = new ConcurrentDictionary<string, List<object>>(); readonly ConcurrentDictionary<string, List<object>> unitDict = new ConcurrentDictionary<string, List<object>>();
public ObserverUnitContainer(IServiceProvider serviceProvider) public ObserverUnitContainer(IServiceProvider serviceProvider)
{ {
var eventHandlerList = new List<(Type, EventHandlerAttribute)>(); var eventHandlerList = new List<(Type, EventInfoAttribute)>();
foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<ObserverUnitContainer>>())) foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<ObserverUnitContainer>>()))
{ {
foreach (var type in assembly.GetTypes().Where(m => typeof(IPoleEventHandler).IsAssignableFrom(m) && m.IsClass && !m.IsAbstract && !typeof(Orleans.Runtime.GrainReference).IsAssignableFrom(m))) foreach (var type in assembly.GetTypes().Where(m => typeof(IPoleEventHandler).IsAssignableFrom(m) && m.IsClass && !m.IsAbstract && !typeof(Orleans.Runtime.GrainReference).IsAssignableFrom(m)))
{ {
var attribute = type.GetCustomAttributes(typeof(EventHandlerAttribute), false).FirstOrDefault();
var eventHandlerInterface = type.GetInterfaces().FirstOrDefault(type => typeof(IPoleEventHandler).IsAssignableFrom(type) && !type.IsGenericType); var eventHandlerInterface = type.GetInterfaces().FirstOrDefault(type => typeof(IPoleEventHandler).IsAssignableFrom(type) && !type.IsGenericType);
var basePoleEventHandlerInterface= eventHandlerInterface.GetInterfaces().FirstOrDefault(m=>m.IsGenericType);
if (basePoleEventHandlerInterface == null)
{
throw new PoleEventHandlerImplementException("PoleEventHandler interface must Inherited from IPoleEventHandler<TEvent>");
}
var eventType= basePoleEventHandlerInterface.GetGenericArguments().FirstOrDefault();
if (eventType == null)
{
throw new PoleEventHandlerImplementException("PoleEventHandler interface must Inherited from IPoleEventHandler<TEvent>");
}
var attribute = eventType.GetCustomAttributes(typeof(EventInfoAttribute), false).FirstOrDefault();
if (attribute != null) if (attribute != null)
{ {
eventHandlerList.Add((eventHandlerInterface, (EventHandlerAttribute)attribute)); eventHandlerList.Add((eventHandlerInterface, (EventInfoAttribute)attribute));
} }
else else
{ {
......
src/Pole.Core/Serialization/EventTypeFinder.cs
...@@ -25,8 +25,8 @@ namespace Pole.Core.Serialization ...@@ -25,8 +25,8 @@ namespace Pole.Core.Serialization
foreach (var type in assembly.GetTypes().Where(m => baseEventType.IsAssignableFrom(m)&&!m.IsAbstract)) foreach (var type in assembly.GetTypes().Where(m => baseEventType.IsAssignableFrom(m)&&!m.IsAbstract))
{ {
var eventCode = type.FullName; var eventCode = type.FullName;
var eventAttribute = type.GetCustomAttributes(typeof(EventAttribute),false).FirstOrDefault(); var eventAttribute = type.GetCustomAttributes(typeof(EventInfoAttribute),false).FirstOrDefault();
if (eventAttribute is EventAttribute attribute ) if (eventAttribute is EventInfoAttribute attribute )
{ {
eventCode = attribute.EventName; eventCode = attribute.EventName;
} }
......
src/Pole.EventBus.Rabbitmq/Core/EventBusContainer.cs
...@@ -38,8 +38,8 @@ namespace Pole.EventBus.RabbitMQ ...@@ -38,8 +38,8 @@ namespace Pole.EventBus.RabbitMQ
} }
public async Task AutoRegister() public async Task AutoRegister()
{ {
var eventList = new List<(Type type, EventAttribute config)>(); var eventList = new List<(Type type, EventInfoAttribute config)>();
var evenHandlertList = new List<(Type type, EventHandlerAttribute config)>(); var evenHandlertList = new List<(Type type, EventInfoAttribute config)>();
AddEventAndEventHandlerInfoList(eventList, evenHandlertList); AddEventAndEventHandlerInfoList(eventList, evenHandlertList);
foreach (var (type, config) in eventList) foreach (var (type, config) in eventList)
{ {
...@@ -110,21 +110,21 @@ namespace Pole.EventBus.RabbitMQ ...@@ -110,21 +110,21 @@ namespace Pole.EventBus.RabbitMQ
#region helpers #region helpers
private void AddEventAndEventHandlerInfoList(List<(Type type, EventAttribute config)> eventList, List<(Type type, EventHandlerAttribute config)> eventHandlertList) private void AddEventAndEventHandlerInfoList(List<(Type type, EventInfoAttribute config)> eventList, List<(Type type, EventInfoAttribute config)> eventHandlertList)
{ {
foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<EventBusContainer>>())) foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<EventBusContainer>>()))
{ {
foreach (var type in assembly.GetTypes().Where(m => typeof(IEvent).IsAssignableFrom(m) && m.IsClass)) foreach (var type in assembly.GetTypes().Where(m => typeof(IEvent).IsAssignableFrom(m) && m.IsClass))
{ {
var attribute = type.GetCustomAttributes(typeof(EventAttribute), false).FirstOrDefault(); var attribute = type.GetCustomAttributes(typeof(EventInfoAttribute), false).FirstOrDefault();
if (attribute != null) if (attribute != null)
{ {
eventList.Add((type, (EventAttribute)attribute)); eventList.Add((type, (EventInfoAttribute)attribute));
} }
else else
{ {
eventList.Add((type, new EventAttribute() { EventName = type.FullName })); eventList.Add((type, new EventInfoAttribute() { EventName = type.FullName }));
} }
} }
} }
...@@ -132,13 +132,25 @@ namespace Pole.EventBus.RabbitMQ ...@@ -132,13 +132,25 @@ namespace Pole.EventBus.RabbitMQ
foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<EventBusContainer>>())) foreach (var assembly in AssemblyHelper.GetAssemblies(serviceProvider.GetService<ILogger<EventBusContainer>>()))
{ {
foreach (var type in assembly.GetTypes().Where(m => typeof(IPoleEventHandler).IsAssignableFrom(m) && m.IsClass && !m.IsAbstract&&!typeof(Orleans.Runtime.GrainReference).IsAssignableFrom(m))) foreach (var type in assembly.GetTypes().Where(m => typeof(IPoleEventHandler).IsAssignableFrom(m) && m.IsClass && !m.IsAbstract && !typeof(Orleans.Runtime.GrainReference).IsAssignableFrom(m)))
{ {
var attribute = type.GetCustomAttributes(typeof(EventHandlerAttribute), false).FirstOrDefault(); var eventHandlerInterface = type.GetInterfaces().FirstOrDefault(type => typeof(IPoleEventHandler).IsAssignableFrom(type) && !type.IsGenericType);
var basePoleEventHandlerInterface = eventHandlerInterface.GetInterfaces().FirstOrDefault(m => m.IsGenericType);
if (basePoleEventHandlerInterface == null)
{
throw new PoleEventHandlerImplementException("PoleEventHandler interface must Inherited from IPoleEventHandler<TEvent>");
}
var eventType = basePoleEventHandlerInterface.GetGenericArguments().FirstOrDefault();
if (eventType == null)
{
throw new PoleEventHandlerImplementException("PoleEventHandler interface must Inherited from IPoleEventHandler<TEvent>");
}
var attribute = eventType.GetCustomAttributes(typeof(EventInfoAttribute), false).FirstOrDefault();
if (attribute != null) if (attribute != null)
{ {
eventHandlertList.Add((type, (EventHandlerAttribute)attribute)); eventHandlertList.Add((eventHandlerInterface, (EventInfoAttribute)attribute));
} }
else else
{ {
......
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 sign in to comment