+`,它返回完全相同的容器.
-默认容器的名称是 `Default`.
+默认容器的名称是 `default`.
### 命令容器
diff --git a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md
new file mode 100644
index 0000000000..2a1810e309
--- /dev/null
+++ b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md
@@ -0,0 +1,134 @@
+# 分布式事件总线RabbitMQ集成
+
+> 本文解释了**如何配置[RabbitMQ](https://www.rabbitmq.com/)**做为分布式总线提供程序. 参阅[分布式事件总线文档](Distributed-Event-Bus.md)了解如何使用分布式事件总线系统.
+
+## 安装
+
+使用ABP CLI添加[Volo.Abp.EventBus.RabbitMQ[Volo.Abp.EventBus.RabbitMQ](https://www.nuget.org/packages/Volo.Abp.EventBus.RabbitMQ)NuGet包到你的项目:
+
+* 安装[ABP CLI](https://docs.abp.io/en/abp/latest/CLI),如果你还没有安装.
+* 在你想要安装 `Volo.Abp.EventBus.RabbitMQ` 包的 `.csproj` 文件目录打开命令行(终端).
+* 运行 `abp add-package Volo.Abp.EventBus.RabbitMQ` 命令.
+
+如果你想要手动安装,安装[Volo.Abp.EventBus.RabbitMQ](https://www.nuget.org/packages/Volo.Abp.EventBus.RabbitMQ) NuGet 包到你的项目然后添加 `[DependsOn(typeof(AbpEventBusRabbitMqModule))]` 到你的项目[模块](Module-Development-Basics.md)类.
+
+## 配置
+
+可以使用配置使用标准的[配置系统](Configuration.md),如 `appsettings.json` 文件,或[选项](Options.md)类.
+
+### `appsettings.json` 文件配置
+
+这是配置RabbitMQ设置最简单的方法. 它也非常强大,因为你可以使用[由AspNet Core支持的](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/)的任何其他配置源(如环境变量).
+
+**示例：最小化配置与默认配置连接到本地的RabbitMQ服务器**
+
+````json
+{
+ "RabbitMQ": {
+ "EventBus": {
+ "ClientName": "MyClientName",
+ "ExchangeName": "MyExchangeName"
+ }
+ }
+}
+````
+
+* `ClientName` 是应用程序的名称,用于RabbitMQ的**队列名称**.
+* `ExchangeName` 是 **交换机名称**.
+
+参阅[RabbitMQ文档](https://www.rabbitmq.com/dotnet-api-guide.html#exchanges-and-queues)更好的了解这些选项.
+
+#### 连接
+
+如果需要连接到本地主机以外的另一台服务器,需要配置连接属性.
+
+**示例: 指定主机名 (如IP地址)**
+
+````json
+{
+ "RabbitMQ": {
+ "Connections": {
+ "Default": {
+ "HostName": "123.123.123.123"
+ }
+ },
+ "EventBus": {
+ "ClientName": "MyClientName",
+ "ExchangeName": "MyExchangeName"
+ }
+ }
+}
+````
+
+允许定义多个连接. 在这种情况下,你可以指定用于事件总线的连接.
+
+**示例: 声明两个连接并将其中一个用于事件总线**
+
+````json
+{
+ "RabbitMQ": {
+ "Connections": {
+ "Default": {
+ "HostName": "123.123.123.123"
+ },
+ "SecondConnection": {
+ "HostName": "321.321.321.321"
+ }
+ },
+ "EventBus": {
+ "ClientName": "MyClientName",
+ "ExchangeName": "MyExchangeName",
+ "ConnectionName": "SecondConnection"
+ }
+ }
+}
+````
+
+这允许你可以在你的应用程序使用多个RabbitMQ服务器,但将其中一个做为事件总线.
+
+你可以使用任何[ConnectionFactry](http://rabbitmq.github.io/rabbitmq-dotnet-client/api/RabbitMQ.Client.ConnectionFactory.html#properties)属性作为连接属性.
+
+**示例: 指定连接端口**
+
+````csharp
+{
+ "RabbitMQ": {
+ "Connections": {
+ "Default": {
+ "HostName": "123.123.123.123",
+ "Port": "5672"
+ }
+ }
+ }
+}
+````
+
+### 选项类
+
+`AbpRabbitMqOptions` 和 `AbpRabbitMqEventBusOptions` 类用于配置RabbitMQ的连接字符串和事件总线选项.
+
+你可以在你的[模块](Module-Development-Basics.md)的 `ConfigureServices` 方法配置选项.
+
+**示例: 配置连接**
+
+````csharp
+Configure(options =>
+{
+ options.Connections.Default.UserName = "user";
+ options.Connections.Default.Password = "pass";
+ options.Connections.Default.HostName = "123.123.123.123";
+ options.Connections.Default.Port = 5672;
+});
+````
+
+**示例: 配置客户端和交换机名称**
+
+````csharp
+Configure(options =>
+{
+ options.ClientName = "TestApp1";
+ options.ExchangeName = "TestMessages";
+});
+````
+
+使用这些选项类可以与 `appsettings.json` 组合在一起. 在代码中配置选项属性会覆盖配置文件中的值.
\ No newline at end of file
diff --git a/docs/zh-Hans/Distributed-Event-Bus.md b/docs/zh-Hans/Distributed-Event-Bus.md
new file mode 100644
index 0000000000..8416ef953d
--- /dev/null
+++ b/docs/zh-Hans/Distributed-Event-Bus.md
@@ -0,0 +1,300 @@
+# 分布式事件总线
+
+分布式事件总线系统允许**发布**和**订阅跨应用/服务边界**传输的事件. 你可以使用分布式事件总线在**微服务**或**应用程序**之间异步发送和接收消息.
+
+## 提供程序
+
+分布式事件总线系统提供了一个可以被任何提供程序实现的**抽象**. 有两种开箱即用的提供程序:
+
+* `LocalDistributedEventBus` 是默认实现,实现作为进程内工作的分布式事件总线. 是的!如果没有配置真正的分布式提供程序,**默认实现的工作方式与[本地事件总线](Local-Event-Bus.md)一样**.
+* `RabbitMqDistributedEventBus` 通过[RabbitMQ](https://www.rabbitmq.com/)实现分布式事件总线. 请参阅[RabbitMQ集成文档](Distributed-Event-Bus-RabbitMQ-Integration.md)了解如何配置它.
+
+使用本地事件总线作为默认具有一些重要的优点. 最重要的是:它允许你编写与分布式体系结构兼容的代码. 您现在可以编写一个整体应用程序,以后可以拆分成微服务. 最好通过分布式事件而不是本地事件在边界上下文之间(或在应用程序模块之间)进行通信.
+
+例如,[预构建的应用模块](Modules/Index.md)被设计成在分布式系统中作为服务工作,同时它们也可以在独立应用程序中作为模块工作,而不依赖于外部消息代理.
+
+## 发布事件
+
+以下介绍了两种发布分布式事件的方法.
+
+### IDistributedEventBus
+
+可以[注入](Dependency-Injection.md) `IDistributedEventBus` 并且使用发布分布式事件.
+
+**示例: 产品的存货数量发生变化时发布分布式事件**
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+
+namespace AbpDemo
+{
+ public class MyService : ITransientDependency
+ {
+ private readonly IDistributedEventBus _distributedEventBus;
+
+ public MyService(IDistributedEventBus distributedEventBus)
+ {
+ _distributedEventBus = distributedEventBus;
+ }
+
+ public virtual async Task ChangeStockCountAsync(Guid productId, int newCount)
+ {
+ await _distributedEventBus.PublishAsync(
+ new StockCountChangedEvent
+ {
+ ProductId = productId,
+ NewCount = newCount
+ }
+ );
+ }
+ }
+}
+````
+
+`PublishAsync` 方法需要一个参数:事件对象,它负责保持与事件相关的数据,是一个简单的普通类:
+
+
+````csharp
+using System;
+
+namespace AbpDemo
+{
+ [EventName("MyApp.Product.StockChange")]
+ public class StockCountChangedEto
+ {
+ public Guid ProductId { get; set; }
+
+ public int NewCount { get; set; }
+ }
+}
+````
+
+即使你不需要传输任何数据也需要创建一个类(在这种情况下为空类).
+
+> `Eto` 是我们按照约定使用的**E**vent **T**ransfer **O**bjects(事件传输对象)的后缀. s虽然这不是必需的,但我们发现识别这样的事件类很有用(就像应用层上的[DTO](Data-Transfer-Objects.md) 一样).
+
+#### 事件名称
+
+`EventName`attribute是可选的,但建议使用. 如果不声明,事件名将事件名称将是事件类的全名. 这里是 `AbpDemo.StockCountChangedEto`.
+
+#### 关于序列化的事件对象
+
+事件传输对象**必须是可序列化**的,因为将其传输到流程外时，它们将被序列化/反序列化为JSON或其他格式.
+
+避免循环引用,多态,私有setter,并提供默认(空)构造函数,如果你有其他的构造函数.(虽然某些序列化器可能会正常工作),就像DTO一样.
+
+### 实体/聚合根类
+
+[实体](Entities.md)不能通过依赖注入注入服务,但是在实体/聚合根类中发布分布式事件是非常常见的.
+
+**示例: 在聚合根方法内发布分布式事件**
+
+````csharp
+using System;
+using Volo.Abp.Domain.Entities;
+
+namespace AbpDemo
+{
+ public class Product : AggregateRoot
+ {
+ public string Name { get; set; }
+
+ public int StockCount { get; private set; }
+
+ private Product() { }
+
+ public Product(Guid id, string name)
+ : base(id)
+ {
+ Name = name;
+ }
+
+ public void ChangeStockCount(int newCount)
+ {
+ StockCount = newCount;
+
+ //ADD an EVENT TO BE PUBLISHED
+ AddDistributedEvent(
+ new StockCountChangedEto
+ {
+ ProductId = Id,
+ NewCount = newCount
+ }
+ );
+ }
+ }
+}
+````
+
+`AggregateRoot` 类定义了 `AddDistributedEvent` 来添加一个新的分布式事件,事件在聚合根对象保存(创建,更新或删除)到数据库时发布.
+
+> 如果实体发布这样的事件,以可控的方式更改相关属性是一个好的实践,就像上面的示例一样 - `StockCount`只能由保证发布事件的 `ChangeStockCount` 方法来更改.
+
+#### IGeneratesDomainEvents 接口
+
+实际上添加分布式事件并不是 `AggregateRoot` 类独有的. 你可以为任何实体类实现 `IGeneratesDomainEvents`. 但是 `AggregateRoot` 默认实现了它简化你的工作.
+
+> 不建议为不是聚合根的实体实现此接口,因为它可能不适用于此类实体的某些数据库提供程序. 例如它适用于EF Core,但不适用于MongoDB.
+
+#### 它是如何实现的?
+
+调用 `AddDistributedEvent` 不会立即发布事件. 当你将更改保存到数据库时发布该事件;
+
+* 对于 EF Core, 它在 `DbContext.SaveChanges` 中发布.
+* 对于 MongoDB, 它在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法时发由 (因为MongoDB没有更改跟踪系统).
+
+## 订阅事件
+
+一个服务可以实现 `IDistributedEventHandler` 来处理事件.
+
+**示例: 处理上面定义的`StockCountChangedEto`**
+
+````csharp
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+
+namespace AbpDemo
+{
+ public class MyHandler
+ : IDistributedEventHandler,
+ ITransientDependency
+ {
+ public async Task HandleEventAsync(StockCountChangedEto eventData)
+ {
+ var productId = eventData.ProductId;
+ }
+ }
+}
+````
+
+这就是全部.
+
+* `MyHandler` 由ABP框架**自动发现**,并在发生 `StockCountChangedEto` 事件时调用 `HandleEventAsync`.
+* 如果你使用的是分布式消息代理,比如RabbitMQ,ABP会自动**订阅消息代理上的事件**,获取消息执行处理程序.
+* 如果事件处理程序成功执行(没有抛出任何异常),它将向消息代理发送**确认(ACK)**.
+
+你可以在处理程序注入任何服务来执行所需的逻辑. 一个事件处理程序可以**订阅多个事件**,但是需要为每个事件实现 `IDistributedEventHandler` 接口.
+
+> 事件处理程序类必须注册到依赖注入(DI),示例中使用了 `ITransientDependency`. 参阅[DI文档](Dependency-Injection.md)了解更多选项.
+
+## 预定义的事件
+
+如果你配置,ABP框架会为[实体](Entities.md)**自动发布创建,更新和删除**分布式事件.
+
+### 事件类型
+
+有三种预定义的事件类型:
+
+* `EntityCreatedEto` 是实体 `T` 创建后发布.
+* `EntityUpdatedEto` 是实体 `T` 更新后发布.
+* `EntityDeletedEto` 是实体 `T` 删除后发布.
+
+这些都是泛型的, `T` 实际上是**E**vent **T**ransfer **O**bject (ETO)的类型,而不是实体的类型,因为实体对象不能做为事件数据传输,所以通常会为实体类定义一个ETO类,如为 `Product` 实体定义 `ProductEto`.
+
+### 订阅事件
+
+订阅自动事件与订阅常规分布式事件相同.
+
+**示例: 产品更新后获取通知**
+
+````csharp
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities.Events.Distributed;
+using Volo.Abp.EventBus.Distributed;
+
+namespace AbpDemo
+{
+ public class MyHandler :
+ IDistributedEventHandler>,
+ ITransientDependency
+ {
+ public async Task HandleEventAsync(EntityUpdatedEto eventData)
+ {
+ var productId = eventData.Entity.Id;
+ //TODO
+ }
+ }
+}
+````
+
+* `MyHandler` 实现了 `IDistributedEventHandler>`.
+
+### 配置
+
+你可以在[模块](Module-Development-Basics.md)的 `ConfigureServices` 中配置 `AbpDistributedEntityEventOptions`添加选择器.
+
+**示例: 配置示例**
+
+````csharp
+Configure(options =>
+{
+ //Enable for all entities
+ options.AutoEventSelectors.AddAll();
+
+ //Enable for a single entity
+ options.AutoEventSelectors.Add();
+
+ //Enable for all entities in a namespace (and child namespaces)
+ options.AutoEventSelectors.AddNamespace("Volo.Abp.Identity");
+
+ //Custom predicate expression that should return true to select a type
+ options.AutoEventSelectors.Add(
+ type => type.Namespace.StartsWith("MyProject.")
+ );
+});
+````
+
+* 最后一个提供了灵活性来决定是否应该针对给定的实体类型发布事件. 返回 `true` 代表为该 `Type` 发布事件.
+
+你可以添加多个选择器. 如果选择器之一与实体类型匹配,则将其选中.
+
+### 事件传输对象
+
+一旦你为一个实体启用了**自动事件**,ABP框架就会为实体上的更改发布事件. 如果你没有为实体指定对应的**E**vent **T**ransfer **O**bject(ETO), ABP框架会使用一个标准类型 `EntityEto`,它只有两个属性:
+
+* `EntityType` (`string`): 实体类的全名(包括命令空间).
+* `KeysAsString` (`string`): 已更改实体的主键.如果它只有一个主键,这个属性将是主键值. 对于复合键,它包含所有用`,`(逗号)分隔的键.
+
+因此可以实现 `IDistributedEventHandler>` 订阅事件. 但是订阅这样的通用事件不是一个好方法,你可以为实体类型定义对应的ETO.
+
+**示例: 为 `Product` 声明使用 `ProductDto`**
+
+````csharp
+Configure(options =>
+{
+ options.AutoEventSelectors.Add();
+ options.EtoMappings.Add();
+});
+````
+
+在这个示例中;
+
+* 添加选择器允许发布 `Product` 实体的创建,更新和删除事件.
+* 配置为使用 `ProductEto` 作为事件传输对象来发布与 `Product` 相关的事件.
+
+分布式事件系统使用[对象到对象的映射](Object-To-Object-Mapping.md)系统来映射 `Product` 对象到 `ProductEto` 对象,你需要配置映射. 请参阅可以对象到对象映射文档了解所有选项,下面的示例展示了如何使用[AutoMapper](https://automapper.org/)库配置它.
+
+**示例: 使用AutoMapper配置 `Product` 到 `ProductEto` 映射**
+
+````csharp
+using System;
+using AutoMapper;
+using Volo.Abp.Domain.Entities.Events.Distributed;
+
+namespace AbpDemo
+{
+ [AutoMap(typeof(Product))]
+ public class ProductEto : EntityEto
+ {
+ public Guid Id { get; set; }
+ public string Name { get; set; }
+ }
+}
+````
+
+此示例使用AutoMapper的 `AutoMap` 属性配置的映射. 你可以创建一个配置文件类代替. 请参阅AutoMapper文档了解更多选项.
\ No newline at end of file
diff --git a/docs/zh-Hans/Event-Bus.md b/docs/zh-Hans/Event-Bus.md
index 0adb56101d..07a623499d 100644
--- a/docs/zh-Hans/Event-Bus.md
+++ b/docs/zh-Hans/Event-Bus.md
@@ -1,3 +1,10 @@
-# Event Bus
+# 事件总线
- TODO
\ No newline at end of file
+事件总线是将消息从发送方传输到接收方的中介. 它在对象,服务和应用程序之间提供了一种松散耦合的通信方式.
+
+## 事件总线类型
+
+ABP框架提供了两种事件总线类型;
+
+* **[本地事件总线](Local-Event-Bus.md)** 适合进程内消息传递.
+* **[分布式事件总线](Distributed-Event-Bus.md)** 适合进程间消息传递,如微服务发布和订阅分布式事件.
\ No newline at end of file
diff --git a/docs/zh-Hans/Local-Event-Bus.md b/docs/zh-Hans/Local-Event-Bus.md
new file mode 100644
index 0000000000..b5c472734b
--- /dev/null
+++ b/docs/zh-Hans/Local-Event-Bus.md
@@ -0,0 +1,227 @@
+# 本地事件总线
+
+本地事件总线允许服务发布和订阅**进程内事件**. 这意味着如果两个服务(发布者和订阅者)在同一个进程中运行,那么它是合适的.
+
+## 发布事件
+
+以下介绍了两种发布本地事件的方法.
+
+### ILocalEventBus
+
+可以[注入](Dependency-Injection.md) `ILocalEventBus` 并且使用发布本地事件.
+
+**示例: 产品的存货数量发生变化时发布本地事件**
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Local;
+
+namespace AbpDemo
+{
+ public class MyService : ITransientDependency
+ {
+ private readonly ILocalEventBus _localEventBus;
+
+ public MyService(ILocalEventBus localEventBus)
+ {
+ _localEventBus = localEventBus;
+ }
+
+ public virtual async Task ChangeStockCountAsync(Guid productId, int newCount)
+ {
+ //TODO: IMPLEMENT YOUR LOGIC...
+
+ //PUBLISH THE EVENT
+ await _localEventBus.PublishAsync(
+ new StockCountChangedEvent
+ {
+ ProductId = productId,
+ NewCount = newCount
+ }
+ );
+ }
+ }
+}
+````
+
+`PublishAsync` 方法需要一个参数:事件对象,它负责保持与事件相关的数据,是一个简单的普通类:
+
+````csharp
+using System;
+
+namespace AbpDemo
+{
+ public class StockCountChangedEvent
+ {
+ public Guid ProductId { get; set; }
+
+ public int NewCount { get; set; }
+ }
+}
+````
+
+即使你不需要传输任何数据也需要创建一个类(在这种情况下为空类).
+
+### 实体/聚合根类
+
+[实体](Entities.md)不能通过依赖注入注入服务,但是在实体/聚合根类中发布本地事件是非常常见的.
+
+**示例: 在聚合根方法内发布本地事件**
+
+````csharp
+using System;
+using Volo.Abp.Domain.Entities;
+
+namespace AbpDemo
+{
+ public class Product : AggregateRoot
+ {
+ public string Name { get; set; }
+
+ public int StockCount { get; private set; }
+
+ private Product() { }
+
+ public Product(Guid id, string name)
+ : base(id)
+ {
+ Name = name;
+ }
+
+ public void ChangeStockCount(int newCount)
+ {
+ StockCount = newCount;
+
+ //ADD an EVENT TO BE PUBLISHED
+ AddLocalEvent(
+ new StockCountChangedEvent
+ {
+ ProductId = Id,
+ NewCount = newCount
+ }
+ );
+ }
+ }
+}
+````
+
+`AggregateRoot` 类定义了 `AddLocalEvent` 来添加一个新的本地事件,事件在聚合根对象保存(创建,更新或删除)到数据库时发布.
+
+> 如果实体发布这样的事件,以可控的方式更改相关属性是一个好的实践,就像上面的示例一样 - `StockCount`只能由保证发布事件的 `ChangeStockCount` 方法来更改.
+
+#### IGeneratesDomainEvents 接口
+
+实际上添加本地事件并不是 `AggregateRoot` 类独有的. 你可以为任何实体类实现 `IGeneratesDomainEvents`. 但是 `AggregateRoot` 默认实现了它简化你的工作.
+
+> 不建议为不是聚合根的实体实现此接口,因为它可能不适用于此类实体的某些数据库提供程序. 例如它适用于EF Core,但不适用于MongoDB.
+
+#### 它是如何实现的?
+
+调用 `AddLocalEvent` 不会立即发布事件. 当你将更改保存到数据库时发布该事件;
+
+* 对于 EF Core, 它在 `DbContext.SaveChanges` 中发布.
+* 对于 MongoDB, 它在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法时发由 (因为MongoDB没有更改跟踪系统).
+
+## 订阅事件
+
+一个服务可以实现 `ILocalEventHandler` 来处理事件.
+
+**示例: 处理上面定义的`StockCountChangedEvent`**
+
+````csharp
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus;
+
+namespace AbpDemo
+{
+ public class MyHandler
+ : ILocalEventHandler,
+ ITransientDependency
+ {
+ public async Task HandleEventAsync(StockCountChangedEvent eventData)
+ {
+ //TODO: your code that does somthing on the event
+ }
+ }
+}
+````
+
+这就是全部,`MyHandler` 由ABP框架**自动发现**,并在发生 `StockCountChangedEvent` 事件时调用 `HandleEventAsync`.
+
+* 事件可以由**0个或多个处理程序**订阅.
+* 一个事件处理程序可以**订阅多个事件**,但是需要为每个事件实现 `ILocalEventHandler` 接口.
+
+> 事件处理程序类必须注册到依赖注入(DI),示例中使用了 `ITransientDependency`. 参阅[DI文档](Dependency-Injection.md)了解更多选项.
+
+## 事务和异常行为
+
+当一个事件发布,订阅的事件处理程序将立即执行.所以;
+
+* 如果处理程序**抛出一个异常**,它会影响发布该事件的代码. 这意味着它在 `PublishAsync` 调用上获得异常. 因此如果你想隐藏错误,在事件处理程序中**使用try-catch**.
+*如果在一个[工作单元](Unit-Of-Work.md)范围内执行的事件发布的代码,该事件处理程序也由工作单元覆盖. 这意味着,如果你的UOW是事务和处理程序抛出一个异常,事务会回滚.
+
+## 预定义的事件
+
+**发布实体创建,更新,删除事件**是常见的操作. ABP框架为所有的实体**自动**发布这些事件. 你只需要订阅相关的事件.
+
+**示例: 订阅用户创建事件**
+
+````csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities.Events;
+using Volo.Abp.EventBus;
+
+namespace AbpDemo
+{
+ public class MyHandler
+ : ILocalEventHandler>,
+ ITransientDependency
+ {
+ public async Task HandleEventAsync(
+ EntityCreatedEventData eventData)
+ {
+ var userName = eventData.Entity.UserName;
+ var email = eventData.Entity.Email;
+ //...
+ }
+ }
+}
+````
+
+这个类订阅 `EntityCreatedEventData`,它在用户创建后发布. 你可能需要向新用户发送一封"欢迎"电子邮件.
+
+这些事件有两种类型:过去时态的事件和进行时态的事件.
+
+### 用过去时态事件
+
+当相关工作单元完成且实体更改成功保存到数据库时,将发布带有过去时态的事件. 如果在这些事件处理程序上抛出异常,则**无法回滚**事务,因为事务已经提交.
+
+事件类型;
+
+* `EntityCreatedEventData` 当实体创建创建成功后发布.
+* `EntityUpdatedEventData` 当实体创建更新成功后发布.
+* `EntityDeletedEventData` 当实体创建删除成功后发布.
+* `EntityChangedEventData` 当实体创建,更新,删除后发布. 如果你需要监听任何类型的更改,它是一种快捷方式 - 而不是订阅单个事件.
+
+### 用于进行时态事件
+
+带有进行时态的事件在完成事务之前发布(如果数据库事务由所使用的数据库提供程序支持). 如果在这些事件处理程序上抛出异常,它**会回滚**事务,因为事务还没有完成,更改也没有保存到数据库中.
+
+事件类型;
+
+* `EntityCreatingEventData` 当新实体保存到数据库前发布.
+* `EntityUpdatingEventData` 当已存在实体更新到数据库前发布.
+* `EntityDeletingEventData` 删除实体前发布.
+* `EntityChangingEventData` 当实体创建,更新,删除前发布. 如果你需要监听任何类型的更改,它是一种快捷方式 - 而不是订阅单个事件.
+
+#### 它是如何实现的?
+
+在将更改保存到数据库时发布预构建事件;
+
+* 对于 EF Core, 他们在 `DbContext.SaveChanges` 发布.
+* 对于 MongoDB, 在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法发布(因为MongoDB没有更改追踪系统).
\ No newline at end of file
diff --git a/docs/zh-Hans/UI/Angular/Permission-Management.md b/docs/zh-Hans/UI/Angular/Permission-Management.md
index 3a50da9591..5c1ba5b4fb 100644
--- a/docs/zh-Hans/UI/Angular/Permission-Management.md
+++ b/docs/zh-Hans/UI/Angular/Permission-Management.md
@@ -8,7 +8,7 @@
```js
import { Store } from '@ngxs/store';
-import { ConfigState } from '../states';
+import { ConfigState } from '@abp/ng.core';
export class YourComponent {
constructor(private store: Store) {}
@@ -24,7 +24,7 @@ export class YourComponent {
或者你可以通过 `ConfigStateService` 获取它:
```js
-import { ConfigStateService } from '../services/config-state.service';
+import { ConfigStateService } from '@abp/ng.core';
export class YourComponent {
constructor(private configStateService: ConfigStateService) {}
@@ -42,7 +42,7 @@ export class YourComponent {
你可以使用 `PermissionDirective` 来根据用户的权限控制DOM元素是否可见.
```html
-
-
+
This content is only visible if the user has 'AbpIdentity.Roles' permission.
```
@@ -58,6 +58,8 @@ You can use `PermissionGuard` if you want to control authenticated user's permis
Add `requiredPolicy` to the `routes` property in your routing module.
```js
+import { PermissionGuard } from '@abp/ng.core';
+// ...
const routes: Routes = [
{
path: 'path',
diff --git a/docs/zh-Hans/Blob-Storing.md b/docs/zh-Hans/Blob-Storing.md
index 788b104edb..43b2ebb96b 100644
--- a/docs/zh-Hans/Blob-Storing.md
+++ b/docs/zh-Hans/Blob-Storing.md
@@ -169,7 +169,7 @@ public class ProfileAppService : ApplicationService
如果不使用泛型参数,直接注入 `IBlobContainer` (如上所述),会得到默认容器. 注入默认容器的另一种方法是使用 `IBlobContainer
+))
- {
- return false;
- }
-
- //Same instances must be considered as equal
- if (ReferenceEquals(this, obj))
- {
- return true;
- }
-
- //Transient objects are not considered as equal
- var other = (Entity)obj;
- if (EntityHelper.HasDefaultId(this) && EntityHelper.HasDefaultId(other))
- {
- return false;
- }
-
- //Must have a IS-A relation of types or must be same type
- var typeOfThis = GetType().GetTypeInfo();
- var typeOfOther = other.GetType().GetTypeInfo();
- if (!typeOfThis.IsAssignableFrom(typeOfOther) && !typeOfOther.IsAssignableFrom(typeOfThis))
- {
- return false;
- }
-
- //Different tenants may have an entity with same Id.
- if (this is IMultiTenant && other is IMultiTenant &&
- this.As().TenantId != other.As().TenantId)
- {
- return false;
- }
-
- return Id.Equals(other.Id);
- }
-
public override object[] GetKeys()
{
return new object[] {Id};
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs
index ad082c3fb0..65f2992257 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs
@@ -5,6 +5,8 @@ using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using JetBrains.Annotations;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Reflection;
namespace Volo.Abp.Domain.Entities
{
@@ -16,6 +18,98 @@ namespace Volo.Abp.Domain.Entities
private static readonly ConcurrentDictionary CachedIdProperties =
new ConcurrentDictionary();
+ public static bool EntityEquals(IEntity entity1, IEntity entity2)
+ {
+ if (entity1 == null || entity2 == null)
+ {
+ return false;
+ }
+
+ //Same instances must be considered as equal
+ if (ReferenceEquals(entity1, entity2))
+ {
+ return true;
+ }
+
+ //Must have a IS-A relation of types or must be same type
+ var typeOfEntity1 = entity1.GetType();
+ var typeOfEntity2 = entity2.GetType();
+ if (!typeOfEntity1.IsAssignableFrom(typeOfEntity2) && !typeOfEntity2.IsAssignableFrom(typeOfEntity1))
+ {
+ return false;
+ }
+
+ //Different tenants may have an entity with same Id.
+ if (entity1 is IMultiTenant && entity2 is IMultiTenant)
+ {
+ var tenant1Id = ((IMultiTenant) entity1).TenantId;
+ var tenant2Id = ((IMultiTenant) entity2).TenantId;
+
+ if (tenant1Id != tenant2Id)
+ {
+ if (tenant1Id == null || tenant2Id == null)
+ {
+ return false;
+ }
+
+ if (!tenant1Id.Equals(tenant2Id))
+ {
+ return false;
+ }
+ }
+ }
+
+ //Transient objects are not considered as equal
+ if (HasDefaultKeys(entity1) && HasDefaultKeys(entity2))
+ {
+ return false;
+ }
+
+ var entity1Keys = entity1.GetKeys();
+ var entity2Keys = entity2.GetKeys();
+
+ if (entity1Keys.Length != entity2Keys.Length)
+ {
+ return false;
+ }
+
+ for (var i = 0; i < entity1Keys.Length; i++)
+ {
+ var entity1Key = entity1Keys[i];
+ var entity2Key = entity2Keys[i];
+
+ if (entity1Key == null)
+ {
+ if (entity2Key == null)
+ {
+ //Both null, so considered as equals
+ continue;
+ }
+
+ //entity2Key is not null!
+ return false;
+ }
+
+ if (entity2Key == null)
+ {
+ //entity1Key was not null!
+ return false;
+ }
+
+ if (TypeHelper.IsDefaultValue(entity1Key) && TypeHelper.IsDefaultValue(entity2Key))
+ {
+ return false;
+ }
+
+ if (!entity1Key.Equals(entity2Key))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
public static bool IsEntity([NotNull] Type type)
{
return typeof(IEntity).IsAssignableFrom(type);
@@ -25,7 +119,8 @@ namespace Volo.Abp.Domain.Entities
{
foreach (var interfaceType in type.GetInterfaces())
{
- if (interfaceType.GetTypeInfo().IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IEntity<>))
+ if (interfaceType.GetTypeInfo().IsGenericType &&
+ interfaceType.GetGenericTypeDefinition() == typeof(IEntity<>))
{
return true;
}
@@ -55,6 +150,44 @@ namespace Volo.Abp.Domain.Entities
return false;
}
+ private static bool IsDefaultKeyValue(object value)
+ {
+ if (value == null)
+ {
+ return true;
+ }
+
+ var type = value.GetType();
+
+ //Workaround for EF Core since it sets int/long to min value when attaching to DbContext
+ if (type == typeof(int))
+ {
+ return Convert.ToInt32(value) <= 0;
+ }
+
+ if (type == typeof(long))
+ {
+ return Convert.ToInt64(value) <= 0;
+ }
+
+ return TypeHelper.IsDefaultValue(value);
+ }
+
+ public static bool HasDefaultKeys([NotNull] IEntity entity)
+ {
+ Check.NotNull(entity, nameof(entity));
+
+ foreach (var key in entity.GetKeys())
+ {
+ if (!IsDefaultKeyValue(key))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
///
/// Tries to find the primary key type of the given entity type.
/// May return null if given type does not implement , IAutoEntityDistributedEventSelectorList
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs
new file mode 100644
index 0000000000..d2a0622f54
--- /dev/null
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+ public static class AutoEntityDistributedEventSelectorListExtensions
+ {
+ public const string AllEntitiesSelectorName = "All";
+
+ public static void AddNamespace([NotNull] this IAutoEntityDistributedEventSelectorList selectors, [NotNull] string namespaceName)
+ {
+ Check.NotNull(selectors, nameof(selectors));
+
+ var selectorName = "Namespace:" + namespaceName;
+ if (selectors.Any(s => s.Name == selectorName))
+ {
+ return;
+ }
+
+ selectors.Add(
+ new NamedTypeSelector(
+ selectorName,
+ t => t.FullName?.StartsWith(namespaceName) ?? false
+ )
+ );
+ }
+
+ ///
+ /// Adds a specific entity type and the types derived from that entity type.
+ ///
+ /// Type of the entity
+ public static void Add([NotNull] this IAutoEntityDistributedEventSelectorList selectors)
+ where TEntity : IEntity
+ {
+ Check.NotNull(selectors, nameof(selectors));
+
+ var selectorName = "Entity:" + typeof(TEntity).FullName;
+ if (selectors.Any(s => s.Name == selectorName))
+ {
+ return;
+ }
+
+ selectors.Add(
+ new NamedTypeSelector(
+ selectorName,
+ t => typeof(TEntity).IsAssignableFrom(t)
+ )
+ );
+ }
+
+ ///
+ /// Adds all entity types.
+ ///
+ public static void AddAll([NotNull] this IAutoEntityDistributedEventSelectorList selectors)
+ {
+ Check.NotNull(selectors, nameof(selectors));
+
+ if (selectors.Any(s => s.Name == AllEntitiesSelectorName))
+ {
+ return;
+ }
+
+ selectors.Add(
+ new NamedTypeSelector(
+ AllEntitiesSelectorName,
+ t => typeof(IEntity).IsAssignableFrom(t)
+ )
+ );
+ }
+
+ public static void Add(
+ [NotNull] this IAutoEntityDistributedEventSelectorList selectors,
+ string selectorName,
+ Func predicate)
+ {
+ Check.NotNull(selectors, nameof(selectors));
+
+ if (selectors.Any(s => s.Name == selectorName))
+ {
+ throw new AbpException($"There is already a selector added before with the same name: {selectorName}");
+ }
+
+ selectors.Add(
+ new NamedTypeSelector(
+ selectorName,
+ predicate
+ )
+ );
+ }
+
+ public static void Add(
+ [NotNull] this IAutoEntityDistributedEventSelectorList selectors,
+ Func predicate)
+ {
+ selectors.Add(Guid.NewGuid().ToString("N"), predicate);
+ }
+
+ public static bool RemoveByName(
+ [NotNull] this IAutoEntityDistributedEventSelectorList selectors,
+ [NotNull] string name)
+ {
+ Check.NotNull(selectors, nameof(selectors));
+ Check.NotNull(name, nameof(name));
+
+ return selectors.RemoveAll(s => s.Name == name).Count > 0;
+ }
+
+
+ public static bool IsMatch([NotNull] this IAutoEntityDistributedEventSelectorList selectors, Type entityType)
+ {
+ Check.NotNull(selectors, nameof(selectors));
+ return selectors.Any(s => s.Predicate(entityType));
+ }
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
index 24a757fb08..15a41bad9d 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.DependencyInjection;
using Volo.Abp.DynamicProxy;
-using Volo.Abp.EventBus.Distributed;
using Volo.Abp.ObjectMapping;
namespace Volo.Abp.Domain.Entities.Events.Distributed
@@ -11,10 +10,11 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency
{
protected IHybridServiceScopeFactory HybridServiceScopeFactory { get; }
- protected AbpDistributedEventBusOptions Options { get; }
+
+ protected AbpDistributedEntityEventOptions Options { get; }
public EntityToEtoMapper(
- IOptions options,
+ IOptions options,
IHybridServiceScopeFactory hybridServiceScopeFactory)
{
HybridServiceScopeFactory = hybridServiceScopeFactory;
diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionary.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs
similarity index 79%
rename from framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionary.cs
rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs
index aae99d0cb7..3988ceb3b5 100644
--- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionary.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionary.cs
@@ -1,7 +1,8 @@
using System;
using System.Collections.Generic;
+using Volo.Abp.EventBus.Distributed;
-namespace Volo.Abp.EventBus.Distributed
+namespace Volo.Abp.Domain.Entities.Events.Distributed
{
public class EtoMappingDictionary : Dictionary
{
diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionaryItem.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs
similarity index 87%
rename from framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionaryItem.cs
rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs
index d634c44b4d..2550c83a53 100644
--- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/EtoMappingDictionaryItem.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EtoMappingDictionaryItem.cs
@@ -1,6 +1,6 @@
using System;
-namespace Volo.Abp.EventBus.Distributed
+namespace Volo.Abp.Domain.Entities.Events.Distributed
{
public class EtoMappingDictionaryItem
{
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IAutoEntityDistributedEventSelectorList.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IAutoEntityDistributedEventSelectorList.cs
new file mode 100644
index 0000000000..fc130eb55c
--- /dev/null
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IAutoEntityDistributedEventSelectorList.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+ public interface IAutoEntityDistributedEventSelectorList : IList
+ {
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
index c9219feffc..5de3b22c77 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
@@ -1,6 +1,10 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
using Volo.Abp.Auditing;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Entities.Events.Distributed;
@@ -17,21 +21,26 @@ namespace Volo.Abp.Domain.Entities.Events
///
public class EntityChangeEventHelper : IEntityChangeEventHelper, ITransientDependency
{
+ public ILogger Logger { get; set; }
public ILocalEventBus LocalEventBus { get; set; }
public IDistributedEventBus DistributedEventBus { get; set; }
protected IUnitOfWorkManager UnitOfWorkManager { get; }
protected IEntityToEtoMapper EntityToEtoMapper { get; }
+ protected AbpDistributedEntityEventOptions DistributedEntityEventOptions { get; }
public EntityChangeEventHelper(
IUnitOfWorkManager unitOfWorkManager,
- IEntityToEtoMapper entityToEtoMapper)
+ IEntityToEtoMapper entityToEtoMapper,
+ IOptions distributedEntityEventOptions)
{
UnitOfWorkManager = unitOfWorkManager;
EntityToEtoMapper = entityToEtoMapper;
+ DistributedEntityEventOptions = distributedEntityEventOptions.Value;
LocalEventBus = NullLocalEventBus.Instance;
DistributedEventBus = NullDistributedEventBus.Instance;
+ Logger = NullLogger.Instance;
}
public async Task TriggerEventsAsync(EntityChangeReport changeReport)
@@ -52,6 +61,7 @@ namespace Volo.Abp.Domain.Entities.Events
LocalEventBus,
typeof(EntityCreatingEventData<>),
entity,
+ entity,
true
);
}
@@ -62,27 +72,44 @@ namespace Volo.Abp.Domain.Entities.Events
LocalEventBus,
typeof(EntityCreatedEventData<>),
entity,
+ entity,
false
);
- var eto = EntityToEtoMapper.Map(entity);
- if (eto != null)
+ if (ShouldPublishDistributedEventForEntity(entity))
{
- await TriggerEventWithEntity(
- DistributedEventBus,
- typeof(EntityCreatedEto<>),
- eto,
- false
- );
+ var eto = EntityToEtoMapper.Map(entity);
+ if (eto != null)
+ {
+ await TriggerEventWithEntity(
+ DistributedEventBus,
+ typeof(EntityCreatedEto<>),
+ eto,
+ entity,
+ false
+ );
+ }
}
}
+ private bool ShouldPublishDistributedEventForEntity(object entity)
+ {
+ return DistributedEntityEventOptions
+ .AutoEventSelectors
+ .IsMatch(
+ ProxyHelper
+ .UnProxy(entity)
+ .GetType()
+ );
+ }
+
public virtual async Task TriggerEntityUpdatingEventAsync(object entity)
{
await TriggerEventWithEntity(
LocalEventBus,
typeof(EntityUpdatingEventData<>),
entity,
+ entity,
true
);
}
@@ -93,18 +120,23 @@ namespace Volo.Abp.Domain.Entities.Events
LocalEventBus,
typeof(EntityUpdatedEventData<>),
entity,
+ entity,
false
);
- var eto = EntityToEtoMapper.Map(entity);
- if (eto != null)
+ if (ShouldPublishDistributedEventForEntity(entity))
{
- await TriggerEventWithEntity(
- DistributedEventBus,
- typeof(EntityUpdatedEto<>),
- eto,
- false
- );
+ var eto = EntityToEtoMapper.Map(entity);
+ if (eto != null)
+ {
+ await TriggerEventWithEntity(
+ DistributedEventBus,
+ typeof(EntityUpdatedEto<>),
+ eto,
+ entity,
+ false
+ );
+ }
}
}
@@ -114,6 +146,7 @@ namespace Volo.Abp.Domain.Entities.Events
LocalEventBus,
typeof(EntityDeletingEventData<>),
entity,
+ entity,
true
);
}
@@ -124,18 +157,23 @@ namespace Volo.Abp.Domain.Entities.Events
LocalEventBus,
typeof(EntityDeletedEventData<>),
entity,
+ entity,
false
);
- var eto = EntityToEtoMapper.Map(entity);
- if (eto != null)
+ if (ShouldPublishDistributedEventForEntity(entity))
{
- await TriggerEventWithEntity(
- DistributedEventBus,
- typeof(EntityDeletedEto<>),
- EntityToEtoMapper.Map(entity),
- false
- );
+ var eto = EntityToEtoMapper.Map(entity);
+ if (eto != null)
+ {
+ await TriggerEventWithEntity(
+ DistributedEventBus,
+ typeof(EntityDeletedEto<>),
+ eto,
+ entity,
+ false
+ );
+ }
}
}
@@ -182,22 +220,129 @@ namespace Volo.Abp.Domain.Entities.Events
{
foreach (var distributedEvent in distributedEvents)
{
- await DistributedEventBus.PublishAsync(distributedEvent.EventData.GetType(), distributedEvent.EventData);
+ await DistributedEventBus.PublishAsync(distributedEvent.EventData.GetType(),
+ distributedEvent.EventData);
}
}
- protected virtual async Task TriggerEventWithEntity(IEventBus eventPublisher, Type genericEventType, object entity, bool triggerInCurrentUnitOfWork)
+ protected virtual async Task TriggerEventWithEntity(
+ IEventBus eventPublisher,
+ Type genericEventType,
+ object entityOrEto,
+ object originalEntity,
+ bool triggerInCurrentUnitOfWork)
{
- var entityType = ProxyHelper.UnProxy(entity).GetType();
+ var entityType = ProxyHelper.UnProxy(entityOrEto).GetType();
var eventType = genericEventType.MakeGenericType(entityType);
+ var currentUow = UnitOfWorkManager.Current;
- if (triggerInCurrentUnitOfWork || UnitOfWorkManager.Current == null)
+ if (triggerInCurrentUnitOfWork || currentUow == null)
{
- await eventPublisher.PublishAsync(eventType, Activator.CreateInstance(eventType, entity));
+ await eventPublisher.PublishAsync(
+ eventType,
+ Activator.CreateInstance(eventType, entityOrEto)
+ );
+
return;
}
- UnitOfWorkManager.Current.OnCompleted(() => eventPublisher.PublishAsync(eventType, Activator.CreateInstance(eventType, entity)));
+ var eventList = GetEventList(currentUow);
+ var isFirstEvent = !eventList.Any();
+
+ eventList.AddUniqueEvent(eventPublisher, eventType, entityOrEto, originalEntity);
+
+ /* Register to OnCompleted if this is the first item.
+ * Other items will already be in the list once the UOW completes.
+ */
+ if (isFirstEvent)
+ {
+ currentUow.OnCompleted(
+ async () =>
+ {
+ foreach (var eventEntry in eventList)
+ {
+ try
+ {
+ await eventPublisher.PublishAsync(
+ eventEntry.EventType,
+ Activator.CreateInstance(eventEntry.EventType, eventEntry.EntityOrEto)
+ );
+ }
+ catch (Exception ex)
+ {
+ Logger.LogError(
+ $"Caught an exception while publishing the event '{eventType.FullName}' for the entity '{entityOrEto}'");
+ Logger.LogException(ex);
+ }
+ }
+ }
+ );
+ }
+ }
+
+ private EntityChangeEventList GetEventList(IUnitOfWork currentUow)
+ {
+ return (EntityChangeEventList) currentUow.Items.GetOrAdd(
+ "AbpEntityChangeEventList",
+ () => new EntityChangeEventList()
+ );
+ }
+
+ private class EntityChangeEventList : List
+ {
+ public void AddUniqueEvent(IEventBus eventBus, Type eventType, object entityOrEto, object originalEntity)
+ {
+ var newEntry = new EntityChangeEventEntry(eventBus, eventType, entityOrEto, originalEntity);
+
+ //Latest "same" event overrides the previous events.
+ for (var i = 0; i < Count; i++)
+ {
+ if (this[i].IsSameEvent(newEntry))
+ {
+ this[i] = newEntry;
+ return;
+ }
+ }
+
+ //If this is a "new" event, add to the end
+ Add(newEntry);
+ }
+ }
+
+ private class EntityChangeEventEntry
+ {
+ public IEventBus EventBus { get; }
+
+ public Type EventType { get; }
+
+ public object EntityOrEto { get; }
+
+ public object OriginalEntity { get; }
+
+ public EntityChangeEventEntry(IEventBus eventBus, Type eventType, object entityOrEto, object originalEntity)
+ {
+ EventType = eventType;
+ EntityOrEto = entityOrEto;
+ OriginalEntity = originalEntity;
+ EventBus = eventBus;
+ }
+
+ public bool IsSameEvent(EntityChangeEventEntry otherEntry)
+ {
+ if (EventBus != otherEntry.EventBus || EventType != otherEntry.EventType)
+ {
+ return false;
+ }
+
+ var originalEntityRef = OriginalEntity as IEntity;
+ var otherOriginalEntityRef = otherEntry.OriginalEntity as IEntity;
+ if (originalEntityRef == null || otherOriginalEntityRef == null)
+ {
+ return false;
+ }
+
+ return EntityHelper.EntityEquals(originalEntityRef, otherOriginalEntityRef);
+ }
}
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs
index 1d1d7768f2..342e7b77bb 100644
--- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs
+++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs
@@ -5,12 +5,10 @@ namespace Volo.Abp.EventBus.Distributed
public class AbpDistributedEventBusOptions
{
public ITypeList Handlers { get; }
- public EtoMappingDictionary EtoMappings { get; set; }
public AbpDistributedEventBusOptions()
{
Handlers = new TypeList();
- EtoMappings = new EtoMappingDictionary();
}
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/tr.json b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/tr.json
new file mode 100644
index 0000000000..4eb4a1209b
--- /dev/null
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/tr.json
@@ -0,0 +1,7 @@
+{
+ "culture": "tr",
+ "texts": {
+ "DisplayName:Abp.Localization.DefaultLanguage": "Varsayılan dil",
+ "Description:Abp.Localization.DefaultLanguage": "Varsayılan uygulama dili."
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Entity_Tests.cs b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Entity_Tests.cs
new file mode 100644
index 0000000000..779ac3fe49
--- /dev/null
+++ b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Entity_Tests.cs
@@ -0,0 +1,139 @@
+using System;
+using Shouldly;
+using Volo.Abp.MultiTenancy;
+using Xunit;
+
+namespace Volo.Abp.Domain.Entities
+{
+ public class Entity_Tests
+ {
+ [Fact]
+ public void EntityEquals_Should_Return_True_For_Same_Keys()
+ {
+ var idValue1 = Guid.NewGuid();
+ var idValue2 = Guid.NewGuid();
+
+ new Person(idValue1).EntityEquals(new Person(idValue1)).ShouldBeTrue();
+
+ new Car(42).EntityEquals(new Car(42)).ShouldBeTrue();
+
+ new Product("a").EntityEquals(new Product("a")).ShouldBeTrue();
+
+ new Phone(idValue1, "123").EntityEquals(new Phone(idValue1, "123")).ShouldBeTrue();
+ }
+
+ [Fact]
+ public void EntityEquals_Should_Return_False_For_Different_Keys()
+ {
+ var idValue1 = Guid.NewGuid();
+ var idValue2 = Guid.NewGuid();
+
+ new Person(idValue1).EntityEquals(new Person()).ShouldBeFalse();
+ new Person(idValue1).EntityEquals(new Person(idValue2)).ShouldBeFalse();
+
+ new Car(42).EntityEquals(new Car()).ShouldBeFalse();
+ new Car(42).EntityEquals(new Car(43)).ShouldBeFalse();
+
+ new Product("a").EntityEquals(new Product()).ShouldBeFalse();
+ new Product("a").EntityEquals(new Product("b")).ShouldBeFalse();
+
+ new Phone(idValue1, "123").EntityEquals(new Phone()).ShouldBeFalse();
+ new Phone(idValue1, "123").EntityEquals(new Phone(idValue1, null)).ShouldBeFalse();
+ new Phone(idValue1, "123").EntityEquals(new Phone(idValue1, "321")).ShouldBeFalse();
+ }
+
+ [Fact]
+ public void EntityEquals_Should_Return_False_For_Both_Default_Keys()
+ {
+ new Person().EntityEquals(new Person()).ShouldBeFalse();
+
+ new Car().EntityEquals(new Car()).ShouldBeFalse();
+
+ new Product().EntityEquals(new Product()).ShouldBeFalse();
+
+ new Phone().EntityEquals(new Phone()).ShouldBeFalse();
+ }
+
+ [Fact]
+ public void Different_Tenants_With_Same_Keys_Considered_As_Different_Objects()
+ {
+ var tenantId1 = Guid.NewGuid();
+ var tenantId2 = Guid.NewGuid();
+
+ new Car(42, tenantId1).EntityEquals(new Car(42)).ShouldBeFalse();
+ new Car(42).EntityEquals(new Car(42, tenantId2)).ShouldBeFalse();
+ new Car(42, tenantId1).EntityEquals(new Car(42, tenantId2)).ShouldBeFalse();
+ }
+
+ [Fact]
+ public void Same_Tenants_With_Same_Keys_Considered_As_Same_Objects()
+ {
+ var tenantId1 = Guid.NewGuid();
+
+ new Car(42).EntityEquals(new Car(42)).ShouldBeTrue();
+ new Car(42, tenantId1).EntityEquals(new Car(42, tenantId1)).ShouldBeTrue();
+ }
+
+ public class Person : Entity
+ {
+ public Person()
+ {
+ }
+
+ public Person(Guid id)
+ : base(id)
+ {
+ }
+ }
+
+ public class Car : Entity, IMultiTenant
+ {
+ public Guid? TenantId { get; }
+
+ public Car()
+ {
+ }
+
+ public Car(int id, Guid? tenantId = null)
+ : base(id)
+ {
+ TenantId = tenantId;
+ }
+ }
+
+ public class Product : Entity
+ {
+ public Product()
+ {
+ }
+
+ public Product(string id)
+ : base(id)
+ {
+ }
+ }
+
+ public class Phone : Entity
+ {
+ public Guid PersonId { get; set; }
+
+ public string Number { get; set; }
+
+ public Phone()
+ {
+
+ }
+
+ public Phone(Guid personId, string number)
+ {
+ PersonId = personId;
+ Number = number;
+ }
+
+ public override object[] GetKeys()
+ {
+ return new Object[] {PersonId, Number};
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions_Tests.cs b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions_Tests.cs
new file mode 100644
index 0000000000..9949d23f1f
--- /dev/null
+++ b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions_Tests.cs
@@ -0,0 +1,22 @@
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
+{
+ public class AutoEntityDistributedEventSelectorListExtensions_Tests
+ {
+ [Fact]
+ public void Add_Entity()
+ {
+ var selectors = new AutoEntityDistributedEventSelectorList();
+ selectors.Add();
+
+ selectors.IsMatch(typeof(MyEntity)).ShouldBeTrue();
+ }
+
+ private class MyEntity : Entity
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/tr.json b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/tr.json
new file mode 100644
index 0000000000..6c3c94cfdf
--- /dev/null
+++ b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/tr.json
@@ -0,0 +1,6 @@
+{
+ "culture": "tr",
+ "texts": {
+ "hello": "Merhaba"
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DomainEvents/EntityChangeEvents_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DomainEvents/EntityChangeEvents_Tests.cs
index 2b94ee1ed9..9f4b67d089 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DomainEvents/EntityChangeEvents_Tests.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DomainEvents/EntityChangeEvents_Tests.cs
@@ -4,6 +4,6 @@ namespace Volo.Abp.EntityFrameworkCore.DomainEvents
{
public class EntityChangeEvents_Tests : EntityChangeEvents_Tests
{
-
+
}
}
diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
index 961f1ba0a4..71c2fafe2e 100644
--- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
+++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
@@ -1,6 +1,5 @@
using System.Globalization;
using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization;
using Shouldly;
using Volo.Abp.Localization.TestResources.Base.CountryNames;
diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/CountryNames/tr.json b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/CountryNames/tr.json
index 1f38b5c8d4..a6b6ce2a44 100644
--- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/CountryNames/tr.json
+++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/CountryNames/tr.json
@@ -1,6 +1,7 @@
-{
+{
"culture": "tr",
"texts": {
- "USA": "Amerika Birleşik Devletleri"
+ "USA": "Amerika Birleşik Devletleri",
+ "Brazil": "Brezilya"
}
}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/Validation/tr.json b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/Validation/tr.json
new file mode 100644
index 0000000000..4a1cb24c25
--- /dev/null
+++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Base/Validation/tr.json
@@ -0,0 +1,7 @@
+{
+ "culture": "tr",
+ "texts": {
+ "ThisFieldIsRequired": "Bu alan zorunludur",
+ "MaxLenghtErrorMessage": "Bu alan maksimum '{0}' karakter olabilir"
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json
index fa2d23246b..ee1900e150 100644
--- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json
+++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json
@@ -1,9 +1,10 @@
-{
+{
"culture": "tr",
"texts": {
"Hello {0}.": "Merhaba {0}.",
"Car": "Araba",
"CarPlural": "Araba",
+ "MaxLenghtErrorMessage": "Bu alanın uzunluğu maksimum '{0}' karakter olabilir",
"Universe": "Evren"
}
}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/SourceExt/tr.json b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/SourceExt/tr.json
new file mode 100644
index 0000000000..7023061d35
--- /dev/null
+++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/SourceExt/tr.json
@@ -0,0 +1,6 @@
+{
+ "culture": "tr",
+ "texts": {
+
+ }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
index 683c99d417..41079bfa9e 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
@@ -4,7 +4,7 @@ using Volo.Abp.Autofac;
using Volo.Abp.Modularity;
using Volo.Abp.TestApp.Domain;
using Volo.Abp.AutoMapper;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
using Volo.Abp.TestApp.Application.Dto;
using Volo.Abp.Threading;
@@ -45,8 +45,9 @@ namespace Volo.Abp.TestApp
private void ConfigureDistributedEventBus()
{
- Configure(options =>
+ Configure(options =>
{
+ options.AutoEventSelectors.Add();
options.EtoMappings.Add();
});
}
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs
index fe4e0862f3..cb16a46439 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs
@@ -84,5 +84,44 @@ namespace Volo.Abp.TestApp.Testing
createdEventTriggered.ShouldBeTrue();
createdEtoTriggered.ShouldBeTrue();
}
+
+ [Fact]
+ public async Task Multiple_Update_Should_Result_With_Single_Updated_Event_In_The_Same_Uow()
+ {
+ var personId = Guid.NewGuid();
+ await PersonRepository.InsertAsync(new Person(personId, Guid.NewGuid().ToString("D"), 42));
+
+ var updateEventCount = 0;
+ var updatedAge = 0;
+
+ DistributedEventBus.Subscribe>(eto =>
+ {
+ updateEventCount++;
+ updatedAge = eto.Entity.Age;
+ return Task.CompletedTask;
+ });
+
+ using (var uow = GetRequiredService().Begin())
+ {
+ var person = await PersonRepository.GetAsync(personId);
+
+ person.Age = 43;
+ await PersonRepository.UpdateAsync(person, autoSave: true);
+ updateEventCount.ShouldBe(0);
+
+ person.Age = 44;
+ await PersonRepository.UpdateAsync(person, autoSave: true);
+ updateEventCount.ShouldBe(0);
+
+ person.Age = 45;
+ await PersonRepository.UpdateAsync(person, autoSave: true);
+ updateEventCount.ShouldBe(0);
+
+ await uow.CompleteAsync();
+ }
+
+ updateEventCount.ShouldBe(1);
+ updatedAge.ShouldBe(45);
+ }
}
}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
index 44cebc1190..60d5f40634 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json
@@ -1,4 +1,4 @@
-{
+{
"culture": "tr",
"texts": {
"UserName": "Kullanıcı adı",
@@ -11,10 +11,12 @@
"InvalidUserNameOrPassword": "Kullanıcı adı ya da şifre geçersiz!",
"LoginIsNotAllowed": "Giriş yapamazsınız! E-posta adresinizi ya da telefon numaranızı doğrulamanız gerekiyor.",
"SelfRegistrationDisabledMessage": "Bu uygulama için kullanıcıların kendi kendilerine kaydolmaları engellenmiştir. Yeni bir kullanıcı kaydetmek için lütfen uygulama yöneticisi ile iletişime geçin.",
+ "LocalLoginDisabledMessage": "Bu uygulama için local login devre dışı bırakılmıştır.",
"Login": "Giriş yap",
"Cancel": "İptal",
"Register": "Kayıt ol",
"AreYouANewUser": "Yeni bir kullanıcı mısınız?",
+ "AlreadyRegistered": "Zaten kayıtlı mı?",
"InvalidLoginRequest": "Başarısız giriş isteği",
"ThereAreNoLoginSchemesConfiguredForThisClient": "Bu client için konfigüre edilmiş giriş şeması bulunamadı.",
"LogInUsingYourProviderAccount": "{0} hesabınızla giriş yapın.",
@@ -34,6 +36,10 @@
"PasswordChanged": "Şifre değiştirildi",
"NewPasswordConfirmFailed": "Lütfen yeni şifreyi onaylayın.",
"Manage": "Manage",
- "ManageYourProfile": "Profilinizi yönetin"
+ "ManageYourProfile": "Profilinizi yönetin",
+ "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "self-registration etkin mi ?",
+ "Description:Abp.Account.IsSelfRegistrationEnabled": "Bir kullanıcının hesabı kendisi tarafından kaydedip kaydedememesidir.",
+ "DisplayName:Abp.Account.EnableLocalLogin": "Yerel bir hesapla kimlik doğrulaması",
+ "Description:Abp.Account.EnableLocalLogin": "Sunucunun, kullanıcıların yerel bir hesapla kimlik doğrulamasına izin verip vermeyeceğini belirtir."
}
}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json
index b4b6cba0be..78e18601ff 100644
--- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json
+++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/tr.json
@@ -1,4 +1,4 @@
-{
+{
"culture": "tr",
"texts": {
"Menu:Blogs": "Bloglar",
@@ -20,7 +20,6 @@
"SeeAll": "Hepsini Gör",
"PopularTags": "Popüler Etiketler",
"WiewsWithCount": "{0} görüntüleme",
- "ShareOnTwitter": "Twitter'da paylaş",
"LastPosts": "Son Yazılar",
"LeaveComment": "Yorum Bırak",
"TagsInThisArticle": "Makalenin Etiketleri",
@@ -33,6 +32,7 @@
"AreYouSure": "Emin misiniz?",
"CommentWithCount": "{0} yorum",
"Comment": "Yorum",
+ "ShareOnTwitter": "Twitter'da paylaş",
"CoverImage": "Kapak resmi",
"CreateANewPost": "Yeni Yazı oluştur",
"CreateANewBlog": "Yeni Blog Ekle",
@@ -43,6 +43,7 @@
"Description": "Açıklama",
"Blogs": "Bloglar",
"Tags": "Etiketler",
- "ShareOn": "Paylaş"
+ "ShareOn": "Paylaş",
+ "TitleLengthWarning": "Başlığınınz SEO dostu olabilmesi için 60 karakterden az olmasını sağlayın!"
}
}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs
index f39c4c88fb..3179303215 100644
--- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs
+++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AutoMapper;
using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
using Volo.Abp.Modularity;
using Volo.Blogging.Blogs;
using Volo.Blogging.Comments;
@@ -25,7 +25,7 @@ namespace Volo.Blogging
options.AddProfile(validate: true);
});
- Configure(options =>
+ Configure(options =>
{
options.EtoMappings.Add(typeof(BloggingDomainModule));
options.EtoMappings.Add(typeof(BloggingDomainModule));
diff --git a/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/tr.json b/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/tr.json
index 8f49c6e952..c88e95867d 100644
--- a/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/tr.json
+++ b/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/tr.json
@@ -1,6 +1,7 @@
-{
+{
"culture": "tr",
"texts": {
+ "DocsTitle": "VoloDocs",
"WelcomeVoloDocs": "VoloDocs Hoşgeldiniz!",
"NoProjectWarning": "Henüz bir proje yok!",
"CreateYourFirstProject": "İlk projenizi oluşturmak için tıklayın",
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/GetAllInput.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/GetAllInput.cs
index ced1c1ceda..e375f6ba0b 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/GetAllInput.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/GetAllInput.cs
@@ -12,10 +12,28 @@ namespace Volo.Docs.Admin.Documents
[StringLength(DocumentConsts.MaxNameLength)]
public string Name { get; set; }
+ [StringLength(DocumentConsts.MaxVersionNameLength)]
+ public string Version { get; set; }
+
[StringLength(DocumentConsts.MaxLanguageCodeNameLength)]
public string LanguageCode { get; set; }
- [StringLength(DocumentConsts.MaxVersionNameLength)]
- public string Version { get; set; }
+ [StringLength(DocumentConsts.MaxFileNameNameLength)]
+ public string FileName { get; set; }
+
+ [StringLength(DocumentConsts.MaxFormatNameLength)]
+ public string Format { get; set; }
+
+ public DateTime? CreationTimeMin { get; set; }
+ public DateTime? CreationTimeMax { get; set; }
+
+ public DateTime? LastUpdatedTimeMin { get; set; }
+ public DateTime? LastUpdatedTimeMax { get; set; }
+
+ public DateTime? LastSignificantUpdateTimeMin { get; set; }
+ public DateTime? LastSignificantUpdateTimeMax { get; set; }
+
+ public DateTime? LastCachedTimeMin { get; set; }
+ public DateTime? LastCachedTimeMax { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json
index 32d0b3bc27..b73f43317c 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json
@@ -43,6 +43,16 @@
"ReIndexDocumentConfirmation": "Are you sure you want to reindex this item?",
"DeleteDocumentFromDbConfirmation": "Are you sure you want to delete this item from database?",
"DeleteFromDatabase": "Delete from database",
- "Deleted": "Deleted"
+ "Deleted": "Deleted",
+ "Search": "Search",
+ "StartDate": "Start date",
+ "EndDate": "End date",
+ "CreationTime": "Creation time",
+ "LastUpdateTime": "Last update",
+ "LastSignificantUpdateTime": "Last significant update",
+ "Version": "Version",
+ "LanguageCode": "Language code",
+ "FileName": "File name",
+ "LastCachedTime": "Cache time"
}
}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json
index c40893e538..319a901004 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json
@@ -1,4 +1,4 @@
-{
+{
"culture": "tr",
"texts": {
"Permission:DocumentManagement": "Döküman yönetimi",
@@ -7,6 +7,7 @@
"Permission:Delete": "Sil",
"Permission:Create": "Oluştur",
"Permission:Documents": "Döküman",
+ "Menu:Documents": "Dokümanlar",
"Menu:DocumentManagement": "Dökümanlar",
"Menu:ProjectManagement": "Projeler",
"CreateANewProject": "Yeni proje oluştur",
@@ -29,8 +30,19 @@
"DisplayName:LatestVersionBranchName": "Son versiyon Branch adı",
"DisplayName:GitHubRootUrl": "GitHub kök adresi",
"DisplayName:GitHubAccessToken": "GitHub erişim token",
+ "DisplayName:GitHubUserAgent": "GitHub kullanıcı temsilcisi",
"DisplayName:All": "Çekme bütün",
"DisplayName:LanguageCode": "Dil kodu",
- "DisplayName:Version": "versiyon"
+ "DisplayName:Version": "versiyon",
+ "Documents": "Dokümanlar",
+ "RemoveFromCache": "Önbellekten kaldır",
+ "Reindex": "Yeniden İndeksle",
+ "ReindexCompleted": "Yeniden indeksleme tamamlandı",
+ "RemovedFromCache": "Önbellekten kaldırıldı",
+ "RemoveFromCacheConfirmation": "Bu maddeyi önbellekten kaldırmak istediğiniz emin misiniz?",
+ "ReIndexDocumentConfirmation": "Bu maddeyi yeniden indekslemek istediğinize emin misiniz?",
+ "DeleteDocumentFromDbConfirmation": "Bu maddeyi veritabanından silmek istediğinize emin misiniz?",
+ "DeleteFromDatabase": "Veritabanından sil",
+ "Deleted": "Silindi"
}
}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
index 0868e9eb80..cb6443d268 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
@@ -137,20 +137,40 @@ namespace Volo.Docs.Admin.Documents
public async Task> GetAllAsync(GetAllInput input)
{
var totalCount = await _documentRepository.GetAllCountAsync(
- projectId: input.ProjectId,
- name: input.Name,
- version: input.Version,
- languageCode: input.LanguageCode,
- sorting: input.Sorting,
- maxResultCount: input.MaxResultCount,
- skipCount: input.SkipCount
- );
+ projectId: input.ProjectId,
+ name: input.Name,
+ version: input.Version,
+ languageCode: input.LanguageCode,
+ fileName: input.FileName,
+ format: input.Format,
+ creationTimeMin: input.CreationTimeMin,
+ creationTimeMax: input.CreationTimeMax,
+ lastUpdatedTimeMin: input.LastUpdatedTimeMin,
+ lastUpdatedTimeMax: input.LastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: input.LastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: input.LastSignificantUpdateTimeMax,
+ lastCachedTimeMin: input.LastCachedTimeMin,
+ lastCachedTimeMax: input.LastCachedTimeMax,
+ sorting: input.Sorting,
+ maxResultCount: input.MaxResultCount,
+ skipCount: input.SkipCount
+ );
var docs = await _documentRepository.GetAllAsync(
projectId: input.ProjectId,
name: input.Name,
version: input.Version,
languageCode: input.LanguageCode,
+ fileName: input.FileName,
+ format: input.Format,
+ creationTimeMin: input.CreationTimeMin,
+ creationTimeMax: input.CreationTimeMax,
+ lastUpdatedTimeMin: input.LastUpdatedTimeMin,
+ lastUpdatedTimeMax: input.LastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: input.LastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: input.LastSignificantUpdateTimeMax,
+ lastCachedTimeMin: input.LastCachedTimeMin,
+ lastCachedTimeMax: input.LastCachedTimeMax,
sorting: input.Sorting,
maxResultCount: input.MaxResultCount,
skipCount: input.SkipCount
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 876d475dfc..1afd658afe 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -22,31 +22,194 @@
-
-
-
- *@
-
-
-
-
-
-
- @L["Actions"]
- @L["Name"]
- @L["Version"]
- @L["LanguageCode"]
- @L["FileName"]
- @L["Format"]
- @L["CreationTime"]
- @L["LastUpdatedTime"]
- @L["LastSignificantUpdateTime"]
- @L["LastCachedTime"]
-
-
-
-
-
+@section styles {
+ 2.8
+
+
+
@@ -29,8 +32,7 @@
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json b/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json
new file mode 100644
index 0000000000..32ae3754e2
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json
@@ -0,0 +1,6 @@
+[
+ {
+ "outputFile": "Pages/Docs/Admin/Documents/index.css",
+ "inputFile": "Pages/Docs/Admin/Documents/index.scss"
+ }
+]
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json.defaults b/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json.defaults
new file mode 100644
index 0000000000..b3519312c4
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Web/compilerconfig.json.defaults
@@ -0,0 +1,63 @@
+{
+ "compilers": {
+ "less": {
+ "autoPrefix": "",
+ "cssComb": "none",
+ "ieCompat": true,
+ "strictMath": false,
+ "strictUnits": false,
+ "relativeUrls": true,
+ "rootPath": "",
+ "sourceMapRoot": "",
+ "sourceMapBasePath": "",
+ "sourceMap": false
+ },
+ "sass": {
+ "autoPrefix": "",
+ "includePath": "",
+ "indentType": "space",
+ "indentWidth": 2,
+ "outputStyle": "nested",
+ "Precision": 5,
+ "relativeUrls": true,
+ "sourceMapRoot": "",
+ "lineFeed": "",
+ "sourceMap": false
+ },
+ "stylus": {
+ "sourceMap": false
+ },
+ "babel": {
+ "sourceMap": false
+ },
+ "coffeescript": {
+ "bare": false,
+ "runtimeMode": "node",
+ "sourceMap": false
+ },
+ "handlebars": {
+ "root": "",
+ "noBOM": false,
+ "name": "",
+ "namespace": "",
+ "knownHelpersOnly": false,
+ "forcePartial": false,
+ "knownHelpers": [],
+ "commonjs": "",
+ "amd": false,
+ "sourceMap": false
+ }
+ },
+ "minifiers": {
+ "css": {
+ "enabled": true,
+ "termSemicolons": true,
+ "gzip": false
+ },
+ "javascript": {
+ "enabled": true,
+ "termSemicolons": true,
+ "gzip": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs
index 5e53b858ce..ecc52d1f26 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Options;
using Volo.Abp;
using Volo.Abp.AutoMapper;
using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Domain.Entities.Events.Distributed;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.Threading;
@@ -34,7 +34,7 @@ namespace Volo.Docs
options.AddProfile(validate: true);
});
- Configure(options =>
+ Configure(options =>
{
options.EtoMappings.Add(typeof(DocsDomainModule));
options.EtoMappings.Add(typeof(DocsDomainModule));
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
index c09cb261ec..3773775b88 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
@@ -23,10 +23,21 @@ namespace Volo.Docs.Documents
string version,
CancellationToken cancellationToken = default);
- Task> GetAllAsync(Guid? projectId,
+ Task> GetAllAsync(
+ Guid? projectId,
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
@@ -37,6 +48,16 @@ namespace Volo.Docs.Documents
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
index 612274f95d..f41a049932 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
@@ -1,4 +1,4 @@
-{
+{
"culture": "tr",
"texts": {
"Documents": "Dökümanlar",
@@ -9,17 +9,30 @@
"Edit": "Düzenle",
"LastEditTime": "Son Düzenleme",
"Delete": "Sil",
+ "ClearCache": "Önbelleği temizle",
+ "ClearCacheConfirmationMessage": "\"{0}\" Projesinin tüm önbelliğini temizlemek istediğinize emin misiniz? ",
+ "ReIndexAllProjects": "Tüm projeleri yeniden indexle",
+ "ReIndexProject": "Projeyi yeniden indeksle",
+ "ReIndexProjectConfirmationMessage": "\"{0}\" Projesini yeniden insdekslemek istediğinize emin misiniz?",
+ "SuccessfullyReIndexProject": "\"{0}\" Projesi başarıyla yeniden indekslendi",
+ "ReIndexAllProjectConfirmationMessage": "Tüm projeleri yeniden indekslemek istediğinize emin misiniz?",
+ "SuccessfullyReIndexAllProject": "Tüm projeler başarıyla yeniden indekslendi",
"InThisDocument": "Bu dökümanda",
"GoToTop": "En üste çık",
"Projects": "Proje(ler)",
"NoProjectWarning": "Hiç proje yok!",
"DocumentNotFound": "Aradığınız döküman bulunamadı!",
+ "ProjectNotFound": "Talep edilen proje bulunamadı!",
"NavigationDocumentNotFound": "Bu döküman için menü bulunamadı!",
"DocumentNotFoundInSelectedLanguage": "İstediğiniz dilde belge bulunamadı. Varsayılan dilde belge gösterilir.",
+ "FilterTopics": "Konuları Filtrele",
+ "FullSearch": "Dokümanlarda Ara",
+ "Volo.Docs.Domain:010001": "Elastic search etkin değil",
"MultipleVersionDocumentInfo": "Bu dökümanın birden çok versiyonu bulunmaktadır. Sizin için en uygun olan seçenekleri seçiniz.",
"New": "Yeni",
"Upd": "Günc",
"NewExplanation": "Son iki hafta içinde oluşturuldu.",
- "UpdatedExplanation": "Son iki hafta içinde güncellendi."
+ "UpdatedExplanation": "Son iki hafta içinde güncellendi.",
+ "Volo.Docs.Domain:010002": "ShortName {ShortName} zaten var."
}
}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 46145043b1..f096bc10d9 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -24,16 +24,44 @@ namespace Volo.Docs.Documents
return await DbSet.Where(d => d.ProjectId == projectId).ToListAsync(cancellationToken: cancellationToken);
}
- public async Task> GetAllAsync(Guid? projectId,
+ public async Task> GetAllAsync(
+ Guid? projectId,
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
CancellationToken cancellationToken = default)
{
- var query = ApplyFilterForGetAll(DbSet, projectId, name, version, languageCode);
+ var query = ApplyFilterForGetAll(
+ DbSet,
+ projectId: projectId,
+ name: name,
+ version: version,
+ languageCode: languageCode,
+ format: format,
+ fileName: fileName,
+ creationTimeMin: creationTimeMin,
+ creationTimeMax: creationTimeMax,
+ lastUpdatedTimeMin: lastUpdatedTimeMin,
+ lastUpdatedTimeMax: lastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
+ lastCachedTimeMin: lastCachedTimeMin,
+ lastCachedTimeMax: lastCachedTimeMax
+ );
+
query = query.OrderBy(string.IsNullOrWhiteSpace(sorting) ? nameof(Document.Name) : sorting);
return await query.PageBy(skipCount, maxResultCount).ToListAsync(cancellationToken);
}
@@ -43,12 +71,39 @@ namespace Volo.Docs.Documents
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
CancellationToken cancellationToken = default)
{
- var query = ApplyFilterForGetAll(DbSet, projectId, name, version, languageCode);
+ var query = ApplyFilterForGetAll(
+ DbSet,
+ projectId: projectId,
+ name: name,
+ version: version,
+ languageCode: languageCode,
+ format: format,
+ fileName: fileName,
+ creationTimeMin: creationTimeMin,
+ creationTimeMax: creationTimeMax,
+ lastUpdatedTimeMin: lastUpdatedTimeMin,
+ lastUpdatedTimeMax: lastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
+ lastCachedTimeMin: lastCachedTimeMin,
+ lastCachedTimeMax: lastCachedTimeMax
+ );
+
return await query.LongCountAsync(GetCancellationToken(cancellationToken));
}
@@ -81,13 +136,47 @@ namespace Volo.Docs.Documents
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
CancellationToken cancellationToken = default)
{
return DbSet
- .WhereIf(projectId.HasValue, d => d.ProjectId == projectId.Value)
- .WhereIf(name != null, d => d.Name != null && d.Name.Contains(name))
- .WhereIf(version != null, d => d.Version != null && d.Version == version)
- .WhereIf(languageCode != null, d => d.LanguageCode != null && d.LanguageCode == languageCode);
+ .WhereIf(projectId.HasValue,
+ d => d.ProjectId == projectId.Value)
+ .WhereIf(name != null,
+ d => d.Name != null && d.Name.Contains(name))
+ .WhereIf(version != null,
+ d => d.Version != null && d.Version == version)
+ .WhereIf(languageCode != null,
+ d => d.LanguageCode != null && d.LanguageCode == languageCode)
+ .WhereIf(fileName != null,
+ d => d.FileName != null && d.FileName.Contains(fileName))
+ .WhereIf(format != null,
+ d => d.Format != null && d.Format == format)
+ .WhereIf(creationTimeMin.HasValue,
+ d => d.CreationTime.Date >= creationTimeMin.Value.Date)
+ .WhereIf(creationTimeMax.HasValue,
+ d => d.CreationTime.Date <= creationTimeMax.Value.Date)
+ .WhereIf(lastUpdatedTimeMin.HasValue,
+ d => d.LastUpdatedTime.Date >= lastUpdatedTimeMin.Value.Date)
+ .WhereIf(lastUpdatedTimeMax.HasValue,
+ d => d.LastUpdatedTime.Date <= lastUpdatedTimeMax.Value.Date)
+ .WhereIf(lastSignificantUpdateTimeMin.HasValue,
+ d => d.LastSignificantUpdateTime != null && d.LastSignificantUpdateTime.Value.Date >= lastSignificantUpdateTimeMin.Value.Date)
+ .WhereIf(lastSignificantUpdateTimeMax.HasValue,
+ d => d.LastSignificantUpdateTime != null && d.LastSignificantUpdateTime.Value.Date <= lastSignificantUpdateTimeMax.Value.Date)
+ .WhereIf(lastCachedTimeMin.HasValue,
+ d => d.LastCachedTime.Date >= lastCachedTimeMin.Value.Date)
+ .WhereIf(lastCachedTimeMax.HasValue,
+ d => d.LastCachedTime.Date <= lastCachedTimeMax.Value.Date);
}
}
}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index 78710e553e..b3b5210986 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -43,33 +43,88 @@ namespace Volo.Docs.Documents
x.Version == version, cancellationToken: cancellationToken);
}
- public async Task> GetAllAsync(Guid? projectId,
+ public async Task> GetAllAsync(
+ Guid? projectId,
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
CancellationToken cancellationToken = default)
{
+
return await
- ApplyFilterForGetAll(GetMongoQueryable(), projectId, name, version, languageCode)
- .OrderBy(string.IsNullOrWhiteSpace(sorting) ? "name asc" : sorting).As>()
- .PageBy>(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
+ ApplyFilterForGetAll(
+ GetMongoQueryable(),
+ projectId: projectId,
+ name: name,
+ version: version,
+ languageCode: languageCode,
+ format: format,
+ fileName: fileName,
+ creationTimeMin: creationTimeMin,
+ creationTimeMax: creationTimeMax,
+ lastUpdatedTimeMin: lastUpdatedTimeMin,
+ lastUpdatedTimeMax: lastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
+ lastCachedTimeMin: lastCachedTimeMin,
+ lastCachedTimeMax: lastCachedTimeMax)
+ .OrderBy(string.IsNullOrWhiteSpace(sorting) ? "name asc" : sorting).As>()
+ .PageBy>(skipCount, maxResultCount)
+ .ToListAsync(GetCancellationToken(cancellationToken));
}
- public async Task GetAllCountAsync(Guid? projectId,
+ public async Task GetAllCountAsync(
+ Guid? projectId,
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
string sorting = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
CancellationToken cancellationToken = default)
{
+
+
return await
- ApplyFilterForGetAll(GetMongoQueryable(), projectId, name, version, languageCode)
+ ApplyFilterForGetAll(
+ GetMongoQueryable(),
+ projectId: projectId,
+ name: name,
+ version: version,
+ languageCode: languageCode,
+ format: format,
+ fileName: fileName,
+ creationTimeMin: creationTimeMin,
+ creationTimeMax: creationTimeMax,
+ lastUpdatedTimeMin: lastUpdatedTimeMin,
+ lastUpdatedTimeMax: lastUpdatedTimeMax,
+ lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
+ lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
+ lastCachedTimeMin: lastCachedTimeMin,
+ lastCachedTimeMax: lastCachedTimeMax)
.OrderBy(string.IsNullOrWhiteSpace(sorting) ? "name asc" : sorting).As>()
.PageBy>(skipCount, maxResultCount)
.LongCountAsync(GetCancellationToken(cancellationToken));
@@ -86,6 +141,16 @@ namespace Volo.Docs.Documents
string name,
string version,
string languageCode,
+ string fileName,
+ string format,
+ DateTime? creationTimeMin,
+ DateTime? creationTimeMax,
+ DateTime? lastUpdatedTimeMin,
+ DateTime? lastUpdatedTimeMax,
+ DateTime? lastSignificantUpdateTimeMin,
+ DateTime? lastSignificantUpdateTimeMax,
+ DateTime? lastCachedTimeMin,
+ DateTime? lastCachedTimeMax,
CancellationToken cancellationToken = default)
{
if (projectId.HasValue)
@@ -108,6 +173,51 @@ namespace Volo.Docs.Documents
query = query.Where(d => d.LanguageCode != null && d.LanguageCode == languageCode);
}
+ if (fileName != null)
+ {
+ query = query.Where(d => d.FileName != null && d.FileName.Contains(fileName));
+ }
+
+ if (creationTimeMin.HasValue)
+ {
+ query = query.Where(d => d.CreationTime.Date >= creationTimeMin.Value.Date);
+ }
+
+ if (creationTimeMax.HasValue)
+ {
+ query = query.Where(d => d.CreationTime.Date <= creationTimeMax.Value.Date);
+ }
+
+ if (lastUpdatedTimeMin.HasValue)
+ {
+ query = query.Where(d => d.LastUpdatedTime.Date >= lastUpdatedTimeMin.Value.Date);
+ }
+
+ if (lastUpdatedTimeMax.HasValue)
+ {
+ query = query.Where(d => d.LastUpdatedTime.Date <= lastUpdatedTimeMax.Value.Date);
+ }
+
+ if (lastSignificantUpdateTimeMin.HasValue)
+ {
+ query = query.Where(d => d.LastSignificantUpdateTime != null && d.LastSignificantUpdateTime.Value.Date >= lastSignificantUpdateTimeMin.Value.Date);
+ }
+
+ if (lastSignificantUpdateTimeMax.HasValue)
+ {
+ query = query.Where(d => d.LastSignificantUpdateTime != null && d.LastSignificantUpdateTime.Value.Date <= lastSignificantUpdateTimeMax.Value.Date);
+ }
+
+ if (lastCachedTimeMin.HasValue)
+ {
+ query = query.Where(d => d.LastCachedTime.Date >= lastCachedTimeMin.Value.Date);
+ }
+
+ if (lastCachedTimeMax.HasValue)
+ {
+ query = query.Where(d => d.LastCachedTime.Date <= lastCachedTimeMax.Value.Date);
+ }
+
return query;
}
}
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 7f521de34b..90a754b1a9 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -131,10 +131,10 @@
- @if (Model.FullSearchEnabled)
- {
-
仅当用户具有`AbpIdentity.Roles`权限时,此内容才可见.
```
@@ -58,6 +58,8 @@ export class YourComponent {
将 `requiredPolicy` 添加到路由模块中的 `routes`属性.
```js
+import { PermissionGuard } from '@abp/ng.core';
+// ...
const routes: Routes = [
{
path: 'path',
diff --git a/docs/zh-Hans/docs-nav.json b/docs/zh-Hans/docs-nav.json
index c14355497b..04da437b7b 100644
--- a/docs/zh-Hans/docs-nav.json
+++ b/docs/zh-Hans/docs-nav.json
@@ -154,16 +154,23 @@
]
},
{
- "text": "事件",
+ "text": "事件总线",
"items": [
{
- "text": "本地 Event Bus"
+ "text": "概述",
+ "path": "Event-Bus.md"
+ },
+ {
+ "text": "本地 Event Bus",
+ "path": "Local-Event-Bus.md"
},
{
"text": "分布式 Event Bus",
+ "path": "Distributed-Event-Bus.md",
"items": [
{
- "text": "RabbitMQ 集成"
+ "text": "RabbitMQ 集成",
+ "path": "Distributed-Event-Bus-RabbitMQ-Integration.md"
}
]
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
index 1e5f138f97..81696d5e71 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs
@@ -12,6 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2
{
//TODO: Add select2.full.min.js or localize!
context.Files.AddIfNotContains("/libs/select2/js/select2.min.js");
+ context.Files.AddIfNotContains("/libs/select2/js/select2-bootstrap-modal-patch.js");
}
}
}
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
index 038d53af6d..278ed46839 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
@@ -3,6 +3,6 @@
[BlobContainerName(Name)]
public class DefaultContainer
{
- public const string Name = "Default";
+ public const string Name = "default";
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
index 83182fc965..83c2c4c38e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
@@ -359,5 +359,15 @@ namespace Volo.Abp.Reflection
? type.GenericTypeArguments[0]
: type;
}
+
+ public static bool IsDefaultValue([CanBeNull] object obj)
+ {
+ if (obj == null)
+ {
+ return true;
+ }
+
+ return obj.Equals(GetDefaultValue(obj.GetType()));
+ }
}
}
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs
index b78a5aa400..cf1b643305 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Reflection;
-using Volo.Abp.MultiTenancy;
namespace Volo.Abp.Domain.Entities
{
@@ -16,6 +14,11 @@ namespace Volo.Abp.Domain.Entities
}
public abstract object[] GetKeys();
+
+ public bool EntityEquals(IEntity other)
+ {
+ return EntityHelper.EntityEquals(this, other);
+ }
}
/// Filters ...
- @*
+
+
+
+
+
+
+
+
+ @L["Actions"]
+ @L["Name"]
+ @L["Version"]
+ @L["LanguageCode"]
+ @L["FileName"]
+ @L["Format"]
+ @L["CreationTime"]
+ @L["LastUpdatedTime"]
+ @L["LastSignificantUpdateTime"]
+ @L["LastCachedTime"]
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs
index def325bd0d..559eaab5eb 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs
@@ -1,6 +1,9 @@
+using System;
+using System.ComponentModel.DataAnnotations;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Volo.Docs.Documents;
namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents
{
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.css b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.css
new file mode 100644
index 0000000000..006512da9a
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.css
@@ -0,0 +1,3 @@
+#DocumentsContainer .datepicker {
+ display: inline-block !important;
+ width: 7rem !important; }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index ed5e5793de..dc77bbc687 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -1,8 +1,32 @@
$(function () {
var l = abp.localization.getResource('Docs');
+ var service = window.volo.docs.admin.documentsAdmin;
- var _dataTable = $('#DocumentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
+ var getFormattedDate = function ($datePicker) {
+ return $datePicker.data().datepicker.getFormattedDate("yyyy-mm-dd");
+ };
+
+ var getFilter = function () {
+ return {
+ projectId: $("#ProjectId").val(),
+ name: $("#Name").val(),
+ version: $("#Version").val(),
+ languageCode: $("#LanguageCode").val(),
+ fileName: $("#FileName").val(),
+ format: $("#Format").val(),
+ creationTimeMin: getFormattedDate($("#CreationTimeMin")),
+ creationTimeMax: getFormattedDate($("#CreationTimeMax")),
+ lastUpdatedTimeMin: getFormattedDate($("#LastUpdatedTimeMin")),
+ lastUpdatedTimeMax: getFormattedDate($("#LastUpdatedTimeMax")),
+ lastSignificantUpdateTimeMin: getFormattedDate($("#LastSignificantUpdateTimeMin")),
+ lastSignificantUpdateTimeMax: getFormattedDate($("#LastSignificantUpdateTimeMax")),
+ lastCachedTimeMin: getFormattedDate($("#LastCachedTimeMin")),
+ lastCachedTimeMax: getFormattedDate($("#LastCachedTimeMax"))
+ };
+ };
+
+ var dataTable = $('#DocumentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
processing: true,
serverSide: true,
scrollX: true,
@@ -10,7 +34,7 @@
searching: false,
autoWidth: false,
scrollCollapse: true,
- ajax: abp.libs.datatables.createAjax(volo.docs.admin.documentsAdmin.getAll),
+ ajax: abp.libs.datatables.createAjax(service.getAll, getFilter),
columnDefs: [
{
rowAction: {
@@ -21,11 +45,10 @@
visible: abp.auth.isGranted('Docs.Admin.Documents'),
confirmMessage: function (data) { return l('RemoveFromCacheConfirmation'); },
action: function (data) {
- volo.docs.admin.documentsAdmin
- .removeFromCache(data.record.id)
+ service.removeFromCache(data.record.id)
.then(function () {
abp.message.success(l('RemovedFromCache'));
- _dataTable.ajax.reload();
+ dataTable.ajax.reload();
});
}
},
@@ -34,11 +57,10 @@
visible: abp.auth.isGranted('Docs.Admin.Documents'),
confirmMessage: function (data) { return l('ReIndexDocumentConfirmation'); },
action: function (data) {
- volo.docs.admin.documentsAdmin
- .reindex(data.record.id)
+ service.reindex(data.record.id)
.then(function () {
abp.message.success(l('ReindexCompleted'));
- _dataTable.ajax.reload();
+ dataTable.ajax.reload();
});
}
},
@@ -47,11 +69,10 @@
visible: abp.auth.isGranted('Docs.Admin.Documents'),
confirmMessage: function (data) { return l('DeleteDocumentFromDbConfirmation'); },
action: function (data) {
- volo.docs.admin.documentsAdmin
- .deleteFromDatabase(data.record.id)
+ service.deleteFromDatabase(data.record.id)
.then(function () {
abp.message.success(l('Deleted'));
- _dataTable.ajax.reload();
+ dataTable.ajax.reload();
});
}
}
@@ -76,14 +97,7 @@
},
{
target: 5,
- data: "format",
- render: function (data) {
- if (data === 'md') {
- return 'markdown';
- }
-
- return data;
- }
+ data: "format"
},
{
target: 6,
@@ -136,18 +150,15 @@
]
}));
+ $("#FilterForm input[type='text']").keypress(function (e) {
+ if (e.which === 13) {
+ dataTable.ajax.reload();
+ }
+ });
- $("#ReIndexAllProjects").click(function (event) {
- abp.message.confirm(l('ReIndexAllProjectConfirmationMessage'))
- .done(function (accepted) {
- if (accepted) {
- volo.docs.admin.projectsAdmin
- .reindexAll()
- .then(function () {
- abp.message.success(l('SuccessfullyReIndexAllProject'));
- });
- }
- });
+ $("#SearchButton").click(function (e) {
+ e.preventDefault();
+ dataTable.ajax.reload();
});
});
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.min.css b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.min.css
new file mode 100644
index 0000000000..f98ba4beab
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.min.css
@@ -0,0 +1 @@
+#DocumentsContainer .datepicker{display:inline-block !important;width:7rem !important;}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.scss b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.scss
new file mode 100644
index 0000000000..97147313df
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.scss
@@ -0,0 +1,6 @@
+#DocumentsContainer {
+ .datepicker {
+ display: inline-block !important;
+ width: 7rem !important;
+ }
+}
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj
index 3098bab9d0..164c28cdb2 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj
@@ -13,13 +13,16 @@
@*
*@
-
-
*@
+
+
-
- }
@if (Model.Navigation == null || !Model.Navigation.HasChildItems)
{
@@ -209,48 +190,60 @@
{
-
-
-
-
-
-
-
-
-
-
-
-
@@ -318,8 +311,20 @@
- @if (!string.IsNullOrEmpty(Model.Document.EditLink))
- {
-
-
- @(L["Edit"])
- (@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString())
-
- }
-
+
+
+
+ @if (Model.FullSearchEnabled)
+ {
+
+
+
+
+
+ }
+
+
+
-
- @if (Model.Document.Contributors != null && Model.Document.Contributors.Count > 0)
- {
-
- @(L["Contributors"].Value + " :")
- @foreach (var contributor in Model.Document.Contributors)
+
+
+
+
+
+ @if (Model.Document.Contributors != null && Model.Document.Contributors.Count > 0)
+ {
+
+ @(L["Contributors"].Value)
+
+ @foreach (var contributor in Model.Document.Contributors)
+ {
+
+ 
+
+ }
+ }
+
+
+ @if (!string.IsNullOrEmpty(Model.Document.EditLink))
{
-
-
+
+
+ @(L["Edit"])
+ @L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString()
}
- }
-
+
+
+