Merge branch 'dev' into gterdem/organization_unit_enhancement

Author: gterdem

docs/en/AspNet-Boilerplate-Migration-Guide.md

@@ -216,9 +216,9 @@ However, it provides the following methods those can be used to query a single e
 * `FindAsync(id)` returns the entity or null if not found.
 * `GetAsync(id)` method returns the entity or throws an `EntityNotFoundException` (which causes HTTP 404 status code) if not found.
 
-#### Sync vs Async 
+#### Sync vs Async
 
-ABP Framework repository has no sync methods (like `Insert`). All the methods are async (like `InsertAsync`). So, if your application has sync repository method usages, convert them to async versions. 
+ABP Framework repository has no sync methods (like `Insert`). All the methods are async (like `InsertAsync`). So, if your application has sync repository method usages, convert them to async versions.
 
 In general, ABP Framework forces you to completely use async everywhere, because mixing async & sync methods is not a recommended approach.
 
@@ -444,7 +444,7 @@ ASP.NET Boilerplate uses Castle Windsor's [logging facility](http://docs.castlep
 using Castle.Core.Logging; //1: Import Logging namespace
 
 public class TaskAppService : ITaskAppService
-{    
+{
     //2: Getting a logger using property injection
     public ILogger Logger { get; set; }
 
@@ -693,26 +693,22 @@ public class AbpTenantManagementWebMainMenuContributor : IMenuContributor
         var administrationMenu = context.Menu.GetAdministration();
 
         //Resolve some needed services from the DI container
-        var authorizationService = context.ServiceProvider
-            .GetRequiredService<IAuthorizationService>();
-        var l = context.ServiceProvider
-            .GetRequiredService<IStringLocalizer<AbpTenantManagementResource>>();
+        var l = context.GetLocalizer<AbpTenantManagementResource>();
 
         var tenantManagementMenuItem = new ApplicationMenuItem(
             TenantManagementMenuNames.GroupName,
             l["Menu:TenantManagement"],
             icon: "fa fa-users");
-        
+
         administrationMenu.AddItem(tenantManagementMenuItem);
 
         //Conditionally add the "Tenants" menu item based on the permission
-        if (await authorizationService
-            .IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
+        if (await context.IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
         {
             tenantManagementMenuItem.AddItem(
                 new ApplicationMenuItem(
                     TenantManagementMenuNames.Tenants,
-                    l["Tenants"], 
+                    l["Tenants"],
                     url: "/TenantManagement/Tenants"));
         }
     }
@@ -731,4 +727,4 @@ The following features are not present for the ABP Framework. Here, a list of so
 * [Real time notification system](https://aspnetboilerplate.com/Pages/Documents/Notification-System) ([#633](https://github.com/abpframework/abp/issues/633))
 * [NHibernate Integration](https://aspnetboilerplate.com/Pages/Documents/NHibernate-Integration) ([#339](https://github.com/abpframework/abp/issues/339)) - We don't intent to work on this, but any community contribution welcome.
 
-Some of these features will eventually be implemented. However, you can implement them yourself if they are important for you. If you want, you can [contribute](Contribution/Index.md) to the framework, it is appreciated.
+Some of these features will eventually be implemented. However, you can implement them yourself if they are important for you. If you want, you can [contribute](Contribution/Index.md) to the framework, it is appreciated.

docs/en/Customizing-Application-Modules-Overriding-Services.md

@@ -59,6 +59,7 @@ In most cases, you will want to change one or a few methods of the current imple
 ### Example: Overriding an Application Service
 
 ````csharp
+//[RemoteService(IsEnabled = false)] // If you use dynamic controller feature you can disable remote service. Prevent creating duplicate controller for the application service.
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(IIdentityUserAppService), typeof(IdentityUserAppService))]
 public class MyIdentityUserAppService : IdentityUserAppService

docs/en/Multi-Tenancy.md

@@ -303,10 +303,10 @@ TODO:...
 Volo.Abp.AspNetCore.MultiTenancy package adds following tenant resolvers to determine current tenant from current web request (ordered by priority). These resolvers are added and work out of the box:
 
 * **CurrentUserTenantResolveContributor**: Gets the tenant id from claims of the current user, if the current user has logged in. **This should always be the first contributor for security**.
-* **QueryStringTenantResolver**: Tries to find current tenant id from query string parameter. Parameter name is "__tenant" by default.
-* **RouteTenantResolver**: Tries to find current tenant id from route (URL path). Variable name is "__tenant" by default. So, if you defined a route with this variable, then it can determine the current tenant from the route.
-* **HeaderTenantResolver**: Tries to find current tenant id from HTTP header. Header name is "__tenant" by default.
-* **CookieTenantResolver**: Tries to find current tenant id from cookie values. Cookie name is "__tenant" by default.
+* **QueryStringTenantResolveContributor**: Tries to find current tenant id from query string parameter. Parameter name is "__tenant" by default.
+* **RouteTenantResolveContributor**: Tries to find current tenant id from route (URL path). Variable name is "__tenant" by default. So, if you defined a route with this variable, then it can determine the current tenant from the route.
+* **HeaderTenantResolveContributor**: Tries to find current tenant id from HTTP header. Header name is "__tenant" by default.
+* **CookieTenantResolveContributor**: Tries to find current tenant id from cookie values. Cookie name is "__tenant" by default.
 
 > If you use nginx as a reverse proxy server, please note that if `TenantKey` contains an underscore or other special characters, there may be a problem, please refer to: 
 http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers
@@ -346,7 +346,7 @@ namespace MyCompany.MyProject
                 //Subdomain format: {0}.mydomain.com 
                 //Adding as the second highest priority resolver after 'CurrentUserTenantResolveContributor' to
                 //ensure the user cannot impersonate a different tenant.
-                options.TenantResolvers.Insert(1, new DomainTenantResolver("{0}.mydomain.com"));
+                options.TenantResolvers.Insert(1, new DomainTenantResolveContributor("{0}.mydomain.com"));
             });
 
             //...
@@ -357,7 +357,7 @@ namespace MyCompany.MyProject
 
 {0} is the the placeholder to determine current tenant's unique name.
 
-Instead of ``options.TenantResolvers.Insert(1, new DomainTenantResolver("{0}.mydomain.com"));`` you can use this shortcut:
+Instead of ``options.TenantResolvers.Insert(1, new DomainTenantResolveContributor("{0}.mydomain.com"));`` you can use this shortcut:
 
 ````C#
 options.AddDomainTenantResolver("{0}.mydomain.com");

docs/en/Object-To-Object-Mapping.md

@@ -162,6 +162,61 @@ public class MyProfile : Profile
 
 It is suggested to use the `MapExtraProperties()` method if both classes are extensible objects (implement the `IHasExtraProperties` interface). See the [object extension document](Object-Extensions.md) for more.
 
+### Other Useful Extension Methods
+
+There are some more extension methods those can simplify your mapping code.
+
+#### Ignoring Audit Properties
+
+It is common to ignore audit properties when you map an object to another.
+
+Assume that you need to map a `ProductDto` ([DTO](Data-Transfer-Objects.md)) to a `Product` [entity](Entities.md) and the entity is inheriting from the `AuditedEntity` class (which provides properties like `CreationTime`, `CreatorId`, `IHasModificationTime`... etc).
+
+You probably want to ignore these base properties while mapping from the DTO. You can use `IgnoreAuditedObjectProperties()` method to ignore all audit properties (instead of manually ignoring them one by one):
+
+````csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<ProductDto, Product>()
+            .IgnoreAuditedObjectProperties();
+    }
+}
+````
+
+There are more extension methods like `IgnoreFullAuditedObjectProperties()` and `IgnoreCreationAuditedObjectProperties()` those can be used based on your entity type.
+
+> See the "*Base Classes & Interfaces for Audit Properties*" section in the [entities document](Entities.md) to know more about auditing properties.
+
+#### Ignoring Other Properties
+
+In AutoMapper, you typically write such a mapping code to ignore a property:
+
+````csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<SimpleClass1, SimpleClass2>()
+            .ForMember(x => x.CreationTime, map => map.Ignore());
+    }
+}
+````
+
+We found it unnecessarily long and created the `Ignore()` extension method:
+
+````csharp
+public class MyProfile : Profile
+{
+    public MyProfile()
+    {
+        CreateMap<SimpleClass1, SimpleClass2>()
+            .Ignore(x => x.CreationTime);
+    }
+}
+````
+
 ## Advanced Topics
 
 ### IObjectMapper<TContext> Interface

docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md

@@ -59,6 +59,7 @@ context.Services.Replace(
 ### 示例: 重写服务方法
 
 ````csharp
+//[RemoteService(IsEnabled = false)] // 如果你在使用动态控制器,为了避免为应用服务创建重复的控制器, 你可以禁用远程访问.
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(IIdentityUserAppService), typeof(IdentityUserAppService))]
 public class MyIdentityUserAppService : IdentityUserAppService

docs/zh-Hans/Multi-Tenancy.md

@@ -304,10 +304,10 @@ TODO:...
 Volo.Abp.AspNetCore.MultiTenancy 添加了下面这些租户解析器,从当前Web请求(按优先级排序)中确定当前租户.
 
 * **CurrentUserTenantResolveContributor**: 如果当前用户已登录,从当前用户的声明中获取租户Id. **出于安全考虑,应该始终将其做为第一个Contributor**.
-* **QueryStringTenantResolver**: 尝试从query string参数中获取当前租户,默认参数名为"__tenant".
-* **RouteTenantResolver**:尝试从当前路由中获取(URL路径),默认是变量名是"__tenant".所以,如果你的路由中定义了这个变量,就可以从路由中确定当前租户.
-* **HeaderTenantResolver**: 尝试从HTTP header中获取当前租户,默认的header名称是"__tenant".
-* **CookieTenantResolver**: 尝试从当前cookie中获取当前租户.默认的Cookie名称是"__tenant".
+* **QueryStringTenantResolveContributor**: 尝试从query string参数中获取当前租户,默认参数名为"__tenant".
+* **RouteTenantResolveContributor**:尝试从当前路由中获取(URL路径),默认是变量名是"__tenant".所以,如果你的路由中定义了这个变量,就可以从路由中确定当前租户.
+* **HeaderTenantResolveContributor**: 尝试从HTTP header中获取当前租户,默认的header名称是"__tenant".
+* **CookieTenantResolveContributor**: 尝试从当前cookie中获取当前租户.默认的Cookie名称是"__tenant".
 
 > 如果你使用nginx作为反向代理服务器,请注意如果`TenantKey`包含下划线或其他特殊字符可能存在问题, 请参考: 
 http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers
