|
|
|
@ -1,224 +1,93 @@ |
|
|
|
using Microsoft.Extensions.Options; |
|
|
|
using JetBrains.Annotations; |
|
|
|
using LINGYUN.Abp.Dynamic.Definitions; |
|
|
|
using Microsoft.Extensions.Options; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Collections.Immutable; |
|
|
|
using System.Linq; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using Volo.Abp; |
|
|
|
using Volo.Abp.DependencyInjection; |
|
|
|
|
|
|
|
namespace LINGYUN.Abp.Notifications; |
|
|
|
|
|
|
|
public class NotificationDefinitionManager : INotificationDefinitionManager, ITransientDependency |
|
|
|
public class NotificationDefinitionManager : |
|
|
|
DynamicDefinitionManager<NotificationGroupDefinition, NotificationDefinition>, |
|
|
|
INotificationDefinitionManager, |
|
|
|
ITransientDependency |
|
|
|
{ |
|
|
|
private readonly AbpNotificationsOptions _notificationsOptions; |
|
|
|
private readonly IStaticNotificationDefinitionStore _staticStore; |
|
|
|
private readonly IDynamicNotificationDefinitionStore _dynamicStore; |
|
|
|
protected IStaticNotificationDefinitionStore StaticStore { get; } |
|
|
|
protected IDynamicNotificationDefinitionStore DynamicStore { get; } |
|
|
|
|
|
|
|
public NotificationDefinitionManager( |
|
|
|
IStaticNotificationDefinitionStore staticStore, |
|
|
|
IDynamicNotificationDefinitionStore dynamicStore, |
|
|
|
IOptions<AbpNotificationsOptions> notificationsOptions) |
|
|
|
IOptions<AbpDynamicDefinitionsOptions> options) : base(options) |
|
|
|
{ |
|
|
|
_staticStore = staticStore; |
|
|
|
_dynamicStore = dynamicStore; |
|
|
|
_notificationsOptions = notificationsOptions.Value; |
|
|
|
StaticStore = staticStore; |
|
|
|
DynamicStore = dynamicStore; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<NotificationDefinition> GetAsync(string name) |
|
|
|
public async virtual Task<NotificationDefinition> GetAsync([NotNull] string name) |
|
|
|
{ |
|
|
|
var notification = await GetOrNullAsync(name); |
|
|
|
if (notification == null) |
|
|
|
{ |
|
|
|
throw new AbpException("Undefined notification: " + name); |
|
|
|
} |
|
|
|
|
|
|
|
return notification; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<NotificationDefinition?> GetOrNullAsync(string name) |
|
|
|
{ |
|
|
|
Check.NotNull(name, nameof(name)); |
|
|
|
|
|
|
|
var staticDefinition = await _staticStore.GetOrNullAsync(name); |
|
|
|
var dynamicDefinition = await _dynamicStore.GetOrNullAsync(name); |
|
|
|
|
|
|
|
if (staticDefinition != null && dynamicDefinition != null) |
|
|
|
{ |
|
|
|
return _notificationsOptions.DynamicNotificationStrategy switch |
|
|
|
{ |
|
|
|
DynamicNotificationStrategy.Ignore => staticDefinition, |
|
|
|
DynamicNotificationStrategy.Covering => dynamicDefinition, |
|
|
|
DynamicNotificationStrategy.Merge => MergeNotification(staticDefinition, dynamicDefinition), |
|
|
|
_ => staticDefinition |
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|
return staticDefinition ?? dynamicDefinition; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsAsync() |
|
|
|
{ |
|
|
|
var staticNotifications = await _staticStore.GetNotificationsAsync(); |
|
|
|
var dynamicNotifications = await _dynamicStore.GetNotificationsAsync(); |
|
|
|
|
|
|
|
// 根据策略处理通知定义
|
|
|
|
return _notificationsOptions.DynamicNotificationStrategy switch |
|
|
|
{ |
|
|
|
DynamicNotificationStrategy.Ignore => await GetNotificationsWithIgnoreStrategy(staticNotifications, dynamicNotifications), |
|
|
|
DynamicNotificationStrategy.Covering => await GetNotificationsWithCoveringStrategy(staticNotifications, dynamicNotifications), |
|
|
|
DynamicNotificationStrategy.Merge => await GetNotificationsWithMergeStrategy(staticNotifications, dynamicNotifications), |
|
|
|
_ => await GetNotificationsWithIgnoreStrategy(staticNotifications, dynamicNotifications) |
|
|
|
}; |
|
|
|
return await GetOrNullAsync(name) ?? throw new AbpException("Undefined notification: " + name); |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<NotificationGroupDefinition?> GetGroupOrNullAsync(string name) |
|
|
|
{ |
|
|
|
Check.NotNull(name, nameof(name)); |
|
|
|
|
|
|
|
var staticDefinition = await _staticStore.GetGroupOrNullAsync(name); |
|
|
|
var dynamicDefinition = await _dynamicStore.GetGroupOrNullAsync(name); |
|
|
|
|
|
|
|
if (staticDefinition != null && dynamicDefinition != null) |
|
|
|
{ |
|
|
|
switch (_notificationsOptions.DynamicNotificationStrategy) |
|
|
|
{ |
|
|
|
case DynamicNotificationStrategy.Ignore: |
|
|
|
return staticDefinition; |
|
|
|
case DynamicNotificationStrategy.Covering: |
|
|
|
return dynamicDefinition; |
|
|
|
case DynamicNotificationStrategy.Merge: |
|
|
|
MergeGroupNotifications(staticDefinition, dynamicDefinition); |
|
|
|
return staticDefinition; |
|
|
|
default: |
|
|
|
return staticDefinition; |
|
|
|
} |
|
|
|
} |
|
|
|
var staticGroupDefinition = await StaticStore.GetGroupOrNullAsync(name); |
|
|
|
var dynamicGroupDefinition = await DynamicStore.GetGroupOrNullAsync(name); |
|
|
|
|
|
|
|
return staticDefinition ?? dynamicDefinition; |
|
|
|
return await GetGroupDefinitionAsync(staticGroupDefinition, dynamicGroupDefinition); |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IReadOnlyList<NotificationGroupDefinition>> GetGroupsAsync() |
|
|
|
{ |
|
|
|
var staticGroups = await _staticStore.GetGroupsAsync(); |
|
|
|
var dynamicGroups = await _dynamicStore.GetGroupsAsync(); |
|
|
|
var staticGroupDefinitions = await StaticStore.GetGroupsAsync(); |
|
|
|
var dynamicGroupDefinitions = await DynamicStore.GetGroupsAsync(); |
|
|
|
|
|
|
|
// 根据策略处理分组定义
|
|
|
|
return _notificationsOptions.DynamicNotificationStrategy switch |
|
|
|
{ |
|
|
|
DynamicNotificationStrategy.Ignore => await GetGroupsWithIgnoreStrategy(staticGroups, dynamicGroups), |
|
|
|
DynamicNotificationStrategy.Covering => await GetGroupsWithCoveringStrategy(staticGroups, dynamicGroups), |
|
|
|
DynamicNotificationStrategy.Merge => await GetGroupsWithMergeStrategy(staticGroups, dynamicGroups), |
|
|
|
_ => await GetGroupsWithIgnoreStrategy(staticGroups, dynamicGroups) |
|
|
|
}; |
|
|
|
return await GetGroupDefinitionsAsync(staticGroupDefinitions, dynamicGroupDefinitions); |
|
|
|
} |
|
|
|
|
|
|
|
#region 通知定义策略
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 忽略策略：静态优先，过滤掉同名的动态通知
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsWithIgnoreStrategy( |
|
|
|
IReadOnlyList<NotificationDefinition> staticNotifications, |
|
|
|
IReadOnlyList<NotificationDefinition> dynamicNotifications) |
|
|
|
public async virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsAsync() |
|
|
|
{ |
|
|
|
var staticNotificationNames = staticNotifications |
|
|
|
.Select(p => p.Name) |
|
|
|
.ToImmutableHashSet(); |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationDefinition>>( |
|
|
|
staticNotifications |
|
|
|
.Concat(dynamicNotifications.Where(d => !staticNotificationNames.Contains(d.Name))) |
|
|
|
.ToImmutableList() |
|
|
|
); |
|
|
|
var staticDefinitions = await StaticStore.GetNotificationsAsync(); |
|
|
|
var dynamicDefinitions = await DynamicStore.GetNotificationsAsync(); |
|
|
|
|
|
|
|
return await GetDefinitionsAsync(staticDefinitions, dynamicDefinitions); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 覆盖策略：动态完全覆盖静态通知
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsWithCoveringStrategy( |
|
|
|
IReadOnlyList<NotificationDefinition> staticNotifications, |
|
|
|
IReadOnlyList<NotificationDefinition> dynamicNotifications) |
|
|
|
public async virtual Task<NotificationDefinition?> GetOrNullAsync(string name) |
|
|
|
{ |
|
|
|
var dynamicNotificationNames = dynamicNotifications |
|
|
|
.Select(p => p.Name) |
|
|
|
.ToImmutableHashSet(); |
|
|
|
Check.NotNull(name, nameof(name)); |
|
|
|
|
|
|
|
// 动态通知完全覆盖静态通知
|
|
|
|
var result = dynamicNotifications |
|
|
|
.Concat(staticNotifications.Where(s => !dynamicNotificationNames.Contains(s.Name))) |
|
|
|
.ToImmutableList(); |
|
|
|
var staticDefinition = await StaticStore.GetOrNullAsync(name); |
|
|
|
var dynamicDefinition = await DynamicStore.GetOrNullAsync(name); |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationDefinition>>(result); |
|
|
|
return await GetDefinitionAsync(staticDefinition, dynamicDefinition); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 合并策略：合并静态和动态通知，创建新实例
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsWithMergeStrategy( |
|
|
|
IReadOnlyList<NotificationDefinition> staticNotifications, |
|
|
|
IReadOnlyList<NotificationDefinition> dynamicNotifications) |
|
|
|
protected override string GetDefinitionKey(NotificationDefinition definition) |
|
|
|
{ |
|
|
|
var mergedNotifications = new Dictionary<string, NotificationDefinition>(); |
|
|
|
|
|
|
|
// 先添加所有静态通知
|
|
|
|
foreach (var staticNotification in staticNotifications) |
|
|
|
{ |
|
|
|
mergedNotifications[staticNotification.Name] = staticNotification; |
|
|
|
} |
|
|
|
|
|
|
|
// 合并动态通知
|
|
|
|
foreach (var dynamicNotification in dynamicNotifications) |
|
|
|
{ |
|
|
|
if (mergedNotifications.TryGetValue(dynamicNotification.Name, out var existingNotification)) |
|
|
|
{ |
|
|
|
// 通知已存在，创建新的合并通知
|
|
|
|
var mergedNotification = MergeNotification(existingNotification, dynamicNotification); |
|
|
|
mergedNotifications[dynamicNotification.Name] = mergedNotification; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
// 添加新的动态通知
|
|
|
|
mergedNotifications[dynamicNotification.Name] = dynamicNotification; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationDefinition>>(mergedNotifications.Values.ToImmutableList()); |
|
|
|
return definition.Name; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 合并两个通知定义，返回新的 NotificationDefinition 实例
|
|
|
|
/// </summary>
|
|
|
|
protected virtual NotificationDefinition MergeNotification( |
|
|
|
NotificationDefinition staticNotification, |
|
|
|
NotificationDefinition dynamicNotification) |
|
|
|
protected override Task<NotificationDefinition> MergeDefinitionAsync(NotificationDefinition targetDefinition, NotificationDefinition sourceDefinition) |
|
|
|
{ |
|
|
|
// 决定使用哪个显示名称（优先使用动态的）
|
|
|
|
var displayName = dynamicNotification.DisplayName ?? staticNotification.DisplayName; |
|
|
|
|
|
|
|
// 决定使用哪个描述（优先使用动态的）
|
|
|
|
var description = dynamicNotification.Description ?? staticNotification.Description; |
|
|
|
|
|
|
|
// 决定通知类型（优先使用动态的）
|
|
|
|
var notificationType = dynamicNotification.NotificationType != NotificationType.Application |
|
|
|
? dynamicNotification.NotificationType |
|
|
|
: staticNotification.NotificationType; |
|
|
|
|
|
|
|
// 决定存活类型（优先使用动态的）
|
|
|
|
var lifetime = dynamicNotification.NotificationLifetime != NotificationLifetime.Persistent |
|
|
|
? dynamicNotification.NotificationLifetime |
|
|
|
: staticNotification.NotificationLifetime; |
|
|
|
|
|
|
|
// 决定内容类型（优先使用动态的）
|
|
|
|
var contentType = dynamicNotification.ContentType != NotificationContentType.Text |
|
|
|
? dynamicNotification.ContentType |
|
|
|
: staticNotification.ContentType; |
|
|
|
var displayName = sourceDefinition.DisplayName ?? targetDefinition.DisplayName; |
|
|
|
var description = sourceDefinition.Description ?? targetDefinition.Description; |
|
|
|
var notificationType = sourceDefinition.NotificationType != NotificationType.Application |
|
|
|
? sourceDefinition.NotificationType |
|
|
|
: targetDefinition.NotificationType; |
|
|
|
var lifetime = sourceDefinition.NotificationLifetime != NotificationLifetime.Persistent |
|
|
|
? sourceDefinition.NotificationLifetime |
|
|
|
: targetDefinition.NotificationLifetime; |
|
|
|
var contentType = sourceDefinition.ContentType != NotificationContentType.Text |
|
|
|
? sourceDefinition.ContentType |
|
|
|
: targetDefinition.ContentType; |
|
|
|
var allowSubscriptionToClients = sourceDefinition.AllowSubscriptionToClients || targetDefinition.AllowSubscriptionToClients; |
|
|
|
|
|
|
|
// 决定是否允许客户端订阅（优先使用动态的）
|
|
|
|
var allowSubscriptionToClients = dynamicNotification.AllowSubscriptionToClients || staticNotification.AllowSubscriptionToClients; |
|
|
|
|
|
|
|
// 创建新的通知实例
|
|
|
|
var mergedNotification = new NotificationDefinition( |
|
|
|
staticNotification.Name, // 保持名称不变
|
|
|
|
targetDefinition.Name, |
|
|
|
displayName, |
|
|
|
description, |
|
|
|
notificationType, |
|
|
|
@ -227,20 +96,17 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
allowSubscriptionToClients |
|
|
|
); |
|
|
|
|
|
|
|
// 复制静态通知的属性
|
|
|
|
foreach (var property in staticNotification.Properties) |
|
|
|
foreach (var property in targetDefinition.Properties) |
|
|
|
{ |
|
|
|
mergedNotification.Properties[property.Key] = property.Value; |
|
|
|
} |
|
|
|
|
|
|
|
// 复制动态通知的属性（覆盖同名的静态属性）
|
|
|
|
foreach (var property in dynamicNotification.Properties) |
|
|
|
foreach (var property in sourceDefinition.Properties) |
|
|
|
{ |
|
|
|
mergedNotification.Properties[property.Key] = property.Value; |
|
|
|
} |
|
|
|
|
|
|
|
// 合并提供者
|
|
|
|
foreach (var provider in staticNotification.Providers) |
|
|
|
foreach (var provider in targetDefinition.Providers) |
|
|
|
{ |
|
|
|
if (!mergedNotification.Providers.Contains(provider)) |
|
|
|
{ |
|
|
|
@ -248,7 +114,7 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
foreach (var provider in dynamicNotification.Providers) |
|
|
|
foreach (var provider in sourceDefinition.Providers) |
|
|
|
{ |
|
|
|
if (!mergedNotification.Providers.Contains(provider)) |
|
|
|
{ |
|
|
|
@ -256,107 +122,32 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 合并模板（优先使用动态的）
|
|
|
|
if (dynamicNotification.Template != null) |
|
|
|
if (sourceDefinition.Template != null) |
|
|
|
{ |
|
|
|
mergedNotification.WithTemplate(dynamicNotification.Template); |
|
|
|
mergedNotification.WithTemplate(sourceDefinition.Template); |
|
|
|
} |
|
|
|
else if (staticNotification.Template != null) |
|
|
|
else if (targetDefinition.Template != null) |
|
|
|
{ |
|
|
|
mergedNotification.WithTemplate(staticNotification.Template); |
|
|
|
mergedNotification.WithTemplate(targetDefinition.Template); |
|
|
|
} |
|
|
|
|
|
|
|
return mergedNotification; |
|
|
|
return Task.FromResult(mergedNotification); |
|
|
|
} |
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 分组定义策略
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 忽略策略：静态优先，过滤掉同名的动态分组
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationGroupDefinition>> GetGroupsWithIgnoreStrategy( |
|
|
|
IReadOnlyList<NotificationGroupDefinition> staticGroups, |
|
|
|
IReadOnlyList<NotificationGroupDefinition> dynamicGroups) |
|
|
|
protected override string GetGroupDefinitionKey(NotificationGroupDefinition groupDefinition) |
|
|
|
{ |
|
|
|
var staticGroupNames = staticGroups |
|
|
|
.Select(p => p.Name) |
|
|
|
.ToImmutableHashSet(); |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationGroupDefinition>>( |
|
|
|
staticGroups |
|
|
|
.Concat(dynamicGroups.Where(d => !staticGroupNames.Contains(d.Name))) |
|
|
|
.ToImmutableList() |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 覆盖策略：动态完全覆盖静态分组
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationGroupDefinition>> GetGroupsWithCoveringStrategy( |
|
|
|
IReadOnlyList<NotificationGroupDefinition> staticGroups, |
|
|
|
IReadOnlyList<NotificationGroupDefinition> dynamicGroups) |
|
|
|
{ |
|
|
|
var dynamicGroupNames = dynamicGroups |
|
|
|
.Select(p => p.Name) |
|
|
|
.ToImmutableHashSet(); |
|
|
|
|
|
|
|
var result = dynamicGroups |
|
|
|
.Concat(staticGroups.Where(s => !dynamicGroupNames.Contains(s.Name))) |
|
|
|
.ToImmutableList(); |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationGroupDefinition>>(result); |
|
|
|
return groupDefinition.Name; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 合并策略：合并静态和动态分组
|
|
|
|
/// </summary>
|
|
|
|
protected virtual Task<IReadOnlyList<NotificationGroupDefinition>> GetGroupsWithMergeStrategy( |
|
|
|
IReadOnlyList<NotificationGroupDefinition> staticGroups, |
|
|
|
IReadOnlyList<NotificationGroupDefinition> dynamicGroups) |
|
|
|
protected override Task MergeGroupDefinitionAsync(NotificationGroupDefinition targetGroupDefinition, NotificationGroupDefinition sourceGroupDefinition) |
|
|
|
{ |
|
|
|
var mergedGroups = new Dictionary<string, NotificationGroupDefinition>(); |
|
|
|
|
|
|
|
// 先添加所有静态分组
|
|
|
|
foreach (var staticGroup in staticGroups) |
|
|
|
{ |
|
|
|
mergedGroups[staticGroup.Name] = staticGroup; |
|
|
|
} |
|
|
|
|
|
|
|
// 合并动态分组
|
|
|
|
foreach (var dynamicGroup in dynamicGroups) |
|
|
|
{ |
|
|
|
if (mergedGroups.TryGetValue(dynamicGroup.Name, out var existingGroup)) |
|
|
|
{ |
|
|
|
// 分组已存在，合并通知
|
|
|
|
MergeGroupNotifications(existingGroup, dynamicGroup); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
// 添加新的动态分组
|
|
|
|
mergedGroups[dynamicGroup.Name] = dynamicGroup; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return Task.FromResult<IReadOnlyList<NotificationGroupDefinition>>( |
|
|
|
mergedGroups.Values.ToImmutableList() |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 合并分组的通知列表
|
|
|
|
/// </summary>
|
|
|
|
private static void MergeGroupNotifications(NotificationGroupDefinition target, NotificationGroupDefinition source) |
|
|
|
{ |
|
|
|
foreach (var sourceNotification in source.Notifications) |
|
|
|
foreach (var sourceNotification in sourceGroupDefinition.Notifications) |
|
|
|
{ |
|
|
|
var existingNotification = target.GetNotificationOrNull(sourceNotification.Name); |
|
|
|
var existingNotification = targetGroupDefinition.GetNotificationOrNull(sourceNotification.Name); |
|
|
|
|
|
|
|
if (existingNotification == null) |
|
|
|
{ |
|
|
|
// 通知不存在，直接添加
|
|
|
|
var newNotification = target.AddNotification( |
|
|
|
var newNotification = targetGroupDefinition.AddNotification( |
|
|
|
sourceNotification.Name, |
|
|
|
sourceNotification.DisplayName, |
|
|
|
sourceNotification.Description, |
|
|
|
@ -366,7 +157,6 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
sourceNotification.AllowSubscriptionToClients |
|
|
|
); |
|
|
|
|
|
|
|
// 复制提供者
|
|
|
|
foreach (var provider in sourceNotification.Providers) |
|
|
|
{ |
|
|
|
if (!newNotification.Providers.Contains(provider)) |
|
|
|
@ -375,13 +165,11 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 复制属性
|
|
|
|
foreach (var property in sourceNotification.Properties) |
|
|
|
{ |
|
|
|
newNotification.Properties[property.Key] = property.Value; |
|
|
|
} |
|
|
|
|
|
|
|
// 复制模板
|
|
|
|
if (sourceNotification.Template != null) |
|
|
|
{ |
|
|
|
newNotification.WithTemplate(sourceNotification.Template); |
|
|
|
@ -389,13 +177,11 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
// 通知已存在，合并属性
|
|
|
|
foreach (var property in sourceNotification.Properties) |
|
|
|
{ |
|
|
|
existingNotification.Properties[property.Key] = property.Value; |
|
|
|
} |
|
|
|
|
|
|
|
// 合并提供者
|
|
|
|
foreach (var provider in sourceNotification.Providers) |
|
|
|
{ |
|
|
|
if (!existingNotification.Providers.Contains(provider)) |
|
|
|
@ -404,30 +190,26 @@ public class NotificationDefinitionManager : INotificationDefinitionManager, ITr |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 更新显示名称（如果源提供了）
|
|
|
|
if (sourceNotification.DisplayName != null) |
|
|
|
{ |
|
|
|
existingNotification.DisplayName = sourceNotification.DisplayName; |
|
|
|
} |
|
|
|
|
|
|
|
// 更新描述（如果源提供了）
|
|
|
|
if (sourceNotification.Description != null) |
|
|
|
{ |
|
|
|
existingNotification.Description = sourceNotification.Description; |
|
|
|
} |
|
|
|
|
|
|
|
// 更新模板（优先使用动态的）
|
|
|
|
if (sourceNotification.Template != null) |
|
|
|
{ |
|
|
|
existingNotification.WithTemplate(sourceNotification.Template); |
|
|
|
} |
|
|
|
|
|
|
|
// 更新允许客户端订阅
|
|
|
|
existingNotification.AllowSubscriptionToClients = |
|
|
|
existingNotification.AllowSubscriptionToClients || sourceNotification.AllowSubscriptionToClients; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
#endregion
|
|
|
|
} |
|
|
|
return Task.CompletedTask; |
|
|
|
} |
|
|
|
} |
|
|
|
|
colin
2 weeks ago