@@ -344,7 +344,7 @@ namespace MyCompany.MyProject
             Configure<AbpTenantResolveOptions>(options =>
             {
                 //子域名格式: {0}.mydomain.com (作为第二优先级解析器添加, 位于CurrentUserTenantResolveContributor之后)
-                options.TenantResolvers.Insert(1, new DomainTenantResolver("{0}.mydomain.com"));
+                options.TenantResolvers.Insert(1, new DomainTenantResolveContributor("{0}.mydomain.com"));
             });
 
             //...
@@ -355,7 +355,7 @@ namespace MyCompany.MyProject
 
 {0}是用来确定当前租户唯一名称的占位符.
 
-你可以使用下面的方法,代替``options.TenantResolvers.Insert(1, new DomainTenantResolver("{0}.mydomain.com"));``:
+你可以使用下面的方法,代替``options.TenantResolvers.Insert(1, new DomainTenantResolveContributor("{0}.mydomain.com"));``:
 
 ````C#
 options.AddDomainTenantResolver("{0}.mydomain.com");

docs/zh-Hans/SignalR-Integration.md

@@ -224,4 +224,14 @@ ABP实现 `SignalR` 的 `IUserIdProvider` 接口,从ABP框架的 `ICurrentUser`
 
 参阅 [SignalR集成Demo](https://github.com/abpframework/abp-samples/tree/master/SignalRDemo),它有一个简单的聊天页面,可以在(经过身份验证的)用户之间发送消息.
 
-![signalr-demo-chat](images/signalr-demo-chat.png)
+![signalr-demo-chat](images/signalr-demo-chat.png)
+
+## 备注
+
+ABP框架不会更改SignalR. 就像在其他ASP.NET Core应用程序中一样,它也可以在基于ABP框架的应用程序中工作.
+
+参考[微软文档](https://docs.microsoft.com/zh-cn/aspnet/core/signalr/scale)托管和扩展您的应用程序,集成[Azure](https://docs.microsoft.com/zh-cn/aspnet/core/signalr/publish-to-azure-web-app)或[Redis底版](https://docs.microsoft.com/zh-cn/aspnet/core/signalr/redis-backplane)...等.
+
+## 另请参阅
+
+* [微软SignalR文档](https://docs.microsoft.com/zh-cn/aspnet/core/signalr/introduction)