diff --git a/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/Default.cshtml b/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/Default.cshtml
index 8c25d6592b..f5adbc9a07 100644
--- a/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/Default.cshtml
+++ b/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/Default.cshtml
@@ -23,7 +23,7 @@
                         <a class="nav-link" href="/blog/abp/">Blog</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="https://github.com/abpframework/abp/" target="_blank">Github</a>
+                        <a class="nav-link" href="https://github.com/abpframework/abp/" target="_blank">GitHub</a>
                     </li>
                     <li class="for-mobile">
                         <button type="button" class="close close-mmenu" aria-label="Close"> 
diff --git a/build-all.ps1 b/build-all.ps1
index 5d800ebdf9..907f6816bf 100644
--- a/build-all.ps1
+++ b/build-all.ps1
@@ -9,6 +9,7 @@ $solutionPaths = (
     "modules/users",
     "modules/permission-management",
     "modules/setting-management",
+    "modules/feature-management",
     "modules/identity",
     "modules/identityserver",
     "modules/tenant-management",
diff --git a/common.props b/common.props
index 380276a7e1..0e6a922473 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.14.0</Version>
+    <Version>0.15.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>
diff --git a/docs/en/Getting-Started-AspNetCore-MVC-Template.md b/docs/en/Getting-Started-AspNetCore-MVC-Template.md
index de9a5b09cb..cb24eb543f 100644
--- a/docs/en/Getting-Started-AspNetCore-MVC-Template.md
+++ b/docs/en/Getting-Started-AspNetCore-MVC-Template.md
@@ -19,9 +19,9 @@ The downloaded project requires;
 
 ### The Solution Structure
 
-Extract the zip file downloaded and open in **Visual Studio 2017 (15.7.0+)**:
+Extract the zip file downloaded and open in **Visual Studio 2017 (15.9.0+)**:
 
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution.png)
+![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v2.png)
 
 The solution has a layered structure (based on Domain Driven Design) where;
 
@@ -30,6 +30,8 @@ The solution has a layered structure (based on Domain Driven Design) where;
 * ``.Web`` is the presentation layer.
 * ``.EntityFrameworkCore`` is the EF Core integration package.
 
+EF Core database migrations are separated to a project named `.EntityFrameworkCore.DbMigrations`.
+
 The solution also contains unit & integration test projects properly configured to work with **EF Core** & **SQLite in-memory** database.
 
 ### Creating the Database
@@ -50,9 +52,9 @@ Right click to the `.Web` project and select **Set as StartUp Project**:
 
 ![set-as-startup-project](images/set-as-startup-project.png)
 
-Open the **Package Manager Console**, select `.EntityFrameworkCore` project as the **Default Project** and run the `Update-Database` command:
+Open the **Package Manager Console**, select `.EntityFrameworkCore.DbMigrations` project as the **Default Project** and run the `Update-Database` command:
 
-![pcm-update-database](images/pcm-update-database.png)
+![pcm-update-database](images/pcm-update-database-v2.png)
 
 This will create a new database based on the configured connection string.
 
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
index 6db6766c0b..337f021587 100644
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
@@ -20,7 +20,7 @@ Go to the [startup template page](https://abp.io/Templates) and download a new p
 
 This is the how the layered solution structure looks after it's created from the startup template:
 
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution.png)
+![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v2.png)
 
 ### Create the Book Entity
 
@@ -91,9 +91,9 @@ EF Core requires you to relate entities with your DbContext. The easiest way to
 
 #### Add New Migration & Update the Database
 
-The Startup template uses [EF Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) to create and maintain the database schema. Open the **Package Manager Console (PMC)** (under the *Tools/Nuget Package Manager* menu), select the `Acme.BookStore.EntityFrameworkCore` as the **default project** and execute the following command:
+The Startup template uses [EF Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) to create and maintain the database schema. Open the **Package Manager Console (PMC)** (under the *Tools/Nuget Package Manager* menu), select the `Acme.BookStore.EntityFrameworkCore.DbMigrations` as the **default project** and execute the following command:
 
-![bookstore-pmc-add-book-migration](images/bookstore-pmc-add-book-migration.png)
+![bookstore-pmc-add-book-migration](images/bookstore-pmc-add-book-migration-v2.png)
 
 This will create a new migration class inside the `Migrations` folder. Then execute the `Update-Database` command to update the database schema:
 
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md b/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md
index a45d406ce6..b70521dad0 100644
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-III.md
@@ -14,8 +14,6 @@ You can download the **source code** of the application [from here](https://gith
 
 There are two test projects in the solution:
 
-![bookstore-test-projects](images/bookstore-test-projects.png)
-
 * `Acme.BookStore.Application.Tests` is for unit & integration tests. You can write tests for application service methods. It uses **EF Core SQLite in-memory** database.
 * `Acme.BookStore.Web.Tests` is for full stack integration tests including the web layer. So, you can write tests for UI pages too.
 
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-pmc-add-book-migration-v2.png b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-pmc-add-book-migration-v2.png
new file mode 100644
index 0000000000..edf2826361
Binary files /dev/null and b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-pmc-add-book-migration-v2.png differ
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-visual-studio-solution-v2.png b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-visual-studio-solution-v2.png
new file mode 100644
index 0000000000..48b5881e96
Binary files /dev/null and b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-visual-studio-solution-v2.png differ
diff --git a/docs/en/images/bookstore-visual-studio-solution-v2.png b/docs/en/images/bookstore-visual-studio-solution-v2.png
new file mode 100644
index 0000000000..48b5881e96
Binary files /dev/null and b/docs/en/images/bookstore-visual-studio-solution-v2.png differ
diff --git a/docs/en/images/pcm-update-database-v2.png b/docs/en/images/pcm-update-database-v2.png
new file mode 100644
index 0000000000..d5bb9c2975
Binary files /dev/null and b/docs/en/images/pcm-update-database-v2.png differ
diff --git a/docs/zh-Hans/Blog-Posts/2019-02-22/Post.md b/docs/zh-Hans/Blog-Posts/2019-02-22/Post.md
new file mode 100644
index 0000000000..69a8603baf
--- /dev/null
+++ b/docs/zh-Hans/Blog-Posts/2019-02-22/Post.md
@@ -0,0 +1,54 @@
+# 微服务演示,项目状态和路线图
+
+在ABP vNext上的[第一个公告](https://cn.abp.io/blog/abp/Abp-vNext-Announcement)之后,我们对代码库进行了很多改进([GitHub存储库](https://github.com/abpframework/abp)上的1100多次提交).我们已经创建了功能,示例,文档等等.在这篇文章中,我想告诉你一些新闻和项目的状态.
+
+## 微服务演示解决方案
+
+ABP框架的主要目标之一是提供[创建微服务解决方案的便利基础设施](https://cn.abp.io/documents/abp/latest/Microservice-Architecture).
+
+我们一直在努力开发微服务解决方案演示.初始版本已完成并[文档化](https://cn.abp.io/documents/abp/latest/Samples/Microservice-Demo).该示例解决方案旨在演示一个简单而完整的微服务解决方案;
+
+- 具有多个独立的,可自我部署的**微服务**.
+- 多个**Web应用程序**,每个都使用不同的API网关.
+- 使用[Ocelot](https://github.com/ThreeMammals/Ocelot)库开发了多个**网关** / BFF(后端为前端(Backend for Frontends)).
+- 使用[IdentityServer](https://identityserver.io/)框架开发**身份验证服务**.它也是一个带有必要UI的SSO(单点登录)应用程序.
+- 有**多个数据库**.一些微服务有自己的数据库,而一些服务/应用程序共享一个数据库(以演示不同的用例).
+- 具有不同类型的数据库：**SQL Server**(使用**Entity Framework Core** ORM)和**MongoDB**.
+- 有一个**控制台应用程序**来显示通过身份验证使用服务的最简单方法.
+- 使用[Redis](https://redis.io/)进行**分布式缓存**.
+- 使用[RabbitMQ](https://www.rabbitmq.com/)进行服务到服务(service-to-service)的**消息传递**.
+- 使用[Docker](https://www.docker.com/)和[Kubernates](https://kubernetes.io/)**部署**并运行所有服务和应用程序.
+- 使用[Elasticsearch](https://www.elastic.co/products/elasticsearch)和[Kibana](https://www.elastic.co/products/kibana)存储和可视化日志(使用[Serilog](https://serilog.net/)编写).
+
+有关解决方案的详细说明,请参阅[其文档](https://cn.abp.io/documents/abp/latest/Samples/Microservice-Demo). 
+
+## 改进/功能
+
+我们已经开发了许多功能,包括**分布式事件总线**(与RabbitMQ集成),**IdentityServer4集成**以及几乎所有功能的增强.我们不断重构和添加测试,以使框架更稳定和生产就绪.它正在[快速增长](https://github.com/abpframework/abp/graphs/contributors).
+
+## 路线图
+
+在第一个稳定版本(v1.0)之前还有很多工作要做.您可以在GitHub仓库上看到[优先的积压项目](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+milestone%3ABacklog).
+
+根据我们的估计,我们计划在2019年第二季度(可能在五月或六月)发布v1.0.所以,不用等待太长时间了.我们也对第一个稳定版本感到非常兴奋.
+
+我们还将完善[文档](https://cn.abp.io/documents/abp/latest),因为它现在还远未完成.
+
+第一个版本可能不包含SPA模板.但是,如果可能的话,我们想要准备一个简单些的.SPA框架还没有确定下来.备选有:**Angular,React和Blazor**.请将您的想法写为对此帖的评论.
+
+## 中文网
+
+中国有一个大型的ABP社区.他们创建了一个中文版的abp.io网站：https://cn.abp.io/. 他们一直在保持更新.感谢中国的开发人员,特别是[Liming Ma](https://github.com/maliming).
+
+## NDC {London} 2019
+
+很高兴作为合作伙伴参加[NDC {London}](https://ndc-london.com/)2019 .我们已经与许多开发人员讨论过当前的ASP.NET Boilerplate和ABP vNext,我们得到了很好的反馈.
+
+我们还有机会与[Scott Hanselman](https://twitter.com/shanselman)和[Jon Galloway](https://twitter.com/jongalloway)交谈.他们参观了我们的展位,我们谈到了ABP vNext的想法.他们喜欢新的ABP框架的功能,方法和目标.在twitter上查看一些照片和评论：
+
+![scott-and-jon](scott-and-jon.png)
+
+## 跟上步伐
+
+* 您可以标星并关注**GitHub**存储库：https://github.com/abpframework/abp
+* 您可以关注官方**Twitter**帐户获取新闻：https://twitter.com/abpframework
diff --git a/docs/zh-Hans/Blog-Posts/2019-02-22/scott-and-jon.png b/docs/zh-Hans/Blog-Posts/2019-02-22/scott-and-jon.png
new file mode 100644
index 0000000000..79ad21aee7
Binary files /dev/null and b/docs/zh-Hans/Blog-Posts/2019-02-22/scott-and-jon.png differ
diff --git a/docs/zh-Hans/Getting-Started-AspNetCore-Application.md b/docs/zh-Hans/Getting-Started-AspNetCore-Application.md
index d0733bb140..cf9ac3f66f 100644
--- a/docs/zh-Hans/Getting-Started-AspNetCore-Application.md
+++ b/docs/zh-Hans/Getting-Started-AspNetCore-Application.md
@@ -156,6 +156,26 @@ services.AddApplication<AppModule>(options =>
 });
 ````
 
+4. 更新 `Program.cs`代码, 不再使用`WebHost.CreateDefaultBuilder()`方法(因为它使用默认的DI容器)：
+
+ ````csharp
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        BuildWebHostInternal(args).Run();
+    }
+     public static IWebHost BuildWebHostInternal(string[] args) =>
+        new WebHostBuilder()
+            .UseKestrel()
+            .UseContentRoot(Directory.GetCurrentDirectory())
+            .UseIISIntegration()
+            .UseStartup<Startup>()
+            .Build();
+}
+````
+
+
 ### 源码
 
 从[此处](../samples/BasicAspNetCoreApplication)获取本教程中创建的示例项目的源代码.
diff --git a/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md b/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md
index 6f274b5177..e8ce4fa71a 100644
--- a/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md
+++ b/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md
@@ -12,14 +12,14 @@
 
 下载的项目需要:
 
-* [Visual Studio 2017 (v15.7.0+)](https://visualstudio.microsoft.com/tr/downloads/)
+* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/)
 * [.NET Core 2.1.1+](https://www.microsoft.com/net/download/dotnet-core/)
 
 ### 解决方案结构
 
 下载后解压文件并在 **Visual Studio 2017(15.7.0 +)** 中打开:
 
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution.png)
+![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v2.png)
 
 该解决方案具有分层结构(基于域驱动设计), 其中:
 
@@ -28,6 +28,8 @@
 * ``.Web`` 为是表示层.
 * ``.EntityFrameworkCore`` 是EF Core集成.
 
+EF Core 数据库迁移被分离到名为`.EntityFrameworkCore.DbMigrations`项目中.
+
 解决方案还包含配置好的的单元&集成测试项目, 以便与 **EF Core** 和 **SQLite内存中** 数据库配合使用.
 
 ### 创建数据库
@@ -48,9 +50,9 @@
 
 ![set-as-startup-project](images/set-as-startup-project.png)
 
-打开**包管理器控制台(Package Manager Console)**, 选择`.EntityFrameworkCore`项目作为**默认项目**并运行`Update-Database`命令:
+打开**包管理器控制台(Package Manager Console)**, 选择`.EntityFrameworkCore.DbMigrations`项目作为**默认项目**并运行`Update-Database`命令:
 
-![pcm-update-database](images/pcm-update-database.png)
+![pcm-update-database](images/pcm-update-database-v2.png)
 
 这将基于配置的连接字符串创建新数据库.
 
diff --git a/docs/zh-Hans/Samples/Microservice-Demo.md b/docs/zh-Hans/Samples/Microservice-Demo.md
index eeac6e0749..c87d7e5406 100644
--- a/docs/zh-Hans/Samples/Microservice-Demo.md
+++ b/docs/zh-Hans/Samples/Microservice-Demo.md
@@ -19,11 +19,12 @@ ABP框架的主要目标之一就是提供[便捷的基础设施来创建微服
 * 有一个**控制台应用程序**使用身份验证展示使用服务最简单的方法.
 * 使用[Redis](https://redis.io/)做**分布式缓存**.
 * 使用[RabbitMQ](https://www.rabbitmq.com/)做服务间的**消息**传递.
-* 使用[Kubernates](https://kubernetes.io/)**部署**和运行所有的服务和应用程序.
+* 使用 [Docker](https://www.docker.com/) & [Kubernates](https://kubernetes.io/) 来**部署**&**运行**所有的服务和应用程序.
+* 使用 [Elasticsearch](https://www.elastic.co/products/elasticsearch) & [Kibana](https://www.elastic.co/products/kibana) 来存储和可视化日志 (使用[Serilog](https://serilog.net/)写日志).
 
-下图显示了该系统:
+下图展示了该系统:
 
-![microservice-sample-diagram](../images/microservice-sample-diagram.png)
+![microservice-sample-diagram](../images/microservice-sample-diagram-2.png)
 
 ### 源码
 
@@ -31,10 +32,1430 @@ ABP框架的主要目标之一就是提供[便捷的基础设施来创建微服
 
 ### 状态
 
-此示例仍处于开发阶段,尚未完成.
+该示例的初始版本已完成.其他改进仍在开发中.
+
+## 运行解决方案
+
+您可以从 **源代码** 或者预先配置好的 **docker-compose** 文件运行.
+
+### 使用Docker容器
+
+#### 预先要求
+
+由于所有依赖项都已预先配置, 因此作为Docker容器运行更容易. 你只需要安装[最新的docker](https://docs.docker.com/compose/install/).
+
+#### 运行容器
+
+- 克隆或下载 [ABP仓库](https://github.com/abpframework/abp).
+
+- 在存储库的`samples/MicroserviceDemo`文件夹中打开命令行.
+
+- 从Docker Hub中拉取image:
+
+  ```
+  docker-compose -f docker-compose.yml -f docker-compose.migrations.yml pull
+  ```
+
+- 如果要在本地构建映像, 可以跳过上述步骤, 使用build命令:
+
+  ```
+  docker-compose -f docker-compose.yml -f docker-compose.migrations.yml build
+  ```
+
+  根据你的电脑配置, 构建image可能需要**很长时间**.
+
+- 还原 SQL Server 数据库:
+
+  ```
+  docker-compose -f docker-compose.yml -f docker-compose.migrations.yml run restore-database
+  ```
+
+- 启动容器:
+
+  ```
+  docker-compose up -d
+  ```
+
+- 将此行添加到`hosts`文件的末尾:
+
+  ```
+  127.0.0.1	auth-server
+  ```
+
+  hosts文件位于Windows上的`C:\Windows\System32\Drivers\etc\hosts`文件夹, Linux/MacOS的`/etc/hosts`中.
+
+#### 运行应用程序
+
+你可能想要了解容器中运行一些应用程序:
+
+* 后端管理应用程序 (BackendAdminApp.Host): `http://localhost:51512`
+  *(用于管理系统中的用户和产品)*
+* 公共网站 (PublicWebsite.Host): `http://localhost:51513`
+  *(用于列出产品并运行/管理博客模块)*
+* 认证服务器 (AuthServer.Host): `http://auth-server:51511/`
+  *(用作使用IdentityServer4构建的单点登录和身份验证服务器)*
+* Kibana UI: `http://localhost:51510`
+  *(用于显示/跟踪所有服务/应用程序/网关写入的日志)*
+
+### 从源代码运行
+
+#### 预先要求
+
+为了能够从源代码运行解决方案, 应在你的计算机上安装并运行以下工具:
+
+* [SQL Server](https://www.microsoft.com/en-us/sql-server/sql-server-downloads) 2015+ (可以是 [express edition](https://www.microsoft.com/en-us/sql-server/sql-server-editions-express))
+* [Redis](https://redis.io/download) 5.0+
+* [RabbitMQ](https://www.rabbitmq.com/install-windows.html) 3.7.11+
+* [MongoDB](https://www.mongodb.com/download-center) 4.0+
+* [ElasticSearch](https://www.elastic.co/downloads/elasticsearch) 6.6+
+* [Kibana](https://www.elastic.co/downloads/kibana) 6.6+ (可选,建议显示日志)
+
+#### 打开并构建Visual Studio解决方案
+
+* 在Visual Studio 2017 (15.9.0+)中打开`samples\MicroserviceDemo\MicroserviceDemo.sln`.
+* 在`samples\MicroserviceDemo`文件夹中的命令行运行`dotnet restore`命令.
+* 在Visual Studio中构建解决方案.
+
+#### 还原数据库
+
+在`samples\MicroserviceDemo\databases`文件夹中打开`MsDemo_Identity.zip`和`MsDemo_ProductManagement.zip`并恢复到SQL Server.
+
+> 请注意:这些数据库在解决方案中具有EF Core迁移,但它们没有种子数据,尤其是IdentityServer4所需的配置. 因此,恢复数据库要容易得多.
+
+#### 运行项目
+
+按以下顺序运行项目(右键单击每个项目设置为启动项目,按Ctrl+F5运行,无需调试):
+
+* AuthServer.Host
+* IdentityService.Host
+* BloggingService.Host
+* ProductService.Host
+* InternalGateway.Host
+* BackendAdminAppGateway.Host
+* PublicWebSiteGateway.Host
+* BackendAdminApp.Host
+* PublicWebSite.Host
+
+## 解决方案简介
+
+Visual Studio解决方案由多个项目组成,每个项目在系统中具有不同的角色:
+
+![microservice-sample-solution](../images/microservice-sample-solution.png)
+
+### 应用程序(Applications)
+
+这些是具有用户界面以与用户交互并使用系统的实际应用程序.
+
+- **AuthServer.Host**: 托管IdentityServer4以向其他服务和应用程序提供身份验证服务. 它是一个单点登录服务器,包含登录页面.
+- **BackendAdminApp.Host**: 这是一个后端管理应用程序,用于托管身份和产品管理模块的UI.
+- **PubicWebSite.Host**: 作为包含简单产品列表页面和博客模块UI的公共网站.
+- **ConsoleClientDemo**: 一个简单的控制台应用程序,用于演示C＃应用程序中使用服务.
+
+### 网关/BFF(前端后端)
+
+网关用于为应用程序提供单一入口点.它还可以用于速率限制,负载平衡等. 使用[Ocelot](https://github.com/ThreeMammals/Ocelot)类库.
+
+* **BackendAdminAppGateway.Host**: 由BackendAdminApp.Host应用程序用作后端.
+* **PublicWebSiteGateway.Host**: 由PublicWebSite.Host应用程序用作后端.
+* **InternalGateway.Host**: 用于服务间通信(微服务之间的通信).
+
+### 微服务
+
+微服务没有UI,但暴露了一些REST API.
+
+- **IdentityService.Host**: 托管用于管理用户和角色的ABP Identity模块. 它没有其他服务,仅托管Identity模块的API.
+- **BloggingService.Host**: 托管ABP博客模块,该模块用于管理博客和帖子(典型的博客应用程序). 它没有其他服务,仅托管Blogging模块的API.
+- **ProductService.Host**: 托管用于管理产品的产品模块(位于解决方案内). 它还包含用于创建/更新产品管理数据库架构的EF Core迁移.
+
+### 模块
+
+* **产品**: 使用[模块开发最佳实践](../Best-Practices/Index.md)开发的分层模块. 它可以嵌入到单个应用程序中,也可以通过单独部署API和UI作为微服务托管(如本演示解决方案中所述).
+
+### 数据库
+
+此解决方案使用多个数据库:
+
+* **MsDemo_Identity**: 一个SQL数据库. 默认使用**SQL Server**,但可以是EF Core支持的任何DBMS. 由AuthServer和IdentityService共享. 审计日志,权限和设置也存储在此数据库中(虽然它们可以轻松拥有自己的数据库,共享相同的数据库以保持简单).
+* **MsDemo_ProductManagement**: 一个SQL数据库. 同样默认使用 **SQL Server**,但可以是EF Core支持的任何DBMS. 由ProductService用作专用数据库.
+* **MsDemo_Blogging**: **MongoDB**数据库. 由BloggingService使用.
+* **Elasticsearch**: 用于在Serilog上写日志.
+
+## 应用
+
+### 认证服务器 (AuthServer.Host)
+
+所有其他服务和应用程序都使用此项目进行身份验证和单点登录. 主要使用**IdentityServer4**来提供这些服务. 它使用了一些[预构建ABP模块](../Modules/Index) 如 *Identity*, *Audit Logging* 和 *Permission Management*.
+
+#### 数据库和EF Core配置
+
+此应用程序使用SQL数据库(将其命名为**MsDemo_Identity**)并通过**Entity Framework Core迁移**维护其架构.
+
+它有一个名为**AuthServerDbContext**的DbContext,定义如下:
+
+````csharp
+public class AuthServerDbContext : AbpDbContext<AuthServerDbContext>
+{
+    public AuthServerDbContext(DbContextOptions<AuthServerDbContext> options) 
+        : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.ConfigureIdentity();
+        modelBuilder.ConfigureIdentityServer();
+        modelBuilder.ConfigureAuditLogging();
+        modelBuilder.ConfigurePermissionManagement();
+        modelBuilder.ConfigureSettingManagement();
+    }
+}
+````
+
+在**OnModelCreating**方法中, 你会看到 **ConfigureX()** 方法调用. 具有数据库模式的模块通常声明这样的扩展方法,以便为其自己的实体配置EF Core映射. 这是一种灵活的方法, 可以在其中安排数据库和模块; 可以为每个模块使用不同的数据库,或者将它们中的一些组合在一个共享数据库中. 在AuthServer项目中,我们决定在单个物理数据库中将单个EF Core DbContext中的多个模块模式组合在一起. 这些模块是Identity,IdentityServer,AuditLogging,PermissionManagement和SettingManagement模块.
+
+请注意,此DbContext仅用于数据库迁移. 所有模块都有自己的`DbContext`类,模块在运行时使用这些类.
+
+#### 用户界面
+
+AuthServer有一个简单的主页,如果当前用户已登录,则显示当前用户信息:
+
+![microservice-sample-authserver-home](../images/microservice-sample-authserver-home.png)
+
+它还提供登录和注册页面:
+
+![microservice-sample-authserver-login](../images/microservice-sample-authserver-login.png)
+
+这些页面不包含在项目本身中. 相反,AuthServer项目使用带有IdentityServer扩展的预构建ABP[帐户模块](https://github.com/abpframework/abp/tree/master/modules/account). 这意味着它还可以充当具有必要UI和逻辑的OpenId Connect服务器.
+
+#### 依赖
+
+* **RabbitMQ** 用于向其他服务发送消息.
+* **Redis** 用于分布式/共享缓存.
+* **Elasticsearch** 用于存储日志.
+
+### 后端管理应用程序 (BackendAdminApp.Host)
+
+这是一个Web应用程序,用于管理系统中的用户,角色,权限和产品.
+
+#### 认证
+
+BackendAdminApp重定向到AuthServer进行身份验证. 用户输入正确的用户名和密码后,页面将再次重定向到后端应用程序. 身份验证配置在`BackendAdminAppHostModule`类中设置:
+
+````charp
+context.Services.AddAuthentication(options =>
+{
+    options.DefaultScheme = "Cookies";
+    options.DefaultChallengeScheme = "oidc";
+})
+.AddCookie("Cookies", options =>
+{
+    options.Cookie.Expiration = TimeSpan.FromDays(365);
+    options.ExpireTimeSpan = TimeSpan.FromDays(365);
+})
+.AddOpenIdConnect("oidc", options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ClientId = configuration["AuthServer:ClientId"];
+    options.ClientSecret = configuration["AuthServer:ClientSecret"];
+    options.RequireHttpsMetadata = false;
+    options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+    options.SaveTokens = true;
+    options.GetClaimsFromUserInfoEndpoint = true;
+    options.Scope.Add("role");
+    options.Scope.Add("email");
+    options.Scope.Add("phone");
+    options.Scope.Add("BackendAdminAppGateway");
+    options.Scope.Add("IdentityService");
+    options.Scope.Add("ProductService");
+    options.ClaimActions.MapAbpClaimTypes();
+});
+````
+
+* 它将"Cookies"身份验证添加为主要身份验证类型.
+* "oidc"身份验证配置为使用AuthServer应用程序作为身份验证服务器.
+* 它需要额外的身份范围(scopes) *role*, *email* and *phone*.
+* It requires the API resource scopes *BackendAdminAppGateway*, *IdentityService* and *ProductService* because it will use these services as APIs.
+* 它需要API资源范围 *BackendAdminAppGateway*, *IdentityService* 和 *ProductService*,因为它将这些服务用作API.
+
+IdentityServer客户端设置存储在`appsettings.json`文件中:
+
+````json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ClientId": "backend-admin-app-client",
+  "ClientSecret": "1q2w3e*"
+}
+````
+
+#### 用户界面
+
+BackendAdminApp.Host项目本身没有单个UI元素/页面. 它仅用于提供身份和产品管理模块的UI页面.
+
+`BackendAdminAppHostModule`将依赖关系添加到`AbpIdentityWebModule`(*[Volo.Abp.Identity.Web](https://www.nuget.org/packages/Volo.Abp.Identity.Web)* 包)和`ProductManagementWebModule`(*ProductManagement.Web*项目)为此目的.
+
+用户管理页面的屏幕截图:
+
+![microservice-sample-backend-ui](../images/microservice-sample-backend-ui.png)
+
+来自权限的权限管理模式的屏幕截图:
+
+![microservice-sample-backend-ui-permissions](../images/microservice-sample-backend-ui-permissions.png)
+
+#### 使用微服务
+
+后端管理应用程序通过后端管理网关对所有操作使用Identity和Product微服务(BackendAdminAppGateway.Host).
+
+##### 远程端点
+
+`appsettings.json`文件包含`RemoteServices`部分,用于声明远程服务端点. 每个微服务通常都有不同的端点. 但是,此解决方案使用API网关模式为应用程序提供单个端点:
+
+````json
+"RemoteServices": {
+  "Default": {
+    "BaseUrl": "http://localhost:65115/"
+  }
+}
+````
+
+`http://localhost:65115/` 是 *BackendAdminAppGateway.Host* 项目的URL. 它知道身份和产品服务的位置.
+
+##### HTTP Clients
+
+ABP应用程序模块通常提供C＃客户端库以轻松地使用服务(API)(它们通常使用ABP框架的[Dynamic C# API客户端](../AspNetCore/Dynamic-CSharp-API-Clients.md)). 这意味着如果你需要使用Identity Service API, 你可以引用其客户端软件包,并通过提供的接口轻松使用API.
+
+为此`BackendAdminAppHostModule`类声明了`AbpIdentityHttpApiClientModule`和`ProductManagementHttpApiClientModule`的依赖关系.
+
+一旦引用这些客户端软件包,就可以直接注入应用程序服务接口(例如`IIdentityUserAppService`)并使用其方法,如本地方法调用. 它实际上通过HTTP调用到相关服务端点的远程服务调用.
+
+##### 传递访问令牌(Access Token)
+
+由于微服务需要身份验证和授权,因此每个远程服务调用都应包含Authentication头. 该头是从当前用户的当前`HttpContext`中的`access_token`获得的. 当你使用`Volo.Abp.Http.Client.IdentityModel`包时,会自动执行此操作. `BackendAdminAppHostModule`声明对此包和相关的`AbpHttpClientIdentityModelModule`类的依赖. 它集成到上面解释的HTTP客户端.
+
+#### 依赖
+
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 公共网站 (PublicWebSite.Host)
+
+这是一个公共网站项目,具有Web博客和产品列表页面.
+
+#### 认证
+
+公共网站可以在不登录的情况下显示博客文章和产品列表. 如果你登录,你还可以管理博客. 它重定向到AuthServer进行身份验证. 用户输入正确的用户名和密码后,页面将再次重定向到公共网站应用程序. 身份验证配置在`PublicWebSiteHostModule`类中设置:
+
+```charp
+context.Services.AddAuthentication(options =>
+{
+    options.DefaultScheme = "Cookies";
+    options.DefaultChallengeScheme = "oidc";
+})
+.AddCookie("Cookies", options =>
+{
+    options.Cookie.Expiration = TimeSpan.FromDays(365);
+    options.ExpireTimeSpan = TimeSpan.FromDays(365);
+})
+.AddOpenIdConnect("oidc", options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ClientId = configuration["AuthServer:ClientId"];
+    options.ClientSecret = configuration["AuthServer:ClientSecret"];
+    options.RequireHttpsMetadata = false;
+    options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+    options.SaveTokens = true;
+    options.GetClaimsFromUserInfoEndpoint = true;
+    options.Scope.Add("role");
+    options.Scope.Add("email");
+    options.Scope.Add("phone");
+    options.Scope.Add("PublicWebSiteGateway");
+    options.Scope.Add("ProductService");
+    options.Scope.Add("BloggingService");
+    options.ClaimActions.MapAbpClaimTypes();
+});
+```
+
+- 它将"Cookies"身份验证添加为主要身份验证类型.
+- "oidc"身份验证配置为使用AuthServer应用程序作为身份验证服务器.
+- 它需要额外的身份范围 *role*, *email* and *phone*.
+- 它需要API资源范围 *PublicWebSiteGateway*,*BloggingService*和*ProductService*,因为它将这些服务用作API.
+
+IdentityServer客户端设置存储在`appsettings.json`文件中：
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ClientId": "public-website-client",
+  "ClientSecret": "1q2w3e*"
+}
+```
+
+#### 用户界面
+
+PublicWebSite.Host项目有一个列出产品的页面 (`Pages/Products.cshtml`). 它还使用博客模块中的UI. 为此`PublicWebSiteHostModule`加入了`BloggingWebModule`(*[Volo.Blogging.Web](https://www.nuget.org/packages/Volo.Blogging.Web)* 包)的依赖项.
+
+产品页面的屏幕截图：
+
+![microservice-sample-public-product-list](../images/microservice-sample-public-product-list.png)
+
+#### 使用微服务
+
+公共网站应用程序使用Blogging和Product微服务通过公共网站网关进行所有操作(PublicWebSiteGateway.Host).
+
+##### 远程端点
+
+
+`appsettings.json`文件包含`RemoteServices`部分,用于声明远程服务端点. 每个微服务通常都有不同的端点. 但是,此解决方案使用API网关模式为应用程序提供单个端点:
+
+```json
+"RemoteServices": {
+  "Default": {
+    "BaseUrl": "http://localhost:64897/"
+  }
+}
+```
+
+`http://localhost:64897/` 是*PublicWebSiteGateway.Host*项目的URL. 它知道Blogging和产品服务的位置.
+
+##### HTTP Clients
+
+`PublicWebSiteHostModule`类声明`BloggingHttpApiClientModule`和`ProductManagementHttpApiClientModule`的依赖关系,以便能够为这些服务使用远程HTTP API.
+
+##### 传递访问令牌(Access Token)
+
+正如后端管理应用程序部分中所述, Public Web Site项目还使用`AbpHttpClientIdentityModelModule`将`access_token`传递给调用服务进行身份验证.
+
+#### Dependencies
+
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 控制台客户端演示
+
+最后,该解决方案包括一个非常简单的控制台应用程序,名为ConsoleClientDemo,它通过AuthServer进行身份验证来使用Identity和Product服务. 它使用内部网关(InternalGateway.Host)来执行HTTP API调用.
+
+#### 远程服务配置
+
+`appsettings.json`文件中的`RemoteService`配置很简单：
+
+````json
+"RemoteServices": {
+  "Default": {
+    "BaseUrl": "http://localhost:65129/"
+  }
+}
+````
+
+`http://localhost:65129/` 是内部网关的URL. 对服务的所有API调用都是通过此URL执行的.
+
+#### 身份验证(IdentityServer客户端)配置
+
+`appsettings.json`还有一个IdentityServer身份验证配置:
+
+````json
+"IdentityClients": {
+  "Default": {
+    "GrantType": "client_credentials",
+    "ClientId": "console-client-demo",
+    "ClientSecret": "1q2w3e*",
+    "Authority": "http://localhost:64999",
+    "Scope": "InternalGateway IdentityService ProductService"
+  }
+}
+````
+
+此示例使用`client_credentials` 授予类型,该类型需要`ClientId`和`ClientSecret`进行身份验证过程. 还有[其他授予类型](http://docs.identityserver.io/en/latest/topics/grant_types.html). 例如, 你可以使用以下配置切换到`password`(Resource Owner Password)授予类型：
+
+````json
+"IdentityClients": {
+  "Default": {
+    "GrantType": "password",
+    "ClientId": "console-client-demo",
+    "ClientSecret": "1q2w3e*",
+    "UserName": "admin",
+    "UserPassword": "1q2w3E*",
+    "Authority": "http://localhost:64999",
+    "Scope": "InternalGateway IdentityService ProductService"
+  }
+}
+````
+
+除客户端凭据外,Resource Owner Password还需要`UserName` 和 `UserPassword`. 此授权类型对于代表用户调用远程服务很有用.
+
+`Scope` 声明API(和网关)以授予访问权限. 此应用程序使用内部网关.
+
+#### HTTP Client依赖
+
+`ConsoleClientDemoModule`与`AbpIdentityHttpApiClientModule`和`ProductManagementHttpApiClientModule`有依赖关系,以便使用Identity和Product API. 它还具有“AbpHttpClientIdentityModelModule”依赖性,可通过IdentityServer进行身份验证.
+
+#### 使用服务
+
+使用这些服务非常简单. 请参阅`ClientDemoService`类,它只是注入`IIdentityUserAppService`和`IProductAppService`并使用它们. 该类还显示了使用`HttpClient`对象的手动HTTP调用. 有关详细信息,请参阅`ClientDemoService`的源代码.
+
+## API网关/ BFF(前端后端)
+
+网关用于为应用程序提供 **单一入口点**. 通过这种方式,应用程序仅处理单个服务地址(API端点),而不是每个服务的不同地址. 网关还用于速率限制,安全性,身份验证,负载平衡和更多要求.
+
+"**后端前端**"(BFF)是一种常见的架构模式,可为每种不同的应用程序/客户端类型构建**专注而专业的**网关. 此解决方案使用此模式并具有多个网关.
+
+此解决方案使用[Ocelot](https://github.com/ThreeMammals/Ocelot)库来构建API网关. 它是ASP.NET核心广泛接受的API网关库.
+
+### 后端管理应用程序网关 (BackendAdminAppGateway.Host)
+
+这是"后端管理应用程序"的后端(服务器端API)(不要混淆命名;后端管理应用程序实际上是前端Web应用程序,但系统管理员而不是普通用户使用).
+
+#### 认证
+
+此网关使用IdentityServer `Bearer`身份验证并配置如下:
+
+````csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;    
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = 
+        AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+````
+
+`AddIdentityServerAuthentication` 扩展方法来自 [IdentityServer4.AccessTokenValidation](https://www.nuget.org/packages/IdentityServer4.AccessTokenValidation) 包, IdentityServer4项目的一部分 (参见 [identityserver文档](http://docs.identityserver.io/en/latest/topics/apis.html)). 
+
+`ApiName`是受保护的API,在这种情况下是`BackendAdminAppGateway`. 因此,此解决方案将网关定义为API资源. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关. `appsettings.json`中的身份验证相关的配置很简单:
+
+````json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "BackendAdminAppGateway"
+}
+````
+
+#### Ocelot配置
+
+Ocelot需要知道微服务的真实URL才能重定向HTTP请求. 此网关的配置如下所示:
+
+````json
+"ReRoutes": [
+  {
+    "DownstreamPathTemplate": "/api/identity/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 63568
+      }
+    ],
+    "UpstreamPathTemplate": "/api/identity/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  },
+  {
+    "DownstreamPathTemplate": "/api/productManagement/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 60244
+      }
+    ],
+    "UpstreamPathTemplate": "/api/productManagement/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  }
+],
+"GlobalConfiguration": {
+  "BaseUrl": "http://localhost:65115"
+}
+````
+
+`ReRoutes`是一个URL映射数组. `GlobalConfiguration`部分中的`BaseUrl`是该网关的URL(Ocelot需要知道自己的URL). 参见 [ocelot文档](https://ocelot.readthedocs.io/en/latest/features/configuration.html) 更好地了解配置.
+
+Ocelot is a finalizer ASP.NET Core middleware and should be written as the last item in the pipeline:
+
+Ocelot是一个终结ASP.NET核心中间件,应该写成管道中的最后一项:
+
+````csharp
+app.UseOcelot().Wait();
+````
+
+它根据上面的配置处理和重定向请求.
+
+#### ABP 配置端点
+
+ABP提供了一些内置API,以从服务器获取一些配置和信息. 例子:
+
+* `/api/abp/application-configuration` 返回本地化文本,权限和设置值 (http://localhost:65115/api/abp/application-configuration).
+* `/Abp/ServiceProxyScript` 返回动态javascript代理以从javascript客户端调用服务 (http://localhost:65115/Abp/ServiceProxyScript ).
+
+这些端点应由网关服务提供,而不是由微服务提供. 微服务只能知道与该微服务相关的权限. 但是,一旦正确配置,网关就可以将多个服务的权限值聚合为一个更适合客户端的列表.
+
+为此, ASP.NET Core管道配置为通过MVC而不是Ocelot处理某些特定路由. 为了实现这一点,MapWhen扩展方法使用如下:
+
+````csharp
+app.MapWhen(ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || 
+                   ctx.Request.Path.ToString().StartsWith("/Abp/"),
+    app2 =>
+    {
+        app2.UseMvcWithDefaultRouteAndArea();
+    });
+
+app.UseOcelot().Wait();
+````
+
+当请求路径以 `/api/abp/` 或 `/Abp/`.开头时,此配置使用标准MVC中间件.
+
+#### Swagger
+
+此网关配置为使用[swagger UI](https://swagger.io/tools/swagger-ui/), 这是一种用于发现和测试HTTP API的流行工具. 通常,Ocelot不支持在swagger上显示API,因为它无法了解每个微服务API的详细信息. 但是当你遵循ABP分层模块架构[最佳实践](../Best-Practices/Index.md)时,它是可能的.
+
+`BackendAdminAppGatewayHostModule`将依赖性添加到`AbpIdentityHttpApiModule`(*[Volo.Abp.Identity.HttpApi](https://www.nuget.org/packages/Volo.Abp.Identity.HttpApi)* 包)和`ProductManagementHttpApiModule`(*ProductManagement.HttpApi* 项目)以包含它们的HTTP API控制器. 通过这种方式,swagger可以发现它们. 虽然它引用了API层,但它没有引用应用程序服务的实现,因为它们将在相关的微服务端点中运行,并由Ocelot根据请求URL重定向.
+
+无论如何,当你打开URL`http://localhost:65115/swagger/index.html`时, 你将看到所有已配置的微服务的API.
+
+#### 权限管理
+
+后端管理应用程序提供权限管理UI(之前见过),并使用此网关获取/设置权限. 权限管理API托管在网关内,而不是单独的服务. 这是一个设计决策,但如果您愿意,它可以作为另一个微服务托管.
+
+#### Dependencies
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 公共网站网关 (PublicWebSiteGateway.Host)
+
+这是"公共网站"应用程序的后端(服务器端API网关).
+
+#### 认证
+
+此网关使用IdentityServer `Bearer`身份验证并配置如下:
+
+```csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;    
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = 
+        AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+```
+
+`AddIdentityServerAuthentication` 扩展方法来自 [IdentityServer4.AccessTokenValidation](https://www.nuget.org/packages/IdentityServer4.AccessTokenValidation)包, IdentityServer4项目的一部分 (参见 [identityserver文档](http://docs.identityserver.io/en/latest/topics/apis.html)). 
+
+`ApiName`是受保护的API,在这种情况下是`PublicWebSiteGateway`. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关. 与`appsettings.json`中的身份验证相关的配置很简单:
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "PublicWebSiteGateway"
+}
+```
+
+#### Ocelot配置
+
+Ocelot需要知道微服务的真实URL才能重定向HTTP请求. 此网关的配置如下所示:
+
+```json
+"ReRoutes": [
+  {
+    "DownstreamPathTemplate": "/api/productManagement/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 60244
+      }
+    ],
+    "UpstreamPathTemplate": "/api/productManagement/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  },
+  {
+    "DownstreamPathTemplate": "/api/blogging/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 62157
+      }
+    ],
+    "UpstreamPathTemplate": "/api/blogging/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  }
+],
+"GlobalConfiguration": {
+  "BaseUrl": "http://localhost:64897"
+}
+```
+
+参见 [ocelot文档](https://ocelot.readthedocs.io/en/latest/features/configuration.html) 更好地了解配置.
+
+#### 其它
+
+请参阅"后端管理应用程序网关"部分中的"ABP配置端点"和"Swagger"主题,这些主题与此网关非常相似.
+
+#### 依赖
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 内部网关 (InternalGateway.Host)
+
+该网关不是BFF. 它专为微服务间通信而设计,不会公开.
+
+#### 认证
+
+此网关使用IdentityServer `Bearer`身份验证并配置如下:
+
+```csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;    
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+```
+
+`AddIdentityServerAuthentication` 扩展方法来自 [IdentityServer4.AccessTokenValidation](https://www.nuget.org/packages/IdentityServer4.AccessTokenValidation)包, IdentityServer4项目的一部分 (参见 [identityserver文档](http://docs.identityserver.io/en/latest/topics/apis.html)).
+
+`ApiName`是受保护的API,在这种情况下是`InternalGateway`. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关. 与`appsettings.json`中的身份验证相关的配置很简单:
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "InternalGateway"
+}
+```
+
+#### Ocelot 配置
+
+Ocelot需要知道微服务的真实URL才能重定向HTTP请求. 此网关的配置如下所示:
+
+```json
+"ReRoutes": [
+  {
+    "DownstreamPathTemplate": "/api/identity/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 63568
+      }
+    ],
+    "UpstreamPathTemplate": "/api/identity/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  },
+  {
+    "DownstreamPathTemplate": "/api/productManagement/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 60244
+      }
+    ],
+    "UpstreamPathTemplate": "/api/productManagement/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  },
+  {
+    "DownstreamPathTemplate": "/api/blogging/{everything}",
+    "DownstreamScheme": "http",
+    "DownstreamHostAndPorts": [
+      {
+        "Host": "localhost",
+        "Port": 62157
+      }
+    ],
+    "UpstreamPathTemplate": "/api/blogging/{everything}",
+    "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
+  }
+],
+"GlobalConfiguration": {
+  "BaseUrl": "http://localhost:65129"
+}
+```
+
+`ReRoutes`配置涵盖了系统中的所有微服务. 参见 [ocelot文档](https://ocelot.readthedocs.io/en/latest/features/configuration.html) 更好地了解配置.
+
+#### 其它
+
+请参阅"后端管理应用程序网关"部分中的"ABP配置端点"和"Swagger"主题,这些主题与此网关非常相似.
+
+#### 依赖
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
 
 ## 微服务
 
-### 身份认证服务
+微服务是独立的HTTP API,它们以分布式方式实现系统业务.
+
+* 它们由应用程序和其他微服务通过网关和HTTP API使用.
+* 他们可以提升或注册系统中的事件.
+* 它们可以通过异步消息传递相互通信.
+
+### Identity Service (IdentityService.Host)
+
+此服务提供用户和角色管理API.
+
+#### 数据库
+
+与AuthServer应用程序共享相同的数据库(MsDemo_Identity).
+
+#### Identity模块
+
+该服务实际上只托管ABP身份包/模块. 不包含任何API本身. 为了托管它,添加以下依赖项:
+
+* `AbpIdentityHttpApiModule` (*[Volo.Abp.Identity.HttpApi](https://www.nuget.org/packages/Volo.Abp.Identity.HttpApi)* 包) 提供身份API.
+* `AbpIdentityApplicationModule` (*[Volo.Abp.Identity.Application](https://www.nuget.org/packages/Volo.Abp.Identity.Application)* 包)承载模块的应用程序和域层的实现.
+* `AbpIdentityEntityFrameworkCoreModule` (*[Volo.Abp.Identity.EntityFrameworkCore](https://www.nuget.org/packages/Volo.Abp.Identity.EntityFrameworkCore)* 包) 使用EF Core作为数据库API.
+
+请参阅[module architecture best practice guide](../Best-Practices/Module-Architecture)以更好地理解分层.
+
+#### 认证
+
+这个微服务使用IdentityServer`Bearer`身份验证,并配置如下:
+
+```csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = 
+        AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+```
+
+`ApiName`是受保护的API,在这种情况下是`IdentityService`. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关. 与`appsettings.json`中的身份验证相关的配置很简单:
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "IdentityService"
+}
+```
+
+#### Swagger
+
+Swagger UI已配置,是此服务的默认页面. 如果你导航到URL`http://localhost:63568/`, 你将被重定向到swagger页面以查看和测试API.
+
+#### 依赖
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 博客服务 (BloggingService.Host)
+
+此服务托管博客API.
+
+#### 数据库
+
+它有一个专门的MongoDB数据库(MsDemo_Blogging)来存储博客和帖子. 它还使用MsDemo_Identity SQL数据库来审核日志,权限和设置. 因此,`appsettings.json`文件中有两个连接字符串:
+
+````json
+"ConnectionStrings": {
+  "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true",
+  "Blogging": "mongodb://localhost|MsDemo_Blogging"
+}
+````
+
+#### 博客模块
+
+该服务实际上只托管ABP Blogging包/模块. 不包含任何API本身. 为了托管它,添加以下依赖项:
+
+- `BloggingHttpApiModule` (*[Volo.Blogging.HttpApi](https://www.nuget.org/packages/Volo.Blogging.HttpApi)* 包) 提供Blogging API.
+- `BloggingApplicationModule` (*[Volo.Blogging.Application](https://www.nuget.org/packages/Volo.Blogging.Application)* 包) 承载模块的应用程序和域层的实现.
+- `BloggingMongoDbModule` (*[Volo.Blogging.MongoDB](https://www.nuget.org/packages/Volo.Abp.Identity.EntityFrameworkCore)* 包) 使用MongoDB作为数据库.
+
+请参阅[module architecture best practice guide](../Best-Practices/Module-Architecture)以更好地理解分层.
+
+#### 认证
+
+这个微服务使用IdentityServer `Bearer`身份验证,并配置如下:
+
+```csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;    
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = 
+        AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+```
+
+`ApiName`是受保护的API,在这种情况下是`BloggingService`. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关.与`appsettings.json`中的身份验证相关的配置很简单:
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "BloggingService"
+}
+```
+
+#### IdentityServer Client
+
+此微服务还通过内部网关使用Identity微服务API, 因为在某些情况下它需要查询用户详细信息(username, email, phone, name and surname). 因此,它也是IdentityServer的客户端,并在`appsettings.json`文件中定义了一个部分:
+
+````json
+"IdentityClients": {
+  "Default": {
+    "GrantType": "client_credentials",
+    "ClientId": "blogging-service-client",
+    "ClientSecret": "1q2w3e*",
+    "Authority": "http://localhost:64999",
+    "Scope": "InternalGateway IdentityService"
+  }
+}
+````
+
+由于它使用内部网关, 因此它还应配置网关的远程端点:
+
+````json
+"RemoteServices": {
+  "Default": {
+    "BaseUrl": "http://localhost:65129/",
+    "UseCurrentAccessToken": "false"
+  }
+}
+````
+
+当你将`UseCurrentAccessToken`设置为`false`时,ABP会忽略当前`HttpContext`中的当前`access_token`,并使用上面定义的凭据对AuthServer进行身份验证.
+
+为什么不在当前请求中使用当前用户的令牌? 因为,用户可能没有Identity模块所需的权限,因此它不能直接将当前身份验证令牌传递给Identity服务. 此外,某些博客服务API是匿名的(不需要经过身份验证的用户),因此在某些情况下,HTTP请求中没有"当前用户". 出于这些原因,应将Blogging服务定义为具有自己的凭据和权限的Identity服务的客户端.
+
+如果检查`MsDemo_Identity`数据库中的`AbpPermissionGrants`表,则可以看到`blogging-service-client`的相关权限.
+
+![microservice-sample-blogservice-permission-in-database](../images/microservice-sample-blogservice-permission-in-database.png)
+
+#### Swagger
+
+Swagger UI已配置,是此服务的默认页面. 如果你导航到URL`http://localhost:62157/`, 你将被重定向到swagger页面以查看和测试API.
+
+#### 依赖
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+### 产品服务 (ProductService.Host)
+
+此服务托管产品管理API.
+
+#### 数据库和EF核心迁移
+
+它有一个单独的SQL数据库,名为**MsDemo_ProductManagement**,用于产品管理模块. 它使用EF Core作为数据库提供程序,并具有名为`ProductServiceMigrationDbContext`的DbContext:
+
+````csharp
+public class ProductServiceMigrationDbContext : AbpDbContext<ProductServiceMigrationDbContext>
+{
+    public ProductServiceMigrationDbContext(
+        DbContextOptions<ProductServiceMigrationDbContext> options
+        ) : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.ConfigureProductManagement();
+    }
+}
+````
+
+实际模型配置在`modelBuilder.ConfigureProductManagement()`扩展方法内完成. 此项目使用EF Core迁移维护数据库模式.
+
+请注意,此DbContext仅用于数据库迁移. Product Management模块有自己的`DbContext`类,它在运行时使用(参见ProductManagement.EntityFrameworkCore项目中的`ProductManagementDbContext`类).
+
+`appsettings.json`文件中有两个连接字符串:
+
+````json
+"ConnectionStrings": {
+  "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true",
+  "ProductManagement": "Server=localhost;Database=MsDemo_ProductManagement;Trusted_Connection=True;MultipleActiveResultSets=true"
+}
+````
+
+`Default`连接字符串指向MsDemo_Identity数据库,该数据库用于审计日志记录,权限和设置存储. 产品模块使用`ProductManagement`连接字符串.
+
+#### 产品模块
+
+该服务实际上只托管产品管理模块. 不包含任何API本身. 为了托管它,添加以下依赖项:
+
+- `ProductManagementHttpApiModule` 提供产品管理API.
+- `ProductManagementApplicationModule` 承载模块的应用程序和域层的实现.
+- `ProductManagementEntityFrameworkCoreModule` 使用EF Core作为数据库API.
+
+请参阅[module architecture best practice guide](../Best-Practices/Module-Architecture)以更好地理解分层. 有关此模块的更多信息,请参阅下面的"产品管理"模块部分
+
+#### 认证
+
+这个微服务使用IdentityServer `Bearer`身份验证,并配置如下:
+
+```csharp
+context.Services.AddAuthentication("Bearer")
+.AddIdentityServerAuthentication(options =>
+{
+    options.Authority = configuration["AuthServer:Authority"];
+    options.ApiName = configuration["AuthServer:ApiName"];
+    options.RequireHttpsMetadata = false;
+    options.InboundJwtClaimTypeMap["sub"] = AbpClaimTypes.UserId;
+    options.InboundJwtClaimTypeMap["role"] = AbpClaimTypes.Role;
+    options.InboundJwtClaimTypeMap["email"] = AbpClaimTypes.Email;
+    options.InboundJwtClaimTypeMap["email_verified"] = AbpClaimTypes.EmailVerified;
+    options.InboundJwtClaimTypeMap["phone_number"] = AbpClaimTypes.PhoneNumber;
+    options.InboundJwtClaimTypeMap["phone_number_verified"] = 
+        AbpClaimTypes.PhoneNumberVerified;
+    options.InboundJwtClaimTypeMap["name"] = AbpClaimTypes.UserName;
+});
+```
+
+`ApiName`是受保护的API,在这种情况下是`ProductService`. 其余配置与声明映射(计划在下一个ABP版本中自动化)相关. 与`appsettings.json`中的身份验证相关的配置很简单:
+
+```json
+"AuthServer": {
+  "Authority": "http://localhost:64999",
+  "ApiName": "ProductService"
+}
+```
+
+#### Swagger
+
+Swagger UI已配置,是此服务的默认页面. 如果你导航到URL`http://localhost:60244/`, 你将被重定向到swagger页面以查看和测试API.
+
+#### 依赖
+
+- **RabbitMQ** 用于向其他服务发送消息.
+- **Redis** 用于分布式/共享缓存.
+- **Elasticsearch** 用于存储日志.
+
+## 模块
+
+ABP提供强大的基础架构,通过提供服务和架构,使模块化应用程序开发更容易(参见[模块开发最佳实践指南](../Best-Practices/Index.md)).
+
+此解决方案演示了如何在分布式体系结构中使用[预构建的应用程序模块](../Modules/Index.md). 该解决方案还包括一个简单的"产品管理"模块,用于显示分层模块示例的实现.
+
+### 产品管理
+
+产品管理是一个由多个层和包/项目组成的模块:
+
+![microservice-sample-product-module-in-solution](../images/microservice-sample-product-module-in-solution.png)
+
+* `ProductManagement.Domain.Shared` 包含所有层之间共享的常量和类型.
+* `ProductManagement.Domain` 包含域逻辑并定义实体,域服务,域事件,业务/域异常.
+* `ProductManagement.Application.Contracts` 包含应用程序服务接口和DTO.
+* `ProductManagement.Application` 包含应用程序服务的实现.
+* `ProductManagement.EntityFrameworkCore` 包含DbContext和其他与EF Core相关的类和配置.
+* `ProductManagement.HttpApi` 包含API控制器.
+* `ProductManagement.HttpApi.Client` 包含C#代理以远程直接使用HTTP API. 使用ABP的[Dynamic C＃API客户端](../AspNetCore/Dynamic-CSharp-API-Clients.md)功能.
+
+* `ProductManagement.Web` 包含UI元素(页面,脚本,样式..等).
+
+通过此分层的帮助,可以在单个应用程序中使用相同的模块作为包引用,或者用作在另一个服务器中运行的服务. 可以分离UI(Web)和API层,因此它们可以在不同的服务器中运行.
+
+在此解决方案中,Web层在后端管理应用程序中运行,而API层由产品微服务托管.
+
+本教程将重点介绍该模块的一些重要方面. 但是,建议查看源代码以便更好地理解.
+
+#### Domain Layer
+
+`Product`是这个模块的主要[聚合根](../Entities.md):
+
+````csharp
+public class Product : AuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// A unique value for this product.
+    /// ProductManager ensures the uniqueness of it.
+    /// It can not be changed after creation of the product.
+    /// </summary>
+    [NotNull]
+    public string Code { get; private set; }
+
+    [NotNull]
+    public string Name { get; private set; }
+
+    public float Price { get; private set; }
+
+    public int StockCount { get; private set; }    
+    
+    //...
+}
+````
+
+它的所有属性都有私有的set方法,可以防止属性从类中直接更改. 产品类通过自己的构造函数和方法确保其自身的完整性和有效性.
+
+它有两个构造函数:
+
+````csharp
+private Product()
+{
+    //Default constructor is needed for ORMs.
+}
+
+internal Product(
+    Guid id,
+    [NotNull] string code, 
+    [NotNull] string name, 
+    float price = 0.0f, 
+    int stockCount = 0)
+{
+    Check.NotNullOrWhiteSpace(code, nameof(code));
+
+    if (code.Length >= ProductConsts.MaxCodeLength)
+    {
+        throw new ArgumentException(
+            $"Product code can not be longer than {ProductConsts.MaxCodeLength}"
+        );
+    }
+
+    Id = id;
+    Code = code;
+    SetName(Check.NotNullOrWhiteSpace(name, nameof(name)));
+    SetPrice(price);
+    SetStockCountInternal(stockCount, triggerEvent: false);
+}
+
+````
+
+默认(**无参数**)构造函数是私有的,不在应用程序代码中使用. 这是必需的,因为大多数ORM在从数据库获取时需要在反序列化实体时使用无参数构造函数.
+
+第二个构造函数是**internal**,这意味着它只能在域层内使用. 这强制在创建新的`Product`时使用`ProductManager`. 因为``ProductManager`应该在新产品创建上实现业务规则. 此构造函数仅需要最少的必需参数来创建具有一些可选参数的新产品. 它会检查一些简单的业务规则,以确保将实体创建为有效产品.
+
+该类的其余部分具有操纵实体属性的方法. 例:
+
+````csharp
+public Product SetPrice(float price)
+{
+    if (price < 0.0f)
+    {
+        throw new ArgumentException($"{nameof(price)} can not be less than 0.0!");
+    }
+
+    Price = price;
+    return this;
+}
+
+````
+
+`SetPrice`方法用于以安全的方式更改产品的价格(通过检查验证规则).
+
+`SetStockCount`是另一种用于更改产品库存数量的方法:
+
+````csharp
+public Product SetStockCount(int stockCount)
+{
+    return SetStockCountInternal(stockCount);
+}
+
+private Product SetStockCountInternal(int stockCount, bool triggerEvent = true)
+{
+    if (StockCount < 0)
+    {
+        throw new ArgumentException($"{nameof(stockCount)} can not be less than 0!");
+    }
+
+    if (StockCount == stockCount)
+    {
+        return this;
+    }
+
+    if (triggerEvent)
+    {
+        AddDistributedEvent(
+            new ProductStockCountChangedEto(
+                Id, StockCount, stockCount
+            )
+        );
+    }
+
+    StockCount = stockCount;
+    return this;
+}
+
+````
+
+此方法还触发**分布式事件**,其中带有`ProductStockCountChangedEto`参数(Eto是传统的后缀代表**E**vent **T**ransfer **O**bject,但不是必需的)通知产品库存数量的听众已发生变化. 任何订户都可以接收此事件并根据该知识执行操作.
+
+RabbitMQ为此解决方案分发事件. 但是ABP通过提供必要的抽象来独立于消息代理[Event Bus](../Event-Bus.md)文档).
+
+如前所述,该模块强制始终使用`ProductManager`来创建新的`Product`. `ProductManager`是一个简单的域服务,定义如下:
+
+````csharp
+public class ProductManager : DomainService
+{
+    private readonly IRepository<Product, Guid> _productRepository;
+
+    public ProductManager(IRepository<Product, Guid> productRepository)
+    {
+        _productRepository = productRepository;
+    }
+
+    public async Task<Product> CreateAsync(
+        [NotNull] string code,
+        [NotNull] string name,
+        float price = 0.0f,
+        int stockCount = 0)
+    {
+        var existingProduct = 
+            await _productRepository.FirstOrDefaultAsync(p => p.Code == code);
+            
+        if (existingProduct != null)
+        {
+            throw new ProductCodeAlreadyExistsException(code);
+        }
+
+        return await _productRepository.InsertAsync(
+            new Product(
+                GuidGenerator.Create(),
+                code,
+                name,
+                price,
+                stockCount
+            )
+        );
+    }
+}
+````
+
+* 它检查之前是否使用过给定的代码. 否则抛出`ProductCodeAlreadyExistsException`.
+* 使用`GuidGenerator`(`IGuidGenerator`)服务来创建一个新的`Guid`.
+* 它将实体插入存储库.
+
+因此,通过这种设计,产品代码的唯一性得到保证.
+
+`ProductCodeAlreadyExistsException`是一个域/业务异常,定义如下:
+
+````csharp
+public class ProductCodeAlreadyExistsException : BusinessException
+{
+    public ProductCodeAlreadyExistsException(string productCode)
+        : base("PM:000001", $"A product with code {productCode} has already exists!")
+    {
+
+    }
+}
+````
+
+`PM：000001`是发送给客户端的异常类型的代码,因此他们可以理解错误类型. 在这种情况下没有实现,但也可以本地化业务异常. 请参阅[异常处理文档](../Exception-Handling.md).
+
+#### 应用层
+
+该模块的应用层有两个服务:
+
+* `ProductAppService`主要由后端管理应用程序用于管理(创建,更新,删除.)产品. 它需要许可才能执行任何操作.
+* 公共网站使用`PublicProductAppService`来向访问者显示产品列表. 它不需要任何权限,因为大多数访问者都没有登录到应用程序.
+
+请注意; 每个应用程序分离应用程序层可能是更好的原则, 而不是将两个应用程序服务放入同一个项目中. 但是我们在这个解决方案中简化了它们.
+
+例如,`ProductAppService`具有以下更新产品的方法:
+
+````csharp
+[Authorize(ProductManagementPermissions.Products.Update)]
+public async Task<ProductDto> UpdateAsync(Guid id, UpdateProductDto input)
+{
+    var product = await _productRepository.GetAsync(id);
+
+    product.SetName(input.Name);
+    product.SetPrice(input.Price);
+    product.SetStockCount(input.StockCount);
+
+    return ObjectMapper.Map<Product, ProductDto>(product);
+}
+````
+
+* 它定义了所需的权限(*ProductManagementPermissions.Products.Update*是一个值为`ProductManagement.Update`的常量)来执行此操作.
+* 获取产品的ID,DTO包含要更新的值.
+* 从存储库中获取相关的产品实体.
+* 使用`Product`类的相关方法(如`SetName`)来更改属性,因为它们是私有set方法,更改值的唯一方法是使用实体方法.
+* 通过使用[ObjectMapper](../Object-To-Object-Mapping.md)向客户端返回更新的`ProductDto`(客户端可能由于某种原因需要它).
+
+实施可能会根据要求而有所不同. 此实现遵循此处提供的[最佳实践](../Best-Practices/Application-Services.md).
+
+#### 其他层
+
+请参阅源代码中的其他层.
+
+## 基础设施
+
+### 消息和RabbitMQ
+
+异步消息传递是分布式系统中的关键概念. 它可以以松散耦合的方式与容错进行通信. 在发送消息时,它不要求双方都在线. 因此,它是微服务架构中广泛使用的通信模式.
+
+#### 分布式事件总线
+
+分布式事件(事件总线)是一种消息传递方式,其中服务引发/触发事件,而其他服务注册/侦听这些事件,以便在发生重要事件时得到通知. ABP通过提供约定,服务和集成使分布式事件更易于使用.
+
+您已经看到`Product`类使用以下代码行发布事件:
+
+````csharp
+AddDistributedEvent(new ProductStockCountChangedEto(Id, StockCount, stockCount));
+````
+
+`ProductStockCountChangedEto` was defined as shown below:
+
+````csharp
+[Serializable]
+public class ProductStockCountChangedEto : EtoBase
+{
+    public Guid Id { get; }
+
+    public int OldCount { get; set; }
+
+    public int CurrentCount { get; set; }
+
+    private ProductStockCountChangedEto()
+    {
+        //Default constructor is needed for deserialization.
+    }
+
+    public ProductStockCountChangedEto(Guid id, int oldCount, int currentCount)
+    {
+        Id = id;
+        OldCount = oldCount;
+        CurrentCount = currentCount;
+    }
+}
+````
+
+该对象存储有关该事件的必要信息. 通过使用通用的`ProductStockCountChangedEto`参数实现`IDistributedEventHandler`接口,另一个服务可以轻松注册到此事件:
+
+````csharp
+public class MyHandler : IDistributedEventHandler<ProductStockCountChangedEto>
+{
+    public async Task HandleEventAsync(ProductStockCountChangedEto eventData)
+    {
+        var productId = eventData.Id;
+        //...
+    }
+}
+````
+
+当你使用[Volo.Abp.EventBus.RabbitMQ](https://www.nuget.org/packages/Volo.Abp.EventBus.RabbitMQ)包时,所有集成和通信都由ABP框架完成.如果需要从实体发布事件,只需注入`IDistributedEventBus`并使用`PublishAsync`方法.
+
+有关分布式事件系统的更多信息, 请参见[Event Bus](../Event-Bus.md)文档.
+
+#### RabbitMQ配置
+
+在此解决方案中, [RabbitMQ](https://www.rabbitmq.com/)用于消息传递和分布式事件.
+
+[Volo.Abp.EventBus.RabbitMQ](https://www.nuget.org/packages/Volo.Abp.EventBus.RabbitMQ)包需要集成到RabbitMQ以用于分布式事件系统. 然后你需要为模块的`AbpEventBusRabbitMqModule`添加依赖项. 例如`ProductServiceHostModule`声明了这种依赖.
+
+默认情况下,`abpEventBusRabbitMqModule`从`appsettings.json`获取配置. 例如产品服务具有以下配置:
+
+````json
+"RabbitMQ": {
+  "Connections": {
+    "Default": {
+      "HostName": "localhost"
+    }
+  },
+  "EventBus": {
+    "ClientName": "MsDemo_ProductService",
+    "ExchangeName": "MsDemo"
+  }
+}
+````
+
+### 缓存和Redis
+
+分布式系统显然需要分布式和共享缓存,而不是每个服务的隔离内存缓存.
+
+[Redis](https://redis.io/)在此解决方案中用作分布式缓存. 该解决方案使用Microsoft的标准[Microsoft.Extensions.Caching.Redis](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Redis) 包进行集成. 使用和配置此程序包时,所有应用程序和服务都使用Redis缓存. 有关详细信息请参阅[Microsoft的文档](https://docs.microsoft.com/en-us/aspnet/core/performance/caching/distributed).
+
+该解决方案还使用[Microsoft.AspNetCore.DataProtection.StackExchangeRedis](https://www.nuget.org/packages/Microsoft.AspNetCore.DataProtection.StackExchangeRedis)包在Redis缓存上共享应用程序和服务之间的数据保护密钥.
+
+### Logging,Serilog,Elasticsearch和Kibana
+
+该解决方案使用[Serilog](https://serilog.net/)作为日志库. 它是一个广泛使用的库,有许多数据源集成,包括[Elasticsearch](https://www.elastic.co/products/elasticsearch).
+
+使用类似于下面给出的代码块在`Program.cs`文件中完成日志配置:
+
+````csharp
+Log.Logger = new LoggerConfiguration()
+    .MinimumLevel.Debug()
+    .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+    .Enrich.WithProperty("Application", "ProductService")
+    .Enrich.FromLogContext()
+    .WriteTo.File("Logs/logs.txt")
+    .WriteTo.Elasticsearch(
+        new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+        {
+            AutoRegisterTemplate = true,
+            AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+            IndexFormat = "msdemo-log-{0:yyyy.MM}"
+        })
+    .CreateLogger();
+````
+
+这会配置多个日志输出目标:File和Elasticsearch.对于此示例,`Application`属性设置为`ProductService`. 这是一种区分单个数据库中多个服务的日志的方法. 然后, 你可以通过`Application`名称查询日志.
+
+从`appsettings.json`配置文件中读取Elasticsearch URL:
+
+````json
+"ElasticSearch": {
+  "Url": "http://localhost:9200"
+}
+````
+
+如果你使用Kibana, 它是一个与Elasticsearch完美集成的可视化工具,可以看到有关你的日志的一些UI:
+
+![microservice-sample-kibana-2](../images/microservice-sample-kibana-2.png)
+
+*Figure - 一个仪表板,显示服务/应用程序的日志和错误计数.*
+
+![microservice-sample-kibana-1](../images/microservice-sample-kibana-1.png)
+
+*Figure - 日志条目列表*
+
+Kibana URL默认为`http://localhost:5601/`.
+
+### 审计日志
+
+ABP提供自动审计日志记录,详细保存每个请求(当前用户,浏览器/客户端,执行了哪些操作,哪些实体更改,甚至实体的哪些属性已更新). 有关详细信息,请参阅[审计日志文档](../Audit-Logging.md).
+
+所有服务和应用程序都配置为编写审核日志. 审核日志将保存到MsDemo_Identity SQL数据库中. 因此,您可以从单个点查询所有应用程序的所有审核日志.
 
-...
\ No newline at end of file
+审核日志记录具有`CorrelationId`属性,可用于跟踪请求. 当服务在单个Web请求中调用另一个服务时,它们都会使用相同的`CorrelationId`保存审核日志. 请参阅数据库中的`AbpAuditLogs`表.
\ No newline at end of file
diff --git a/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-I.md b/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-I.md
index 34acc3f01f..dfc17e431d 100644
--- a/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-I.md
+++ b/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-I.md
@@ -20,7 +20,7 @@
 
 下面的图片展示了从启动模板创建的项目是如何分层的.
 
-![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution.png)
+![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution-v2.png)
 
 ### 创建Book实体
 
@@ -93,7 +93,7 @@ public class BookStoreDbContext : AbpDbContext<BookStoreDbContext>
 
 这个启动模板使用了[EF Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/)来创建并维护数据库结构.打开 **Package Manager Console (PMC)** (工具/Nuget包管理器菜单),选择 `Acme.BookStore.EntityFrameworkCore`作为默认的项目然后执行下面的命令:
 
-![bookstore-pmc-add-book-migration](images/bookstore-pmc-add-book-migration.png)
+![bookstore-pmc-add-book-migration](images/bookstore-pmc-add-book-migration-v2.png)
 
 这样就会在`Migrations`文件夹中创建一个新的migration类.然后执行`Update-Database`命令更新数据库结构.
 
diff --git a/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-III.md b/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-III.md
index 6b31e9ba84..0514c8fc1a 100644
--- a/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-III.md
+++ b/docs/zh-Hans/Tutorials/AspNetCore-Mvc/Part-III.md
@@ -14,7 +14,6 @@
 
 本解决方案中有两个测试项目:
 
-![bookstore-test-projects](images/bookstore-test-projects.png)
 
 * `Acme.BookStore.Application.Tests` 项目用于单元测试和集成测试.你可以在这个项目中为Application Service方法写测试代码.这个项目使用了 **EF Core SQLite in-memory** 数据库.
 * `Acme.BookStore.Web.Tests` 项目用于包含Web层的完整集成测试.所以,你也可以在这里写关于UI页面的测试.
diff --git a/docs/zh-Hans/images/bookstore-visual-studio-solution-v2.png b/docs/zh-Hans/images/bookstore-visual-studio-solution-v2.png
new file mode 100644
index 0000000000..48b5881e96
Binary files /dev/null and b/docs/zh-Hans/images/bookstore-visual-studio-solution-v2.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-authserver-home.png b/docs/zh-Hans/images/microservice-sample-authserver-home.png
new file mode 100644
index 0000000000..7ae62ad6d5
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-authserver-home.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-authserver-login.png b/docs/zh-Hans/images/microservice-sample-authserver-login.png
new file mode 100644
index 0000000000..f6e8dfaa9f
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-authserver-login.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-backend-ui-permissions.png b/docs/zh-Hans/images/microservice-sample-backend-ui-permissions.png
new file mode 100644
index 0000000000..02769be3e5
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-backend-ui-permissions.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-backend-ui.png b/docs/zh-Hans/images/microservice-sample-backend-ui.png
new file mode 100644
index 0000000000..0935a6047a
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-backend-ui.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-blogservice-permission-in-database.png b/docs/zh-Hans/images/microservice-sample-blogservice-permission-in-database.png
new file mode 100644
index 0000000000..f99cd39893
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-blogservice-permission-in-database.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-diagram-2.png b/docs/zh-Hans/images/microservice-sample-diagram-2.png
new file mode 100644
index 0000000000..17aea07098
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-diagram-2.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-kibana-1.png b/docs/zh-Hans/images/microservice-sample-kibana-1.png
new file mode 100644
index 0000000000..f3a51bd349
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-kibana-1.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-kibana-2.png b/docs/zh-Hans/images/microservice-sample-kibana-2.png
new file mode 100644
index 0000000000..31b281486c
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-kibana-2.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-product-module-in-solution.png b/docs/zh-Hans/images/microservice-sample-product-module-in-solution.png
new file mode 100644
index 0000000000..27e841cdd5
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-product-module-in-solution.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-public-product-list.png b/docs/zh-Hans/images/microservice-sample-public-product-list.png
new file mode 100644
index 0000000000..cf8649bbe5
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-public-product-list.png differ
diff --git a/docs/zh-Hans/images/microservice-sample-solution.png b/docs/zh-Hans/images/microservice-sample-solution.png
new file mode 100644
index 0000000000..4c8344ed68
Binary files /dev/null and b/docs/zh-Hans/images/microservice-sample-solution.png differ
diff --git a/docs/zh-Hans/images/pcm-update-database-v2.png b/docs/zh-Hans/images/pcm-update-database-v2.png
new file mode 100644
index 0000000000..d5bb9c2975
Binary files /dev/null and b/docs/zh-Hans/images/pcm-update-database-v2.png differ
diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index 1615d66e14..6c6608315e 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -87,7 +87,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Data", "src\Volo.A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Data.Tests", "test\Volo.Abp.Data.Tests\Volo.Abp.Data.Tests.csproj", "{5D2275B7-0745-420A-AF1C-32C563DAB5C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Abstractions", "src\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj", "{10EB789E-C993-4BE8-BA43-C419936C7233}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj", "{10EB789E-C993-4BE8-BA43-C419936C7233}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectMapping", "src\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj", "{8D22063D-88DE-4F7A-A917-C81AB4ACE601}"
 EndProject
@@ -213,7 +213,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.Con
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Features", "src\Volo.Abp.Features\Volo.Abp.Features.csproj", "{01E3D389-8872-4EB1-9D3D-13B6ED54DE0E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Features.Tests", "test\Volo.Abp.Features.Tests\Volo.Abp.Features.Tests.csproj", "{575BEFA1-19C2-49B1-8D31-B5D4472328DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Features.Tests", "test\Volo.Abp.Features.Tests\Volo.Abp.Features.Tests.csproj", "{575BEFA1-19C2-49B1-8D31-B5D4472328DE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
index fc24bf2b13..6904fe07b1 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
index 7ba8766dd8..64219b14d2 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs
@@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     [DependsOn(
-        typeof(AbpMultiTenancyAbstractionsModule), 
+        typeof(AbpMultiTenancyModule), 
         typeof(AbpAspNetCoreModule)
         )]
     public class AbpAspNetCoreMultiTenancyModule : AbpModule
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
index 5b27a9d93c..3de810a203 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
@@ -5,6 +5,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public class CookieTenantResolveContributor : HttpTenantResolveContributorBase
     {
+        public const string ContributorName = "Cookie";
+
+        public override string Name => ContributorName;
+
         protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
         {
             return httpContext.Request?.Cookies[context.GetAspNetCoreMultiTenancyOptions().TenantKey];
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
index e342cb8f40..90cf3bfa81 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
@@ -9,23 +9,33 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
     public class DomainTenantResolveContributor : HttpTenantResolveContributorBase
     {
+        public const string ContributorName = "Domain";
+
+        public override string Name => ContributorName;
+
+        private static readonly string[] ProtocolPrefixes = { "http://", "https://" };
+
         private readonly string _domainFormat;
 
         public DomainTenantResolveContributor(string domainFormat)
         {
-            _domainFormat = domainFormat.RemovePreFix("http://", "https://");
+            _domainFormat = domainFormat.RemovePreFix(ProtocolPrefixes);
         }
 
-        protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
+        protected override string GetTenantIdOrNameFromHttpContextOrNull(
+            ITenantResolveContext context, 
+            HttpContext httpContext)
         {
             if (httpContext.Request?.Host == null)
             {
                 return null;
             }
 
-            var hostName = httpContext.Request.Host.Host.RemovePreFix("http://", "https://");
+            var hostName = httpContext.Request.Host.Host.RemovePreFix(ProtocolPrefixes);
             var extractResult = FormattedStringValueExtracter.Extract(hostName, _domainFormat, ignoreCase: true);
 
+            context.Handled = true;
+
             if (!extractResult.IsMatch)
             {
                 return null;
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
index 3f5e93bd36..0e93d8f8d0 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
@@ -9,6 +9,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public class HeaderTenantResolveContributor : HttpTenantResolveContributorBase
     {
+        public const string ContributorName = "Header";
+
+        public override string Name => ContributorName;
+
         protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
         {
             if (httpContext.Request == null || httpContext.Request.Headers.IsNullOrEmpty())
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs
new file mode 100644
index 0000000000..4865489248
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs
@@ -0,0 +1,40 @@
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Http;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class HttpContextTenantResolveResultAccessor : ITenantResolveResultAccessor, ITransientDependency
+    {
+        [CanBeNull]
+        public TenantResolveResult Result
+        {
+            get
+            {
+                if (_httpContextAccessor.HttpContext == null)
+                {
+                    return null;
+                }
+
+                return _httpContextAccessor.HttpContext.Items[""] as TenantResolveResult;
+            }
+            set
+            {
+                if (_httpContextAccessor.HttpContext == null)
+                {
+                    return;
+                }
+
+                _httpContextAccessor.HttpContext.Items[""] = value;
+            }
+        }
+
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public HttpContextTenantResolveResultAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs
index d2971063a5..a5cfbffeb7 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs
@@ -7,9 +7,9 @@ using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
-    public abstract class HttpTenantResolveContributorBase : ITenantResolveContributor
+    public abstract class HttpTenantResolveContributorBase : TenantResolveContributorBase
     {
-        public virtual void Resolve(ITenantResolveContext context)
+        public override void Resolve(ITenantResolveContext context)
         {
             var httpContext = context.GetHttpContext();
             if (httpContext == null)
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs
new file mode 100644
index 0000000000..90201dcf2d
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public interface ITenantResolveResultAccessor
+    {
+        TenantResolveResult Result { get; set; }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
index bf27cc92e6..417b0d30b3 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 using Volo.Abp.MultiTenancy;
 
@@ -12,46 +11,48 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         private readonly ITenantResolver _tenantResolver;
         private readonly ITenantStore _tenantStore;
-        private readonly ICurrentTenantIdAccessor _currentTenantIdAccessor;
+        private readonly ICurrentTenant _currentTenant;
+        private readonly ITenantResolveResultAccessor _tenantResolveResultAccessor;
 
         public MultiTenancyMiddleware(
             RequestDelegate next,
             ITenantResolver tenantResolver, 
             ITenantStore tenantStore, 
-            ICurrentTenantIdAccessor currentTenantIdAccessor)
+            ICurrentTenant currentTenant, 
+            ITenantResolveResultAccessor tenantResolveResultAccessor)
         {
             _next = next;
             _tenantResolver = tenantResolver;
             _tenantStore = tenantStore;
-            _currentTenantIdAccessor = currentTenantIdAccessor;
+            _currentTenant = currentTenant;
+            _tenantResolveResultAccessor = tenantResolveResultAccessor;
         }
 
         public async Task Invoke(HttpContext httpContext)
         {
-            using (SetCurrentTenant(await ResolveCurrentTenantAsync()))
-            {
-                await _next(httpContext);
-            }
-        }
+            var resolveResult = _tenantResolver.ResolveTenantIdOrName();
+            _tenantResolveResultAccessor.Result = resolveResult;
 
-        private async Task<TenantInfo> ResolveCurrentTenantAsync()
-        {
-            var tenantIdOrName = _tenantResolver.ResolveTenantIdOrName();
-            if (tenantIdOrName == null)
+            TenantConfiguration tenant = null;
+            if (resolveResult.TenantIdOrName != null)
             {
-                return null;
+                tenant = await FindTenantAsync(resolveResult.TenantIdOrName);
+                if (tenant == null)
+                {
+                    //TODO: A better exception?
+                    throw new AbpException(
+                        "There is no tenant with given tenant id or name: " + resolveResult.TenantIdOrName
+                    );
+                }
             }
 
-            var tenant = await FindTenantAsync(tenantIdOrName);
-            if (tenant == null)
+            using (_currentTenant.Change(tenant?.Id, tenant?.Name))
             {
-                throw new AbpException("There is no tenant with given tenant id or name: " + tenantIdOrName);
+                await _next(httpContext);
             }
-
-            return tenant;
         }
 
-        private async Task<TenantInfo> FindTenantAsync(string tenantIdOrName)
+        private async Task<TenantConfiguration> FindTenantAsync(string tenantIdOrName)
         {
             if (Guid.TryParse(tenantIdOrName, out var parsedTenantId))
             {
@@ -62,15 +63,5 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
                 return await _tenantStore.FindAsync(tenantIdOrName);
             }
         }
-
-        private IDisposable SetCurrentTenant([CanBeNull] TenantInfo tenant)
-        {
-            var parentScope = _currentTenantIdAccessor.Current;
-            _currentTenantIdAccessor.Current = new TenantIdWrapper(tenant?.Id);
-            return new DisposeAction(() =>
-            {
-                _currentTenantIdAccessor.Current = parentScope;
-            });
-        }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
index 9899e2613e..3dcb4c5140 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
@@ -5,6 +5,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public class QueryStringTenantResolveContributor : HttpTenantResolveContributorBase
     {
+        public const string ContributorName = "QueryString";
+
+        public override string Name => ContributorName;
+
         protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
         {
             if (httpContext.Request == null || !httpContext.Request.QueryString.HasValue)
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
index 3be155c68d..4d073db9f8 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
@@ -7,6 +7,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public class RouteTenantResolveContributor : HttpTenantResolveContributorBase
     {
+        public const string ContributorName = "Route";
+
+        public override string Name => ContributorName;
+
         protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext)
         {
             var tenantId = httpContext.GetRouteValue(context.GetAspNetCoreMultiTenancyOptions().TenantKey);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
index 57a01a3740..6b9e348f1d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/tenant-switch.js
@@ -3,7 +3,7 @@
     var tenantSwitchModal = new abp.ModalManager(abp.appPath + 'Abp/MultiTenancy/TenantSwitchModal');
 
     $(function() {
-        $('#TenantSwitchToolbarLink').click(function(e) {
+        $('#AbpTenantSwitchLink').click(function(e) {
             e.preventDefault();
             tenantSwitchModal.open();
         });
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
index f8bbf69c9a..d0015b0e57 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
@@ -18,11 +18,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
-    <EmbeddedResource Include="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Components\**\*.cshtml" />
     <EmbeddedResource Include="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Localization\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
-    <Content Remove="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Components\**\*.cshtml" />
     <Content Remove="Volo\Abp\AspNetCore\Mvc\UI\MultiTenancy\Localization\*.json" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs
index 13b58dd32d..484bd657d9 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs
@@ -1,11 +1,9 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -36,11 +34,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy
                 options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiMultiTenancyModule>();
             });
 
-            Configure<ToolbarOptions>(options =>
-            {
-                options.Contributors.Add(new MultiTenancyToolbarContributor());
-            });
-
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml
deleted file mode 100644
index 515d4cc7dc..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml
+++ /dev/null
@@ -1,17 +0,0 @@
-@using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Components.TenantSwitch
-@model TenantSwitchViewComponent.TenantSwitchViewModel
-@if (!Model.CurrentUser.IsAuthenticated)
-{
-    <li class="nav-item">
-        <a abp-button="Link" id="TenantSwitchToolbarLink" href="#">
-            @if (Model.Tenant == null)
-            {
-                <text>@@host</text>
-            }
-            else
-            {
-                <text>@@@Model.Tenant.Name</text>
-            }
-        </a>
-    </li>
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/TenantSwitchViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/TenantSwitchViewComponent.cs
deleted file mode 100644
index bfcaebed0e..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/TenantSwitchViewComponent.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Users;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Components.TenantSwitch
-{
-    public class TenantSwitchViewComponent : AbpViewComponent
-    {
-        /// <summary>
-        /// -1,000,000
-        /// </summary>
-        public const int Order = -1_000_000;
-
-        protected ITenantStore TenantStore { get; }
-        protected ICurrentTenant CurrentTenant { get; }
-        protected ICurrentUser CurrentUser { get; }
-
-        public TenantSwitchViewComponent(
-            ITenantStore tenantStore, 
-            ICurrentTenant currentTenant,
-            ICurrentUser currentUser)
-        {
-            TenantStore = tenantStore;
-            CurrentTenant = currentTenant;
-            CurrentUser = currentUser;
-        }
-
-        public async Task<IViewComponentResult> InvokeAsync()
-        {
-            var model = new TenantSwitchViewModel
-            {
-                CurrentUser = CurrentUser
-            };
-
-            if (CurrentTenant.Id.HasValue)
-            {
-                model.Tenant = await TenantStore.FindAsync(CurrentTenant.GetId());
-            }
-
-            return View("~/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml", model);
-        }
-
-        public class TenantSwitchViewModel
-        {
-            public TenantInfo Tenant { get; set; }
-
-            public ICurrentUser CurrentUser { get; set; }
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml
deleted file mode 100644
index 225780c2c2..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en.json
index 2f19b5eb1f..75c001dc88 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en.json
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en.json
@@ -1,9 +1,11 @@
-{
+{
   "culture": "en",
   "texts": {
     "GivenTenantIsNotAvailable": "Given tenant is not available: {0}",
-    "SwitchTenant": "Switch tenant",
+    "Tenant": "Tenant",
+    "Switch": "switch",
     "Name": "Name",
-    "SwitchTenantHint": "Leave the name field blank to switch to the host side."
+    "SwitchTenantHint": "Leave the name field blank to switch to the host side.",
+    "NotSelected": "Not selected"
   }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/tr.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/tr.json
index 5bbd020497..150af9a825 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/tr.json
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/tr.json
@@ -2,8 +2,10 @@
   "culture": "tr",
   "texts": {
     "GivenTenantIsNotAvailable": "İstenilen müşteri bulunamadı: {0}",
-    "SwitchTenant": "Müşteri değiştir",
+    "Tenant": "Müşteri",
+    "Switch": "değiştir",
     "Name": "İsim",
-    "SwitchTenantHint": "Host tarafına geçmek için isim alanını boş bırakın."
+    "SwitchTenantHint": "Host tarafına geçmek için isim alanını boş bırakın.",
+    "NotSelected": "Seçili değil"
   }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/MultiTenancyToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/MultiTenancyToolbarContributor.cs
deleted file mode 100644
index d6a6f54b61..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/MultiTenancyToolbarContributor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Components.TenantSwitch;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy
-{
-    public class MultiTenancyToolbarContributor : IToolbarContributor
-    {
-        public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
-        {
-            if (context.Toolbar.Name != StandardToolbars.Main)
-            {
-                return Task.CompletedTask;
-            }
-
-            context.Toolbar.Items.Add(new ToolbarItem(typeof(TenantSwitchViewComponent), TenantSwitchViewComponent.Order));
-
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj b/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj
index 485b352227..cca8e99545 100644
--- a/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj
+++ b/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
     <ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
     <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
     <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
index ed048f3d6a..b49d072b0e 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.Auditing
         typeof(AbpTimingModule),
         typeof(AbpSecurityModule),
         typeof(AbpThreadingModule),
-        typeof(AbpMultiTenancyAbstractionsModule)
+        typeof(AbpMultiTenancyModule)
         )]
     public class AbpAuditingModule : AbpModule
     {
diff --git a/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj b/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj
index 18c69fe03a..e9a5acd990 100644
--- a/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj
+++ b/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.Serialization\Volo.Abp.Serialization.csproj" />
     <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
   </ItemGroup>
diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs
index a3efc1355f..3a1537cba7 100644
--- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs
+++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.Caching
 {
     [DependsOn(typeof(AbpThreadingModule))]
     [DependsOn(typeof(AbpSerializationModule))]
-    [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))]
+    [DependsOn(typeof(AbpMultiTenancyModule))]
     public class AbpCachingModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs
index c7fa93a664..428d9d6313 100644
--- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs
@@ -1,10 +1,17 @@
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Data
 {
     public class AbpDataModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            AutoAddDataSeedContributors(context.Services);
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
@@ -13,5 +20,23 @@ namespace Volo.Abp.Data
 
             context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>));
         }
+
+        private static void AutoAddDataSeedContributors(IServiceCollection services)
+        {
+            var contributors = new List<Type>();
+
+            services.OnRegistred(context =>
+            {
+                if (typeof(IDataSeedContributor).IsAssignableFrom(context.ImplementationType))
+                {
+                    contributors.Add(context.ImplementationType);
+                }
+            });
+
+            services.Configure<DataSeedOptions>(options =>
+            {
+                options.Contributors.AddIfNotContains(contributors);
+            });
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs
index d4627d2683..73741dcfcb 100644
--- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs
@@ -8,6 +8,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Data
 {
+    //TODO: Create a Volo.Abp.Data.Filtering namespace?
     public class DataFilter : IDataFilter, ISingletonDependency
     {
         private readonly ConcurrentDictionary<Type, object> _filters;
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContext.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContext.cs
new file mode 100644
index 0000000000..6cda2f6e39
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContext.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Data
+{
+    public class DataSeedContext
+    {
+        public Guid? TenantId { get; set; }
+
+        /// <summary>
+        /// Gets/sets a key-value on the <see cref="Properties"/>.
+        /// </summary>
+        /// <param name="name">Name of the property</param>
+        /// <returns>
+        /// Returns the value in the <see cref="Properties"/> dictionary by given <see cref="name"/>.
+        /// Returns null if given <see cref="name"/> is not present in the <see cref="Properties"/> dictionary.
+        /// </returns>
+        [CanBeNull]
+        public object this[string name]
+        {
+            get => Properties.GetOrDefault(name);
+            set => Properties[name] = value;
+        }
+
+        /// <summary>
+        /// Can be used to get/set custom properties.
+        /// </summary>
+        [NotNull]
+        public Dictionary<string, object> Properties { get; }
+
+        public DataSeedContext(Guid? tenantId = null)
+        {
+            TenantId = tenantId;
+            Properties = new Dictionary<string, object>();
+        }
+
+        /// <summary>
+        /// Sets a property in the <see cref="Properties"/> dictionary.
+        /// This is a shortcut for nested calls on this object.
+        /// </summary>
+        public virtual DataSeedContext WithProperty(string key, object value)
+        {
+            Properties[key] = value;
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContributorList.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContributorList.cs
new file mode 100644
index 0000000000..2d16c3c093
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedContributorList.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.Collections;
+
+namespace Volo.Abp.Data
+{
+    public class DataSeedContributorList : TypeList<IDataSeedContributor>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs
new file mode 100644
index 0000000000..940f68175d
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs
@@ -0,0 +1,12 @@
+namespace Volo.Abp.Data
+{
+    public class DataSeedOptions
+    {
+        public DataSeedContributorList Contributors { get; }
+
+        public DataSeedOptions()
+        {
+            Contributors = new DataSeedContributorList();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs
new file mode 100644
index 0000000000..e55f6c633b
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs
@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Data
+{
+    //TODO: Create a Volo.Abp.Data.Seeding namespace?
+    public class DataSeeder : IDataSeeder, ITransientDependency
+    {
+        protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+        protected DataSeedOptions Options { get; }
+
+        public DataSeeder(
+            IOptions<DataSeedOptions> options,
+            IHybridServiceScopeFactory serviceScopeFactory)
+        {
+            ServiceScopeFactory = serviceScopeFactory;
+            Options = options.Value;
+        }
+
+        public async Task SeedAsync(DataSeedContext context)
+        {
+            using (var scope = ServiceScopeFactory.CreateScope())
+            {
+                foreach (var contributorType in Options.Contributors)
+                {
+                    var contributor = (IDataSeedContributor) scope
+                        .ServiceProvider
+                        .GetRequiredService(contributorType);
+
+                    await contributor.SeedAsync(context);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs
new file mode 100644
index 0000000000..8208d02d2c
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Data
+{
+    public static class DataSeederExtensions
+    {
+        public static Task SeedAsync(this IDataSeeder seeder, Guid? tenantId = null)
+        {
+            return seeder.SeedAsync(new DataSeedContext(tenantId));
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeedContributor.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeedContributor.cs
new file mode 100644
index 0000000000..c1205bf6ed
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeedContributor.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Data
+{
+    public interface IDataSeedContributor
+    {
+        Task SeedAsync(DataSeedContext context);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeeder.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeeder.cs
new file mode 100644
index 0000000000..95ad1b7e8d
--- /dev/null
+++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/IDataSeeder.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Data
+{
+    public interface IDataSeeder
+    {
+        Task SeedAsync(DataSeedContext context);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj b/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj
index 85c016fc25..cc1cb1494f 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
     <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
     <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs
index fe4afd6e50..19b857553f 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.Domain
         typeof(AbpDataModule),
         typeof(AbpEventBusModule),
         typeof(AbpGuidsModule),
-        typeof(AbpMultiTenancyAbstractionsModule),
+        typeof(AbpMultiTenancyModule),
         typeof(AbpThreadingModule),
         typeof(AbpTimingModule),
         typeof(AbpUnitOfWorkModule),
diff --git a/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj b/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
index fc59bfaa9f..269f447fdf 100644
--- a/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
+++ b/framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
index fed872890c..e66dd03010 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Features
 {
     [DependsOn(
         typeof(AbpLocalizationAbstractionsModule),
-        typeof(AbpMultiTenancyAbstractionsModule),
+        typeof(AbpMultiTenancyModule),
         typeof(AbpValidationModule)
         )]
     public class AbpFeaturesModule : AbpModule
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs
deleted file mode 100644
index 5d33034993..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.Modularity;
-using Volo.Abp.Security;
-
-namespace Volo.Abp.MultiTenancy
-{
-    [DependsOn(
-        typeof(AbpDataModule),
-        typeof(AbpSecurityModule)
-        )]
-    public class AbpMultiTenancyAbstractionsModule : AbpModule //TODO: Rename to AbpMultiTenancyModule?
-    {
-
-    }
-}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantIdAccessor.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantIdAccessor.cs
deleted file mode 100644
index be2175df9a..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantIdAccessor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Threading;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.MultiTenancy
-{
-    public class AsyncLocalCurrentTenantIdAccessor : ICurrentTenantIdAccessor, ISingletonDependency
-    {
-        public TenantIdWrapper Current
-        {
-            get => _currentScope.Value;
-            set => _currentScope.Value = value;
-        }
-
-        private readonly AsyncLocal<TenantIdWrapper> _currentScope;
-
-        public AsyncLocalCurrentTenantIdAccessor()
-        {
-            _currentScope = new AsyncLocal<TenantIdWrapper>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
deleted file mode 100644
index fe1bb03534..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.MultiTenancy.ConfigurationStore
-{
-    //TODO: Move to another package.
-    [Dependency(TryRegister = true)]
-    public class ConfigurationTenantStore : ITenantStore, ITransientDependency
-    {
-        private readonly ConfigurationTenantStoreOptions _options;
-
-        public ConfigurationTenantStore(IOptionsSnapshot<ConfigurationTenantStoreOptions> options)
-        {
-            _options = options.Value;
-        }
-
-        public Task<TenantInfo> FindAsync(string name)
-        {
-            return Task.FromResult(_options.Tenants.FirstOrDefault(t => t.Name == name));
-        }
-
-        public Task<TenantInfo> FindAsync(Guid id)
-        {
-            return Task.FromResult(_options.Tenants.FirstOrDefault(t => t.Id == id));
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs
deleted file mode 100644
index 2d5a060d51..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStoreOptions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Volo.Abp.MultiTenancy.ConfigurationStore
-{
-    public class ConfigurationTenantStoreOptions
-    {
-        public TenantInfo[] Tenants { get; set; }
-
-        public ConfigurationTenantStoreOptions()
-        {
-            Tenants = new TenantInfo[0];
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs
deleted file mode 100644
index 9aee172ba9..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.MultiTenancy
-{
-    public class CurrentTenant : ICurrentTenant, ITransientDependency
-    {
-        public virtual bool IsAvailable => Id.HasValue;
-
-        public virtual Guid? Id => _currentTenantIdAccessor.Current?.TenantId;
-
-        private readonly ICurrentTenantIdAccessor _currentTenantIdAccessor;
-
-        public CurrentTenant(ICurrentTenantIdAccessor currentTenantIdAccessor)
-        {
-            _currentTenantIdAccessor = currentTenantIdAccessor;
-        }
-
-        public IDisposable Change(Guid? id)
-        {
-            return SetCurrent(id);
-        }
-
-        private IDisposable SetCurrent(Guid? tenantId)
-        {
-            var parentScope = _currentTenantIdAccessor.Current;
-            _currentTenantIdAccessor.Current = new TenantIdWrapper(tenantId);
-            return new DisposeAction(() =>
-            {
-                _currentTenantIdAccessor.Current = parentScope;
-            });
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantIdAccessor.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantIdAccessor.cs
deleted file mode 100644
index 49be15cd10..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantIdAccessor.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Volo.Abp.MultiTenancy
-{
-    /* Uses TenantScopeTenantInfoWrapper instead of TenantInfo because being null of Current is different that being null of Current.Tenant.
-    * A null Current indicates that we haven't set it explicitly.
-    * A null Current.Tenant indicates that we have set null tenant value explicitly.
-    * A non-null Current.Tenant indicates that we have set a tenant value explicitly.
-    */
-
-    public interface ICurrentTenantIdAccessor
-    {
-        TenantIdWrapper Current { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantIdWrapper.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantIdWrapper.cs
deleted file mode 100644
index 92f8c641d2..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantIdWrapper.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Volo.Abp.MultiTenancy
-{
-    public class TenantIdWrapper
-    {
-        /// <summary>
-        /// Null indicates the host.
-        /// Not null value for a tenant.
-        /// </summary>
-        public Guid? TenantId { get; }
-        
-        public TenantIdWrapper(Guid? tenantId)
-        {
-            TenantId = tenantId;
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj b/framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj
similarity index 85%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
rename to framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj
index 18660be71e..b67e76c459 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj
@@ -4,8 +4,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Volo.Abp.MultiTenancy.Abstractions</AssemblyName>
-    <PackageId>Volo.Abp.MultiTenancy.Abstractions</PackageId>
+    <AssemblyName>Volo.Abp.MultiTenancy</AssemblyName>
+    <PackageId>Volo.Abp.MultiTenancy</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
new file mode 100644
index 0000000000..a9b4c7b488
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
@@ -0,0 +1,21 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Data;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy.ConfigurationStore;
+using Volo.Abp.Security;
+
+namespace Volo.Abp.MultiTenancy
+{
+    [DependsOn(
+        typeof(AbpDataModule),
+        typeof(AbpSecurityModule)
+        )]
+    public class AbpMultiTenancyModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var configuration = context.Services.GetConfiguration();
+            Configure<DefaultTenantStoreOptions>(configuration);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs
similarity index 63%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs
index ac2cdeee5a..c73075107e 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs
@@ -3,8 +3,12 @@ using JetBrains.Annotations;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class ActionTenantResolveContributor : ITenantResolveContributor
+    public class ActionTenantResolveContributor : TenantResolveContributorBase
     {
+        public const string ContributorName = "Action";
+
+        public override string Name => ContributorName;
+
         private readonly Action<ITenantResolveContext> _resolveAction;
 
         public ActionTenantResolveContributor([NotNull] Action<ITenantResolveContext> resolveAction)
@@ -14,7 +18,7 @@ namespace Volo.Abp.MultiTenancy
             _resolveAction = resolveAction;
         }
 
-        public void Resolve(ITenantResolveContext context)
+        public override void Resolve(ITenantResolveContext context)
         {
             _resolveAction(context);
         }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs
new file mode 100644
index 0000000000..32f7fc0782
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class AsyncLocalCurrentTenantAccessor : ICurrentTenantAccessor, ISingletonDependency
+    {
+        public BasicTenantInfo Current
+        {
+            get => _currentScope.Value;
+            set => _currentScope.Value = value;
+        }
+
+        private readonly AsyncLocal<BasicTenantInfo> _currentScope;
+
+        public AsyncLocalCurrentTenantAccessor()
+        {
+            _currentScope = new AsyncLocal<BasicTenantInfo>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/BasicTenantInfo.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/BasicTenantInfo.cs
new file mode 100644
index 0000000000..96c60613de
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/BasicTenantInfo.cs
@@ -0,0 +1,27 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class BasicTenantInfo
+    {
+        /// <summary>
+        /// Null indicates the host.
+        /// Not null value for a tenant.
+        /// </summary>
+        [CanBeNull]
+        public Guid? TenantId { get; }
+
+        /// <summary>
+        /// Name of the tenant if <see cref="TenantId"/> is not null.
+        /// </summary>
+        [CanBeNull]
+        public string Name { get; }
+
+        public BasicTenantInfo(Guid? tenantId, string name = null)
+        {
+            TenantId = tenantId;
+            Name = name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
new file mode 100644
index 0000000000..3e6ea4167a
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MultiTenancy.ConfigurationStore
+{
+    [Dependency(TryRegister = true)]
+    public class DefaultTenantStore : ITenantStore, ITransientDependency
+    {
+        private readonly DefaultTenantStoreOptions _options;
+
+        public DefaultTenantStore(IOptionsSnapshot<DefaultTenantStoreOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        public Task<TenantConfiguration> FindAsync(string name)
+        {
+            return Task.FromResult(_options.Tenants?.FirstOrDefault(t => t.Name == name));
+        }
+
+        public Task<TenantConfiguration> FindAsync(Guid id)
+        {
+            return Task.FromResult(_options.Tenants?.FirstOrDefault(t => t.Id == id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs
new file mode 100644
index 0000000000..ee775cce98
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs
@@ -0,0 +1,12 @@
+namespace Volo.Abp.MultiTenancy.ConfigurationStore
+{
+    public class DefaultTenantStoreOptions
+    {
+        public TenantConfiguration[] Tenants { get; set; }
+
+        public DefaultTenantStoreOptions()
+        {
+            Tenants = new TenantConfiguration[0];
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
similarity index 55%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
index 4a2709129a..0f213ea1d7 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
@@ -4,9 +4,13 @@ using Volo.Abp.Security.Claims;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class CurrentClaimsPrincipalTenantResolveContributor : ITenantResolveContributor
+    public class CurrentClaimsPrincipalTenantResolveContributor : TenantResolveContributorBase
     {
-        public void Resolve(ITenantResolveContext context)
+        public const string ContributorName = "CurrentClaims";
+
+        public override string Name => ContributorName;
+
+        public override void Resolve(ITenantResolveContext context)
         {
             var principal = context.ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>().Principal;
             if (principal?.Identity?.IsAuthenticated != true)
@@ -14,8 +18,11 @@ namespace Volo.Abp.MultiTenancy
                 return;
             }
 
-            context.TenantIdOrName = principal.Claims.FirstOrDefault(c => c.Type == AbpClaimTypes.TenantId)?.Value;
             context.Handled = true;
+            context.TenantIdOrName = principal
+                .Claims
+                .FirstOrDefault(c => c.Type == AbpClaimTypes.TenantId)
+                ?.Value;
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs
new file mode 100644
index 0000000000..4cd6ae9527
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs
@@ -0,0 +1,36 @@
+using System;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class CurrentTenant : ICurrentTenant, ITransientDependency
+    {
+        public virtual bool IsAvailable => Id.HasValue;
+
+        public virtual Guid? Id => _currentTenantAccessor.Current?.TenantId;
+
+        public string Name => _currentTenantAccessor.Current?.Name;
+
+        private readonly ICurrentTenantAccessor _currentTenantAccessor;
+
+        public CurrentTenant(ICurrentTenantAccessor currentTenantAccessor)
+        {
+            _currentTenantAccessor = currentTenantAccessor;
+        }
+
+        public IDisposable Change(Guid? id, string name = null)
+        {
+            return SetCurrent(id, name);
+        }
+
+        private IDisposable SetCurrent(Guid? tenantId, string name = null)
+        {
+            var parentScope = _currentTenantAccessor.Current;
+            _currentTenantAccessor.Current = new BasicTenantInfo(tenantId, name);
+            return new DisposeAction(() =>
+            {
+                _currentTenantAccessor.Current = parentScope;
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenantExtensions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenantExtensions.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenantExtensions.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenantExtensions.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs
similarity index 66%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs
index 15eb581a40..a9c608e74c 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs
@@ -10,6 +10,9 @@ namespace Volo.Abp.MultiTenancy
         [CanBeNull]
         Guid? Id { get; }
 
-        IDisposable Change(Guid? id);
+        [CanBeNull]
+        string Name { get; }
+
+        IDisposable Change(Guid? id, string name = null);
     }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs
new file mode 100644
index 0000000000..76b9b8f0db
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs
@@ -0,0 +1,12 @@
+namespace Volo.Abp.MultiTenancy
+{
+    /* A null Current indicates that we haven't set it explicitly.
+     * A null Current.TenantId indicates that we have set null tenant id value explicitly.
+     * A non-null Current.TenantId indicates that we have set a tenant id value explicitly.
+     */
+
+    public interface ICurrentTenantAccessor
+    {
+        BasicTenantInfo Current { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IMultiTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IMultiTenant.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IMultiTenant.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IMultiTenant.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs
similarity index 82%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs
index bff87d35ab..a79cccfe66 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs
@@ -2,6 +2,8 @@ namespace Volo.Abp.MultiTenancy
 {
     public interface ITenantResolveContributor
     {
+        string Name { get; }
+
         void Resolve(ITenantResolveContext context);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolver.cs
similarity index 84%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolver.cs
index 35efdd14b0..b9ce83b0b9 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolver.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.MultiTenancy
         /// <returns>
         /// Tenant id, unique name or null (if could not resolve).
         /// </returns>
-        [CanBeNull]
-        string ResolveTenantIdOrName();
+        [NotNull]
+        TenantResolveResult ResolveTenantIdOrName();
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
similarity index 53%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
index 7c45adde4c..b1c8f97f1a 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
@@ -5,8 +5,8 @@ namespace Volo.Abp.MultiTenancy
 {
     public interface ITenantStore
     {
-        Task<TenantInfo> FindAsync(string name);
+        Task<TenantConfiguration> FindAsync(string name);
 
-        Task<TenantInfo> FindAsync(Guid id);
+        Task<TenantConfiguration> FindAsync(Guid id);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IgnoreMultiTenancy.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IgnoreMultiTenancy.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/IgnoreMultiTenancy.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IgnoreMultiTenancy.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyDatabaseStyle.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyDatabaseStyle.cs
new file mode 100644
index 0000000000..97045e0201
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyDatabaseStyle.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Volo.Abp.MultiTenancy
+{
+    [Flags]
+    public enum MultiTenancyDatabaseStyle
+    {
+        Shared = 1,
+        PerTenant = 2,
+        Hybrid = Shared | PerTenant
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs
new file mode 100644
index 0000000000..2ac3e6a2fa
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs
@@ -0,0 +1,17 @@
+namespace Volo.Abp.MultiTenancy
+{
+    public class MultiTenancyOptions
+    {
+        /// <summary>
+        /// A central point to enable/disable multi-tenancy.
+        /// Default: false. 
+        /// </summary>
+        public bool IsEnabled { get; set; }
+
+        /// <summary>
+        /// Database style for tenants.
+        /// Default: <see cref="MultiTenancyDatabaseStyle.Hybrid"/>.
+        /// </summary>
+        public MultiTenancyDatabaseStyle DatabaseStyle { get; set; } = MultiTenancyDatabaseStyle.Hybrid;
+    }
+}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfiguration.cs
similarity index 60%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfiguration.cs
index e91c42a1fd..37ad3c74da 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantInfo.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfiguration.cs
@@ -5,20 +5,20 @@ using Volo.Abp.Data;
 namespace Volo.Abp.MultiTenancy
 {
     [Serializable]
-    public class TenantInfo //TODO: Add a custom data to TenantInfo and make it available in ICurrentTenant
+    public class TenantConfiguration
     {
-        public Guid Id { get; }
+        public Guid Id { get; set; }
 
-        public string Name { get; }
+        public string Name { get; set; }
 
         public ConnectionStrings ConnectionStrings { get; }
 
-        private TenantInfo()
+        public TenantConfiguration()
         {
             
         }
 
-        public TenantInfo(Guid id, [NotNull] string name)
+        public TenantConfiguration(Guid id, [NotNull] string name)
         {
             Check.NotNull(name, nameof(name));
 
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveContext.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveContext.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveContributorBase.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveContributorBase.cs
new file mode 100644
index 0000000000..8fcc22059d
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveContributorBase.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.MultiTenancy
+{
+    public abstract class TenantResolveContributorBase : ITenantResolveContributor
+    {
+        public abstract string Name { get; }
+
+        //TODO: We can make this async
+        public abstract void Resolve(ITenantResolveContext context);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveResult.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveResult.cs
new file mode 100644
index 0000000000..6b6c417508
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveResult.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class TenantResolveResult
+    {
+        public string TenantIdOrName { get; set; }
+
+        public List<string> AppliedResolvers { get; }
+
+        public TenantResolveResult()
+        {
+            AppliedResolvers = new List<string>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
similarity index 75%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolver.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
index f47cecd270..cefaf41329 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolver.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
@@ -17,12 +18,9 @@ namespace Volo.Abp.MultiTenancy
             _options = options.Value;
         }
 
-        public string ResolveTenantIdOrName()
+        public TenantResolveResult ResolveTenantIdOrName()
         {
-            if (!_options.TenantResolvers.Any())
-            {
-                return null;
-            }
+            var result = new TenantResolveResult();
 
             using (var serviceScope = _serviceProvider.CreateScope())
             {
@@ -32,15 +30,17 @@ namespace Volo.Abp.MultiTenancy
                 {
                     tenantResolver.Resolve(context);
 
+                    result.AppliedResolvers.Add(tenantResolver.Name);
+
                     if (context.HasResolvedTenantOrHost())
                     {
-                        return context.TenantIdOrName;
+                        result.TenantIdOrName = context.TenantIdOrName;
+                        break;
                     }
                 }
-
-                //Could not find a tenant
-                return null;
             }
+
+            return result;
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolverConsts.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolverConsts.cs
similarity index 100%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolverConsts.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolverConsts.cs
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs
similarity index 68%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs
index 6ac6c0517b..290c683d95 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantStoreExtensions.cs
@@ -7,13 +7,13 @@ namespace Volo.Abp.MultiTenancy
     public static class TenantStoreExtensions
     {
         [CanBeNull]
-        public static TenantInfo Find(this ITenantStore tenantStore, string name)
+        public static TenantConfiguration Find(this ITenantStore tenantStore, string name)
         {
             return AsyncHelper.RunSync(() => tenantStore.FindAsync(name));
         }
 
         [CanBeNull]
-        public static TenantInfo Find(this ITenantStore tenantStore, Guid id)
+        public static TenantConfiguration Find(this ITenantStore tenantStore, Guid id)
         {
             return AsyncHelper.RunSync(() => tenantStore.FindAsync(id));
         }
diff --git a/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj b/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
index b7e3530ba0..15a41c3672 100644
--- a/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
+++ b/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
index 1951ab61b5..5f7f6ce7f5 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.Settings
     [DependsOn(
         typeof(AbpLocalizationAbstractionsModule),
         typeof(AbpSecurityModule),
-        typeof(AbpMultiTenancyAbstractionsModule)
+        typeof(AbpMultiTenancyModule)
         )]
     public class AbpSettingsModule : AbpModule
     {
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeBase.cs b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeBase.cs
index c6fd80fc13..db7e2e5861 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeBase.cs
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeBase.cs
@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Volo.Abp.Validation.StringValues
 {
+    [Serializable]
     public abstract class StringValueTypeBase : IStringValueType
     {
         public virtual string Name => ValueValidatorAttribute.GetName(GetType());
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs
index 76556eda78..93543c3025 100644
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs
@@ -18,9 +18,9 @@ namespace Volo.Abp.AspNetCore.App
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<MultiTenancyOptions>(options =>
             {
-                options.AddDomainTenantResolver("{0}.abp.io");
+                options.IsEnabled = true;
             });
         }
 
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
new file mode 100644
index 0000000000..c107444ba1
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Shouldly;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.MultiTenancy.ConfigurationStore;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class AspNetCoreMultiTenancy_WithDomainResolver_Tests : AspNetCoreMultiTenancyTestBase
+    {
+        private readonly Guid _testTenantId = Guid.NewGuid();
+        private readonly string _testTenantName = "acme";
+
+        private readonly AspNetCoreMultiTenancyOptions _options;
+
+        public AspNetCoreMultiTenancy_WithDomainResolver_Tests()
+        {
+            _options = ServiceProvider.GetRequiredService<IOptions<AspNetCoreMultiTenancyOptions>>().Value;
+        }
+
+        protected override IWebHostBuilder CreateWebHostBuilder()
+        {
+            return base.CreateWebHostBuilder().ConfigureServices(services =>
+            {
+                services.Configure<DefaultTenantStoreOptions>(options =>
+                {
+                    options.Tenants = new[]
+                    {
+                        new TenantConfiguration(_testTenantId, _testTenantName)
+                    };
+                });
+
+                services.Configure<TenantResolveOptions>(options =>
+                {
+                    options.AddDomainTenantResolver("{0}.abp.io");
+                });
+            });
+        }
+
+        [Fact]
+        public async Task Should_Use_Host_If_Tenant_Is_Not_Specified()
+        {
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
+            result["TenantId"].ShouldBe("");
+        }
+
+        [Fact]
+        public async Task Should_Use_Domain_If_Specified()
+        {
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            result["TenantId"].ShouldBe(_testTenantId.ToString());
+        }
+
+        [Fact]
+        public async Task Should_Use_Domain_As_First_Priority_If_Specified()
+        {
+            Client.DefaultRequestHeaders.Add(_options.TenantKey, Guid.NewGuid().ToString());
+
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            result["TenantId"].ShouldBe(_testTenantId.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
similarity index 72%
rename from framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs
rename to framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
index 34a5acaa82..98a7e92ef1 100644
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
@@ -12,14 +12,14 @@ using Xunit;
 
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
-    public class AspNetCoreMultiTenancy_Tests : AspNetCoreMultiTenancyTestBase
+    public class AspNetCoreMultiTenancy_Without_DomainResolver_Tests : AspNetCoreMultiTenancyTestBase
     {
         private readonly Guid _testTenantId = Guid.NewGuid();
         private readonly string _testTenantName = "acme";
 
         private readonly AspNetCoreMultiTenancyOptions _options;
 
-        public AspNetCoreMultiTenancy_Tests()
+        public AspNetCoreMultiTenancy_Without_DomainResolver_Tests()
         {
             _options = ServiceProvider.GetRequiredService<IOptions<AspNetCoreMultiTenancyOptions>>().Value;
         }
@@ -28,11 +28,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             return base.CreateWebHostBuilder().ConfigureServices(services =>
             {
-                services.Configure<ConfigurationTenantStoreOptions>(options =>
+                services.Configure<DefaultTenantStoreOptions>(options =>
                 {
                     options.Tenants = new[]
                     {
-                        new TenantInfo(_testTenantId, _testTenantName)
+                        new TenantConfiguration(_testTenantId, _testTenantName)
                     };
                 });
             });
@@ -61,23 +61,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
             var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
             result["TenantId"].ShouldBe(_testTenantId.ToString());
         }
-
-        [Fact]
-        public async Task Should_Use_Domain_If_Specified()
-        {
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
-            result["TenantId"].ShouldBe(_testTenantId.ToString());
-        }
-
-        [Fact]
-        public async Task Should_Use_Domain_As_First_Priority_If_Specified()
-        {
-            Client.DefaultRequestHeaders.Add(_options.TenantKey, Guid.NewGuid().ToString());
-
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
-            result["TenantId"].ShouldBe(_testTenantId.ToString());
-        }
-
+        
         [Fact]
         public async Task Should_Use_Cookie_Tenant_Id_If_Specified()
         {
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj
index 3db9cc1c0e..6b18627f7e 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
   </ItemGroup>
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
index 4ea231cc67..20f926f212 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
@@ -31,11 +31,11 @@ namespace Volo.Abp.Data.MultiTenancy
                 options.ConnectionStrings["db1"] = "db1-default-value";
             });
 
-            services.Configure<ConfigurationTenantStoreOptions>(options =>
+            services.Configure<DefaultTenantStoreOptions>(options =>
             {
                 options.Tenants = new[]
                 {
-                    new TenantInfo(_tenant1Id, "tenant1")
+                    new TenantConfiguration(_tenant1Id, "tenant1")
                     {
                         ConnectionStrings =
                         {
@@ -43,7 +43,7 @@ namespace Volo.Abp.Data.MultiTenancy
                             {"db1", "tenant1-db1-value"}
 }
                     },
-                    new TenantInfo(_tenant2Id, "tenant2")
+                    new TenantConfiguration(_tenant2Id, "tenant2")
                 };
             });
         }
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
index feb4d418fb..4bd1c6bad3 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
@@ -28,12 +28,12 @@ namespace Volo.Abp.MultiTenancy
 
         protected override void BeforeAddApplication(IServiceCollection services)
         {
-            services.Configure<ConfigurationTenantStoreOptions>(options =>
+            services.Configure<DefaultTenantStoreOptions>(options =>
             {
                 options.Tenants = new[]
                 {
-                    new TenantInfo(_tenantAId, "A"),
-                    new TenantInfo(_tenantAId, "B")
+                    new TenantConfiguration(_tenantAId, "A"),
+                    new TenantConfiguration(_tenantAId, "B")
                 };
             });
         }
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs
index 78fc476f07..3aca1ea5e8 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestModule.cs
@@ -3,7 +3,7 @@
 namespace Volo.Abp.MultiTenancy
 {
     //TODO: Renaming this project to Volo.Abp.MultiTenancy.Tests would be better!
-    [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))]
+    [DependsOn(typeof(AbpMultiTenancyModule))]
     public class MultiTenancyTestModule : AbpModule
     {
         
diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
index 9ceb4af554..01e0b6b57d 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
@@ -17,6 +17,6 @@
     "UseAnotherServiceToLogIn.": "使用其他服务登录.",
     "InvalidLoginRequest": "登录请求无效",
     "ThereAreNoLoginSchemesConfiguredForThisClient": "没有为此客户端配置登录方案.",
-    "LogInUsingYourProviderAccount": "使用您的{0}帐户登录"
+    "LogInUsingYourProviderAccount": "使用你的{0}帐户登录"
   }
 }
diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
index 9482bb5b95..c5f65ec7e3 100644
--- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
+++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
@@ -35,7 +35,7 @@ namespace Volo.Blogging.Posts
 
         private async Task<bool> HasDeletePermission(AuthorizationHandlerContext context, Post resource)
         {
-            if (await _permissionChecker.IsGrantedAsync(context.User, BloggingPermissions.Comments.Delete))
+            if (await _permissionChecker.IsGrantedAsync(context.User, BloggingPermissions.Posts.Delete))
             {
                 return true;
             }
@@ -50,7 +50,7 @@ namespace Volo.Blogging.Posts
                 return true;
             }
 
-            if (await _permissionChecker.IsGrantedAsync(context.User, BloggingPermissions.Comments.Update))
+            if (await _permissionChecker.IsGrantedAsync(context.User, BloggingPermissions.Posts.Update))
             {
                 return true;
             }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs
new file mode 100644
index 0000000000..75f5722ee8
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using Volo.Abp.Validation.StringValues;
+
+namespace Volo.Abp.FeatureManagement
+{
+    public class FeatureDto
+    {
+        public string Name { get; set; }
+
+        public string Value { get; set; }
+
+        public string Description { get; set; }
+
+        public IStringValueType ValueType { get; set; }
+
+        public int Depth { get; set; }
+
+        public string ParentName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureListDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureListDto.cs
new file mode 100644
index 0000000000..ee7bad8d5c
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureListDto.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.FeatureManagement
+{
+    public class FeatureListDto
+    {
+        public List<FeatureDto> Features { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs
new file mode 100644
index 0000000000..a30b2397fa
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.FeatureManagement
+{
+    public interface IFeatureAppService : IApplicationService
+    {
+        Task<FeatureListDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey); 
+
+        Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input); 
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeatureDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeatureDto.cs
new file mode 100644
index 0000000000..26b351ee9e
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeatureDto.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.FeatureManagement
+{
+    public class UpdateFeatureDto
+    {
+        public string Name { get; set; }
+
+        public string Value { get; set; }
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeaturesDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeaturesDto.cs
new file mode 100644
index 0000000000..3b8fbd2bd7
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/UpdateFeaturesDto.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.FeatureManagement
+{
+    public class UpdateFeaturesDto
+    {
+        public List<UpdateFeatureDto> Features { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
new file mode 100644
index 0000000000..b8b6c33d7c
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Features;
+
+namespace Volo.Abp.FeatureManagement
+{
+    [Authorize]
+    public class FeatureAppService : ApplicationService, IFeatureAppService
+    {
+        protected FeatureManagementOptions Options { get; }
+
+        private readonly IFeatureManager _featureManager;
+        private readonly IFeatureDefinitionManager _featureDefinitionManager;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+
+        public FeatureAppService(IFeatureManager featureManager,
+            IFeatureDefinitionManager featureDefinitionManager,
+            IStringLocalizerFactory stringLocalizerFactory,
+            IOptions<FeatureManagementOptions> options)
+        {
+            _featureManager = featureManager;
+            _featureDefinitionManager = featureDefinitionManager;
+            _stringLocalizerFactory = stringLocalizerFactory;
+            Options = options.Value;
+        }
+
+        public async Task<FeatureListDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey)
+        {
+            await CheckProviderPolicy(providerName);
+
+            var featureDefinitions = _featureDefinitionManager.GetAll();
+            var features = new List<FeatureDto>();
+
+            foreach (var featureDefinition in featureDefinitions)
+            {
+                features.Add(new FeatureDto
+                {
+                    Name = featureDefinition.Name,
+                    ValueType = featureDefinition.ValueType,
+                    Description = featureDefinition.Description.Localize(_stringLocalizerFactory),
+                    ParentName = featureDefinition.Parent?.Name,
+                    Value = await _featureManager.GetOrNullAsync(featureDefinition.Name, providerName, providerKey)
+                });
+            }
+
+            SetFeatureDepth(features, providerName, providerKey);
+
+            return new FeatureListDto { Features = features };
+        }
+
+        public async Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input)
+        {
+            await CheckProviderPolicy(providerName);
+
+            foreach (var feature in input.Features)
+            {
+                await _featureManager.SetAsync(feature.Name, feature.Value, providerName, providerKey);
+            }
+        }
+
+        private void SetFeatureDepth(List<FeatureDto> features, string providerName, string providerKey,
+            FeatureDto parentFeature = null, int depth = 0)
+        {
+            foreach (var feature in features)
+            {
+                if ((parentFeature == null && feature.ParentName == null) || (parentFeature != null && parentFeature.Name == feature.ParentName))
+                {
+                    feature.Depth = depth;
+                    SetFeatureDepth(features, providerName, providerKey, feature, depth + 1);
+                }
+            }
+        }
+
+        protected virtual async Task CheckProviderPolicy(string providerName)
+        {
+            var policyName = Options.ProviderPolicies.GetOrDefault(providerName);
+            if (policyName.IsNullOrEmpty())
+            {
+                throw new AbpException($"No policy defined to get/set permissions for the provider '{policyName}'. Use {nameof(FeatureManagementOptions)} to map the policy.");
+            }
+
+            await AuthorizationService.CheckAsync(policyName);
+        }
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
index 515db2b03f..0958746237 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
@@ -21,7 +21,10 @@ namespace Volo.Abp.FeatureManagement
             {
                 options.Providers.Add<DefaultValueFeatureManagementProvider>();
                 options.Providers.Add<EditionFeatureManagementProvider>();
+
+                //TODO: Should be moved to the Tenant Management module
                 options.Providers.Add<TenantFeatureManagementProvider>();
+                options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures";
             });
 
             Configure<VirtualFileSystemOptions>(options =>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementOptions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementOptions.cs
index 0599c3e4c5..b671c475ec 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementOptions.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementOptions.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Collections;
+using System.Collections.Generic;
+using Volo.Abp.Collections;
 
 namespace Volo.Abp.FeatureManagement
 {
@@ -6,9 +7,12 @@ namespace Volo.Abp.FeatureManagement
     {
         public ITypeList<IFeatureManagementProvider> Providers { get; }
 
+        public Dictionary<string, string> ProviderPolicies { get; }
+
         public FeatureManagementOptions()
         {
             Providers = new TypeList<IFeatureManagementProvider>();
+            ProviderPolicies = new Dictionary<string, string>();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/TenantFeatureManagementProvider.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/TenantFeatureManagementProvider.cs
index b03fc43d8a..e625e47880 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/TenantFeatureManagementProvider.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/TenantFeatureManagementProvider.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.FeatureManagement
         protected ICurrentTenant CurrentTenant { get; }
 
         public TenantFeatureManagementProvider(
-            IFeatureManagementStore store, 
+            IFeatureManagementStore store,
             ICurrentTenant currentTenant)
             : base(store)
         {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
new file mode 100644
index 0000000000..b52ea264b4
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -0,0 +1,60 @@
+@page
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Abp.FeatureManagement.Localization
+@using Volo.Abp.Validation.StringValues
+@using Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
+@model FeatureManagementModal
+@inject IHtmlLocalizer<AbpFeatureManagementResource> L
+@{
+    Layout = null;
+}
+<form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement">
+    <abp-modal size="Large">
+        <abp-modal-header title="@(L["Features"].Value)"></abp-modal-header>
+        <abp-modal-body class="ml-4">
+            <input asp-for="@Model.ProviderKey" />
+            <input asp-for="@Model.ProviderName" />
+            @for (var i = 0; i < Model.FeatureListDto.Features.Count; i++)
+            {
+                var feature = Model.FeatureListDto.Features[i];
+                <div class="mt-2" style="padding-left: @(feature.Depth * 20)px">
+
+                    <spam class="mr-2">@feature.Name</spam>
+
+                    <input type="text" name="Features[@i].Type" value="@feature.ValueType.Name" hidden />
+                    @if (feature.ValueType is FreeTextStringValueType)
+                    {
+                        <input type="text" name="Features[@i].Name" value="@feature.Name" hidden />
+                        <input type="text" name="Features[@i].Value" value="@feature.Value" />
+                    }
+                    @if (feature.ValueType is SelectionStringValueType)
+                    {
+                        <input type="text" name="Features[@i].Name" value="@feature.Name" hidden />
+                        <select name="Features[@i].Value">
+                            @foreach (var item in (feature.ValueType as SelectionStringValueType).ItemSource.Items)
+                            {
+                                if (item.Value == feature.Value)
+                                {
+                                    <option value="@item.Value" selected="selected"> @L.GetString(item.DisplayText.Name) </option>
+                                }
+                                else
+                                {
+                                    <option value="@item.Value"> @L.GetString(item.DisplayText.Name) </option>
+                                }
+                            }
+                        </select>
+                    }
+                    @if (feature.ValueType is ToggleStringValueType)
+                    {
+                        <input type="text" name="Features[@i].Name" value="@feature.Name" hidden />
+                        <input type="checkbox" class="FeatureValueCheckbox" name="Features[@i].BoolValue" value="@feature.Value"
+                               @Html.Raw(feature.Value == "True" ? "checked" : "") />
+                    }
+                </div>
+            }
+        </abp-modal-body>
+        <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
+    </abp-modal>
+</form>
+
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
new file mode 100644
index 0000000000..23e46de955
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+using Volo.Abp.Validation.StringValues;
+
+namespace Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
+{
+    public class FeatureManagementModal : AbpPageModel
+    {
+        [Required]
+        [HiddenInput]
+        [BindProperty(SupportsGet = true)]
+        public string ProviderName { get; set; }
+
+        [Required]
+        [HiddenInput]
+        [BindProperty(SupportsGet = true)]
+        public string ProviderKey { get; set; }
+
+        [BindProperty]
+        public List<FeatureViewModel> Features { get; set; }
+
+        public FeatureListDto FeatureListDto { get; set; }
+
+        private readonly IFeatureAppService _featureAppService;
+
+        public FeatureManagementModal(IFeatureAppService featureAppService)
+        {
+            _featureAppService = featureAppService;
+        }
+
+        public async Task OnGetAsync()
+        {
+            FeatureListDto = await _featureAppService.GetAsync(ProviderName, ProviderKey);
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            var features = new UpdateFeaturesDto
+            {
+                Features = Features.Select(f => new UpdateFeatureDto
+                {
+                    Name = f.Name,
+                    Value = f.Type == nameof(ToggleStringValueType) ? f.BoolValue.ToString() : f.Value
+                }).ToList()
+            };
+
+            await _featureAppService.UpdateAsync(ProviderName, ProviderKey, features);
+
+            return NoContent();
+        }
+
+
+        public class ProviderInfoViewModel
+        {
+            public string ProviderName { get; set; }
+
+            public string ProviderKey { get; set; }
+        }
+
+        public class FeatureViewModel
+        {
+            public string Name { get; set; }
+
+            public string Value { get; set; }
+
+            public bool BoolValue { get; set; }
+
+            public string Type { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js
new file mode 100644
index 0000000000..74b66f467d
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js
@@ -0,0 +1,17 @@
+var abp = abp || {};
+(function ($) {
+    abp.modals = abp.modals || {};
+
+    abp.modals.FeatureManagement = function () {
+
+        $('.FeatureValueCheckbox').change(function () {
+            if (this.checked) {
+                $(this).val("true");
+            }
+            else {
+                $(this).val("false");
+            }
+        });
+
+    };
+})(jQuery);
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj
index 3175e1143a..ffe9acd932 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj
@@ -11,19 +11,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="wwwroot\**\*.*" />
-    <EmbeddedResource Include="Pages\**\*.cshtml" Exclude="*.cs" />
+    <EmbeddedResource Include="Pages\**\*.cshtml" />
+    <EmbeddedResource Include="Pages\**\*.js" />
+    <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Localization\Resources\**\*.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Remove="wwwroot\**\*.*" />
     <Content Remove="Pages\**\*.cshtml" />
+    <Content Remove="Pages\**\*.js" />
+    <Content Remove="Pages\**\*.css" />
     <Content Remove="Localization\Resources\**\*.json" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs
index 0ff9e5a55a..16e00c55d6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 
 namespace Volo.Abp.Identity
 {
     public interface IIdentityDataSeeder
     {
         Task<IdentityDataSeedResult> SeedAsync(
-            string adminUserPassword,
+            [NotNull] string adminEmail,
+            [NotNull] string adminPassword,
             Guid? tenantId = null);
     }
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs
new file mode 100644
index 0000000000..21cda46613
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs
@@ -0,0 +1,25 @@
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Identity
+{
+    public class IdentityDataSeedContributor : IDataSeedContributor, ITransientDependency
+    {
+        private readonly IIdentityDataSeeder _identityDataSeeder;
+
+        public IdentityDataSeedContributor(IIdentityDataSeeder identityDataSeeder)
+        {
+            _identityDataSeeder = identityDataSeeder;
+        }
+
+        public Task SeedAsync(DataSeedContext context)
+        {
+            return _identityDataSeeder.SeedAsync(
+                context["AdminEmail"] as string ?? "admin@abp.io",
+                context["AdminPassword"] as string ?? "1q2w3E*",
+                context.TenantId
+            );
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
index 09718049de..20fb67dd06 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Volo.Abp.DependencyInjection;
@@ -35,34 +34,53 @@ namespace Volo.Abp.Identity
 
         [UnitOfWork]
         public virtual async Task<IdentityDataSeedResult> SeedAsync(
-            string adminUserPassword,
+            string adminEmail,
+            string adminPassword,
             Guid? tenantId = null)
         {
+            Check.NotNullOrWhiteSpace(adminEmail, nameof(adminEmail));
+            Check.NotNullOrWhiteSpace(adminPassword, nameof(adminPassword));
+
             var result = new IdentityDataSeedResult();
 
+            //"admin" user
             const string adminUserName = "admin";
-            const string adminRoleName = "admin";
+            var adminUser = await _userRepository.FindByNormalizedUserNameAsync(
+                _lookupNormalizer.Normalize(adminUserName)
+            );
 
-            //"admin" user
-            var adminUser = await _userRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.Normalize(adminUserName));
             if (adminUser != null)
             {
                 return result;
             }
 
-            adminUser = new IdentityUser(_guidGenerator.Create(), adminUserName, "admin@abp.io", tenantId);
-            adminUser.Name = adminUserName;
-            (await _userManager.CreateAsync(adminUser, adminUserPassword)).CheckErrors();
+            adminUser = new IdentityUser(
+                _guidGenerator.Create(),
+                adminUserName,
+                adminEmail,
+                tenantId
+            )
+            {
+                Name = adminUserName
+            };
+
+            (await _userManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
             result.CreatedAdminUser = true;
 
             //"admin" role
+            const string adminRoleName = "admin";
             var adminRole = await _roleRepository.FindByNormalizedNameAsync(_lookupNormalizer.Normalize(adminRoleName));
             if (adminRole == null)
             {
-                adminRole = new IdentityRole(_guidGenerator.Create(), adminRoleName, tenantId);
-
-                adminRole.IsStatic = true;
-                adminRole.IsPublic = true;
+                adminRole = new IdentityRole(
+                    _guidGenerator.Create(),
+                    adminRoleName,
+                    tenantId
+                )
+                {
+                    IsStatic = true,
+                    IsPublic = true
+                };
 
                 (await _roleManager.CreateAsync(adminRole)).CheckErrors();
                 result.CreatedAdminRole = true;
diff --git a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/AbpPermissionManagementDomainIdentityModule.cs b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/AbpPermissionManagementDomainIdentityModule.cs
index 4f6eb41f2b..a70657d6da 100644
--- a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/AbpPermissionManagementDomainIdentityModule.cs
+++ b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/AbpPermissionManagementDomainIdentityModule.cs
@@ -1,8 +1,13 @@
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.PermissionManagement.Identity
 {
+    [DependsOn(
+        typeof(AbpIdentityDomainSharedModule),
+        typeof(AbpPermissionManagementDomainModule)
+        )]
     public class AbpPermissionManagementDomainIdentityModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs
index f99f70da72..b52136a082 100644
--- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs
+++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Authorization;
 using Volo.Abp.Autofac;
+using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
 
@@ -28,8 +29,8 @@ namespace Volo.Abp.Identity
         {
             using (var scope = context.ServiceProvider.CreateScope())
             {
-                var dataSeeder = scope.ServiceProvider.GetRequiredService<IIdentityDataSeeder>();
-                AsyncHelper.RunSync(() => dataSeeder.SeedAsync("1q2w3E*"));
+                var dataSeeder = scope.ServiceProvider.GetRequiredService<IDataSeeder>();
+                AsyncHelper.RunSync(() => dataSeeder.SeedAsync());
 
                 scope.ServiceProvider
                     .GetRequiredService<AbpIdentityTestDataBuilder>()
diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityDataSeeder_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityDataSeeder_Tests.cs
index a8e31dd6e5..a30cb6dd05 100644
--- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityDataSeeder_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityDataSeeder_Tests.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.Identity
         [Fact]
         public async Task Should_Create_Admin_User_And_Role()
         {
-            await _identityDataSeeder.SeedAsync("1q2w3E*");
+            await _identityDataSeeder.SeedAsync("admin@abp.io", "1q2w3E*");
 
             (await _userRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.Normalize("admin"))).ShouldNotBeNull();
             (await _userRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.Normalize("admin"))).Name.ShouldBe("admin");
diff --git a/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/AbpPermissionManagementDomainIdentityServerModule.cs b/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/AbpPermissionManagementDomainIdentityServerModule.cs
index f22cce8345..b078221c5e 100644
--- a/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/AbpPermissionManagementDomainIdentityServerModule.cs
+++ b/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/AbpPermissionManagementDomainIdentityServerModule.cs
@@ -1,8 +1,13 @@
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.IdentityServer;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.PermissionManagement.IdentityServer
 {
+    [DependsOn(
+        typeof(AbpIdentityServerDomainSharedModule),
+        typeof(AbpPermissionManagementDomainModule)
+    )]
     public class AbpPermissionManagementDomainIdentityServerModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs
new file mode 100644
index 0000000000..203082828b
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs
@@ -0,0 +1,38 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.PermissionManagement
+{
+    public class PermissionDataSeedContributor : IDataSeedContributor, ITransientDependency
+    {
+        protected IPermissionDefinitionManager PermissionDefinitionManager { get; }
+        protected IPermissionDataSeeder PermissionDataSeeder { get; }
+
+        public PermissionDataSeedContributor(
+            IPermissionDefinitionManager permissionDefinitionManager,
+            IPermissionDataSeeder permissionDataSeeder)
+        {
+            PermissionDefinitionManager = permissionDefinitionManager;
+            PermissionDataSeeder = permissionDataSeeder;
+        }
+
+        public Task SeedAsync(DataSeedContext context)
+        {
+            var permissionNames = PermissionDefinitionManager
+                .GetPermissions()
+                .Select(p => p.Name)
+                //TODO: Filter host/tenant permissions!
+                .ToArray();
+
+            return PermissionDataSeeder.SeedAsync(
+                RolePermissionValueProvider.ProviderName,
+                "admin",
+                permissionNames,
+                context.TenantId
+            );
+        }
+    }
+}
diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.sln b/modules/tenant-management/Volo.Abp.TenantManagement.sln
index 20fd21a531..82e976220f 100644
--- a/modules/tenant-management/Volo.Abp.TenantManagement.sln
+++ b/modules/tenant-management/Volo.Abp.TenantManagement.sln
@@ -25,11 +25,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.Application.Tests", "test\Volo.Abp.TenantManagement.Application.Tests\Volo.Abp.TenantManagement.Application.Tests.csproj", "{72445B2D-07FA-4A35-A3D6-FF4ACE299BF4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TenantManagement.EntityFrameworkCore.Tests", "test\Volo.Abp.TenantManagement.EntityFrameworkCore.Tests\Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj", "{A2BB8897-EBDB-46BB-B885-F8635B21F376}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.EntityFrameworkCore.Tests", "test\Volo.Abp.TenantManagement.EntityFrameworkCore.Tests\Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj", "{A2BB8897-EBDB-46BB-B885-F8635B21F376}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TenantManagement.MongoDB", "src\Volo.Abp.TenantManagement.MongoDB\Volo.Abp.TenantManagement.MongoDB.csproj", "{ED95242E-3C31-4A89-9C62-93B306EFEB15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.MongoDB", "src\Volo.Abp.TenantManagement.MongoDB\Volo.Abp.TenantManagement.MongoDB.csproj", "{ED95242E-3C31-4A89-9C62-93B306EFEB15}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TenantManagement.MongoDB.Tests", "test\Volo.Abp.TenantManagement.MongoDB.Tests\Volo.Abp.TenantManagement.MongoDB.Tests.csproj", "{F75B4C54-A5F1-4101-99F5-A5B868A5146B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.MongoDB.Tests", "test\Volo.Abp.TenantManagement.MongoDB.Tests\Volo.Abp.TenantManagement.MongoDB.Tests.csproj", "{F75B4C54-A5F1-4101-99F5-A5B868A5146B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.TestBase", "test\Volo.Abp.TenantManagement.TestBase\Volo.Abp.TenantManagement.TestBase.csproj", "{C3BAD6E8-00CD-4283-9416-64287BB5B265}"
 EndProject
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.csproj
index 393c22258c..f99d3f8609 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo.Abp.TenantManagement.Application.Contracts.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -15,7 +15,6 @@
   
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.TenantManagement.Domain.Shared\Volo.Abp.TenantManagement.Domain.Shared.csproj" />
-
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
   </ItemGroup>
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs
index 50c6aae024..9ca2c82bdb 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Application;
-using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Application;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Localization;
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementPermissionDefinitionProvider.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementPermissionDefinitionProvider.cs
index 822de19ad8..32aae64598 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementPermissionDefinitionProvider.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementPermissionDefinitionProvider.cs
@@ -8,12 +8,13 @@ namespace Volo.Abp.TenantManagement
     {
         public override void Define(IPermissionDefinitionContext context)
         {
-            var identityGroup = context.AddGroup(TenantManagementPermissions.GroupName, L("Permission:TenantManagement"));
+            var tenantManagementGroup = context.AddGroup(TenantManagementPermissions.GroupName, L("Permission:TenantManagement"));
 
-            var rolesPermission = identityGroup.AddPermission(TenantManagementPermissions.Tenants.Default, L("Permission:TenantManagement"));
-            rolesPermission.AddChild(TenantManagementPermissions.Tenants.Create, L("Permission:Create"));
-            rolesPermission.AddChild(TenantManagementPermissions.Tenants.Update, L("Permission:Edit"));
-            rolesPermission.AddChild(TenantManagementPermissions.Tenants.Delete, L("Permission:Delete"));
+            var tenantsPermission = tenantManagementGroup.AddPermission(TenantManagementPermissions.Tenants.Default, L("Permission:TenantManagement"));
+            tenantsPermission.AddChild(TenantManagementPermissions.Tenants.Create, L("Permission:Create"));
+            tenantsPermission.AddChild(TenantManagementPermissions.Tenants.Update, L("Permission:Edit"));
+            tenantsPermission.AddChild(TenantManagementPermissions.Tenants.Delete, L("Permission:Delete"));
+            tenantsPermission.AddChild(TenantManagementPermissions.Tenants.ManageFeatures, L("Permission:ManageFeatures"));
         }
 
         private static LocalizableString L(string name)
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/en.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/en.json
index 92a555e5a7..c153af5e10 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/en.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/en.json
@@ -4,6 +4,7 @@
     "Permission:TenantManagement": "Tenant management",
     "Permission:Create": "Create",
     "Permission:Edit": "Edit",
-    "Permission:Delete": "Delete"
+    "Permission:Delete": "Delete",
+    "Permission:ManageFeatures": "Manage features"
   }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/tr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/tr.json
index a192048e78..8ff9d2c2d5 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/tr.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/tr.json
@@ -4,6 +4,7 @@
     "Permission:TenantManagement": "Müşteri yönetimi",
     "Permission:Create": "Oluşturma",
     "Permission:Edit": "Düzenleme",
-    "Permission:Delete": "Silme"
+    "Permission:Delete": "Silme",
+    "Permission:ManageFeatures": "Özellikleri yönet"
   }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs
index bc30e65e1f..8afdfbe8d5 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs
@@ -10,6 +10,20 @@
             public const string Create = Default + ".Create";
             public const string Update = Default + ".Update";
             public const string Delete = Default + ".Delete";
+            public const string ManageFeatures = Default + ".ManageFeatures";
+        }
+
+        public static string[] GetAll()
+        {
+            return new[]
+            {
+                GroupName,
+                Tenants.Default,
+                Tenants.Create,
+                Tenants.Update,
+                Tenants.Delete,
+                Tenants.ManageFeatures
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj
index e8e0d54a9e..bd5926a785 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -16,7 +16,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.TenantManagement.Application.Contracts\Volo.Abp.TenantManagement.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Abp.TenantManagement.Domain\Volo.Abp.TenantManagement.Domain.csproj" />
-
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.UI\Volo.Abp.UI.csproj" />
   </ItemGroup>
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs
index ab00b0dc80..8bed38c5ec 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.TenantManagement
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
index 8578d29090..c8b7c93311 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
@@ -3,32 +3,38 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
 
 namespace Volo.Abp.TenantManagement
 {
     [Authorize(TenantManagementPermissions.Tenants.Default)]
     public class TenantAppService : TenantManagementAppServiceBase, ITenantAppService
     {
-        private readonly ITenantRepository _tenantRepository;
-        private readonly ITenantManager _tenantManager;
+        protected IDataSeeder DataSeeder { get; }
+        protected ITenantRepository TenantRepository { get; }
+        protected ITenantManager TenantManager { get; }
 
-        public TenantAppService(ITenantRepository tenantRepository, ITenantManager tenantManager)
+        public TenantAppService(
+            ITenantRepository tenantRepository, 
+            ITenantManager tenantManager,
+            IDataSeeder dataSeeder)
         {
-            _tenantRepository = tenantRepository;
-            _tenantManager = tenantManager;
+            DataSeeder = dataSeeder;
+            TenantRepository = tenantRepository;
+            TenantManager = tenantManager;
         }
 
         public async Task<TenantDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<Tenant, TenantDto>(
-                await _tenantRepository.GetAsync(id)
+                await TenantRepository.GetAsync(id)
             );
         }
 
         public async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
         {
-            var count = await _tenantRepository.GetCountAsync();
-            var list = await _tenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
+            var count = await TenantRepository.GetCountAsync();
+            var list = await TenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
 
             return new PagedResultDto<TenantDto>(
                 count,
@@ -39,30 +45,39 @@ namespace Volo.Abp.TenantManagement
         [Authorize(TenantManagementPermissions.Tenants.Create)]
         public async Task<TenantDto> CreateAsync(TenantCreateDto input)
         {
-            var tenant = await _tenantManager.CreateAsync(input.Name);
-            await _tenantRepository.InsertAsync(tenant);
+            var tenant = await TenantManager.CreateAsync(input.Name);
+            await TenantRepository.InsertAsync(tenant);
+
+            using (CurrentTenant.Change(tenant.Id, tenant.Name))
+            {
+                //TODO: Handle database creation?
+
+                //TODO: Set admin email & password..?
+                await DataSeeder.SeedAsync(tenant.Id);
+            }
+            
             return ObjectMapper.Map<Tenant, TenantDto>(tenant);
         }
 
         [Authorize(TenantManagementPermissions.Tenants.Update)]
         public async Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
         {
-            var tenant = await _tenantRepository.GetAsync(id);
-            await _tenantManager.ChangeNameAsync(tenant, input.Name);
-            await _tenantRepository.UpdateAsync(tenant);
+            var tenant = await TenantRepository.GetAsync(id);
+            await TenantManager.ChangeNameAsync(tenant, input.Name);
+            await TenantRepository.UpdateAsync(tenant);
             return ObjectMapper.Map<Tenant, TenantDto>(tenant);
         }
 
         [Authorize(TenantManagementPermissions.Tenants.Delete)]
         public async Task DeleteAsync(Guid id)
         {
-            var tenant = await _tenantRepository.FindAsync(id);
+            var tenant = await TenantRepository.FindAsync(id);
             if (tenant == null)
             {
                 return;
             }
 
-            await _tenantRepository.DeleteAsync(tenant);
+            await TenantRepository.DeleteAsync(tenant);
         }
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj
index 4d42c6084b..9f516e45fd 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Data\Volo.Abp.Data.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.UI\Volo.Abp.UI.csproj" />
   </ItemGroup>
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs
index 9cd46215de..435421d76d 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs
@@ -8,7 +8,7 @@ namespace Volo.Abp.TenantManagement
     {
         public AbpTenantManagementDomainMappingProfile()
         {
-            CreateMap<Tenant, TenantInfo>()
+            CreateMap<Tenant, TenantConfiguration>()
                 .ForMember(ti => ti.ConnectionStrings, opts =>
                 {
                     opts.MapFrom((tenant, ti) =>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs
index eb587b980a..f22b508afb 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
@@ -8,7 +7,7 @@ using Volo.Abp.UI;
 
 namespace Volo.Abp.TenantManagement
 {
-    [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))]
+    [DependsOn(typeof(AbpMultiTenancyModule))]
     [DependsOn(typeof(AbpTenantManagementDomainSharedModule))]
     [DependsOn(typeof(AbpDataModule))]
     [DependsOn(typeof(AbpDddDomainModule))]
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
index cd15ebe1fe..1a32c4a64d 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
@@ -24,7 +24,7 @@ namespace Volo.Abp.TenantManagement
             _currentTenant = currentTenant;
         }
 
-        public async Task<TenantInfo> FindAsync(string name)
+        public async Task<TenantConfiguration> FindAsync(string name)
         {
             using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
@@ -34,11 +34,11 @@ namespace Volo.Abp.TenantManagement
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantInfo>(tenant);
+                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
 
-        public async Task<TenantInfo> FindAsync(Guid id)
+        public async Task<TenantConfiguration> FindAsync(Guid id)
         {
             using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
@@ -48,7 +48,7 @@ namespace Volo.Abp.TenantManagement
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantInfo>(tenant);
+                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
     }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
index 2267539b09..8ea03c99f3 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.FeatureManagement;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
@@ -16,6 +17,7 @@ namespace Volo.Abp.TenantManagement.Web
 {
     [DependsOn(typeof(AbpTenantManagementHttpApiModule))]
     [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))]
+    [DependsOn(typeof(AbpFeatureManagementWebModule))]
     [DependsOn(typeof(AbpAutoMapperModule))]
     public class AbpTenantManagementWebModule : AbpModule
     {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
index a5a7bf4a90..95cd3d8331 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
@@ -13,7 +13,10 @@
     PageLayout.Content.MenuItemName = TenantManagementMenuNames.Tenants;
 }
 @section scripts {
-    <script type="text/javascript" src="~/modules/multi-tenancy/views/tenants/index.js"></script>
+    <abp-script-bundle name="@typeof(IndexModel).FullName">
+        <abp-script src="/modules/multi-tenancy/views/tenants/index.js" />
+        <abp-script src="/Pages/FeatureManagement/feature-management-modal.js" />
+    </abp-script-bundle>
 }
 <abp-card id="TenantsWrapper">
     <abp-card-header>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
index 94071ed59e..c542768e8c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\feature-management\src\Volo.Abp.FeatureManagement.Web\Volo.Abp.FeatureManagement.Web.csproj" />
     <ProjectReference Include="..\Volo.Abp.TenantManagement.HttpApi\Volo.Abp.TenantManagement.HttpApi.csproj" />
-
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
   </ItemGroup>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/wwwroot/modules/multi-tenancy/views/tenants/index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/wwwroot/modules/multi-tenancy/views/tenants/index.js
index bfb44f0bcc..344cc1963d 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/wwwroot/modules/multi-tenancy/views/tenants/index.js
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/wwwroot/modules/multi-tenancy/views/tenants/index.js
@@ -5,6 +5,7 @@
 
     var _editModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/EditModal');
     var _createModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/CreateModal');
+    var _featuresModal = new abp.ModalManager(abp.appPath + 'FeatureManagement/FeatureManagementModal');
 
     $(function () {
 
@@ -27,6 +28,18 @@
                                         });
                                     }
                                 },
+                                {
+                                    text: l('Features'),
+                                    visible: function () {
+                                        return true; //TODO: Check permission
+                                    },
+                                    action: function (data) {
+                                        _featuresModal.open({
+                                            providerName: 'Tenant',
+                                            providerKey: data.record.id
+                                        });
+                                    }
+                                },
                                 {
                                     text: l('Delete'),
                                     visible: function () { return true; }, //TODO: Check permission
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.csproj b/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.csproj
index 9104c4fc42..92d5a13bfc 100644
--- a/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.csproj
+++ b/modules/users/src/Volo.Abp.Users.Abstractions/Volo.Abp.Users.Abstractions.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
index eac254b2a9..16e954396f 100644
--- a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
+++ b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.Users
     //TODO: Consider to (somehow) move this to the framework to the same assemblily of ICurrentUser!
 
     [DependsOn(
-        typeof(AbpMultiTenancyAbstractionsModule),
+        typeof(AbpMultiTenancyModule),
         typeof(AbpEventBusModule)
         )]
     public class AbpUsersAbstractionModule : AbpModule
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index 8a166107e1..d7ce2ce572 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -8,6 +8,7 @@ $solutions = (
     "modules/users",
     "modules/setting-management",
     "modules/permission-management",
+    "modules/feature-management",
     "modules/tenant-management",
     "modules/identity",
     "modules/identityserver",
@@ -114,6 +115,17 @@ $projects = (
     "modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client",
     "modules/permission-management/src/Volo.Abp.PermissionManagement.Web",
 
+    # modules/feature-management
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Domain",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Application",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client",
+    "modules/feature-management/src/Volo.Abp.FeatureManagement.Web",
+    
     # modules/tenant-management
     "modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared",
     "modules/tenant-management/src/Volo.Abp.TenantManagement.Domain",
diff --git a/nupkg/common.sh b/nupkg/common.sh
deleted file mode 100644
index 1a553f58de..0000000000
--- a/nupkg/common.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-
-# Paths
-packFolder="$(pwd)"
-rootFolder="$(dirname "$packFolder")"
-
-# List of solutions
-solutions=(
-    "framework" 
-    "modules/users" 
-    "modules/setting-management" 
-    "modules/permission-management" 
-    "modules/tenant-management" 
-    "modules/identity" 
-    "modules/identityserver" 
-    "modules/account" 
-    "modules/audit-logging" 
-    "modules/background-jobs" 
-    "modules/blogging" 
-    "modules/docs" 
-    "abp_io"
-)
-
-# List of projects
-projects=( 
-    "framework/src/Volo.Abp.ApiVersioning.Abstractions"
-    "framework/src/Volo.Abp.AspNetCore"
-    "framework/src/Volo.Abp.AspNetCore.Authentication.OAuth"
-    "framework/src/Volo.Abp.AspNetCore.MultiTenancy"
-    "framework/src/Volo.Abp.AspNetCore.Mvc"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.Contracts"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.Client"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic"
-    "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared"
-    "framework/src/Volo.Abp.AspNetCore.TestBase"
-   
-    "framework/src/Volo.Abp.Auditing"
-    "framework/src/Volo.Abp.Authorization"
-    "framework/src/Volo.Abp.Autofac"
-    "framework/src/Volo.Abp.AutoMapper"
-    "framework/src/Volo.Abp.BackgroundJobs"
-    "framework/src/Volo.Abp.BackgroundJobs.Abstractions"
-    "framework/src/Volo.Abp.BackgroundJobs.HangFire"
-    "framework/src/Volo.Abp.BackgroundJobs.RabbitMQ"
-    "framework/src/Volo.Abp.BackgroundWorkers"
-    "framework/src/Volo.Abp.Caching"
-    "framework/src/Volo.Abp.Castle.Core"
-    "framework/src/Volo.Abp.Core"
-    "framework/src/Volo.Abp.Data"
-    "framework/src/Volo.Abp.Ddd.Application"
-    "framework/src/Volo.Abp.Ddd.Domain"
-    "framework/src/Volo.Abp.Emailing"
-    "framework/src/Volo.Abp.EntityFrameworkCore"
-    "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer"
-    "framework/src/Volo.Abp.EntityFrameworkCore.MySQL"
-    "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql"
-    "framework/src/Volo.Abp.EventBus"
-    "framework/src/Volo.Abp.EventBus.RabbitMQ"
-    "framework/src/Volo.Abp.Features"
-    "framework/src/Volo.Abp.Guids"
-    "framework/src/Volo.Abp.HangFire"
-    "framework/src/Volo.Abp.Http"
-    "framework/src/Volo.Abp.Http.Abstractions"
-    "framework/src/Volo.Abp.Http.Client"
-    "framework/src/Volo.Abp.Http.Client.IdentityModel"
-    "framework/src/Volo.Abp.IdentityModel"
-    "framework/src/Volo.Abp.Json"
-    "framework/src/Volo.Abp.Localization"
-    "framework/src/Volo.Abp.Localization.Abstractions"
-    "framework/src/Volo.Abp.MemoryDb"
-    "framework/src/Volo.Abp.MongoDB"
-    "framework/src/Volo.Abp.MultiTenancy.Abstractions"
-    "framework/src/Volo.Abp.ObjectMapping"
-    "framework/src/Volo.Abp.RabbitMQ"
-    "framework/src/Volo.Abp.Security"
-    "framework/src/Volo.Abp.Serialization"
-    "framework/src/Volo.Abp.Settings"
-    "framework/src/Volo.Abp.Sms"
-    "framework/src/Volo.Abp.TestBase"
-    "framework/src/Volo.Abp.Threading"
-    "framework/src/Volo.Abp.Timing"
-    "framework/src/Volo.Abp.UI"
-    "framework/src/Volo.Abp.UI.Navigation"
-    "framework/src/Volo.Abp.Uow"
-    "framework/src/Volo.Abp.Validation"
-    "framework/src/Volo.Abp.VirtualFileSystem"
-    
-    # modules/users
-    "modules/users/src/Volo.Abp.Users.Abstractions"
-    "modules/users/src/Volo.Abp.Users.Domain"
-    "modules/users/src/Volo.Abp.Users.Domain.Shared"
-    "modules/users/src/Volo.Abp.Users.EntityFrameworkCore"
-    "modules/users/src/Volo.Abp.Users.MongoDB"
-
-    # modules/setting-management
-    "modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared"
-    "modules/setting-management/src/Volo.Abp.SettingManagement.Domain"
-    "modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore"
-    "modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB"
-    "modules/setting-management/src/Volo.Abp.SettingManagement.Web"
-
-    # modules/permission-management
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.Domain"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.Application"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client"
-    "modules/permission-management/src/Volo.Abp.PermissionManagement.Web"
-
-    # modules/tenant-management
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.Domain"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.Application"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client"
-    "modules/tenant-management/src/Volo.Abp.TenantManagement.Web"
-    
-    # modules/identity
-    "modules/identity/src/Volo.Abp.Identity.AspNetCore"
-
-    "modules/identity/src/Volo.Abp.Identity.Application"
-    "modules/identity/src/Volo.Abp.Identity.Application.Contracts"
-    "modules/identity/src/Volo.Abp.Identity.Domain"
-    "modules/identity/src/Volo.Abp.Identity.Domain.Shared"
-    "modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore"
-    "modules/identity/src/Volo.Abp.Identity.MongoDB"
-    "modules/identity/src/Volo.Abp.Identity.HttpApi"
-    "modules/identity/src/Volo.Abp.Identity.HttpApi.Client"
-    "modules/identity/src/Volo.Abp.Identity.Web"
-
-    "modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity"
-    
-    # modules/identityserver
-    "modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared"
-    "modules/identityserver/src/Volo.Abp.IdentityServer.Domain"
-    "modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer"
-    "modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore"
-
-    "modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB"
-
-    # modules/account
-    "modules/account/src/Volo.Abp.Account.Web"
-    "modules/account/src/Volo.Abp.Account.Web.IdentityServer"
-    
-    # modules/docs
-    "modules/docs/src/Volo.Docs.Application"
-    "modules/docs/src/Volo.Docs.Application.Contracts"
-    "modules/docs/src/Volo.Docs.Domain"
-    "modules/docs/src/Volo.Docs.Domain.Shared"
-    "modules/docs/src/Volo.Docs.EntityFrameworkCore"
-    "modules/docs/src/Volo.Docs.HttpApi"
-    "modules/docs/src/Volo.Docs.HttpApi.Client"
-    "modules/docs/src/Volo.Docs.Web"
-   
-    
-    # modules/blogging
-    "modules/blogging/src/Volo.Blogging.Application"
-    "modules/blogging/src/Volo.Blogging.Application.Contracts"
-    "modules/blogging/src/Volo.Blogging.Domain"
-    "modules/blogging/src/Volo.Blogging.Domain.Shared"
-    "modules/blogging/src/Volo.Blogging.EntityFrameworkCore"
-    "modules/blogging/src/Volo.Blogging.MongoDB"
-    "modules/blogging/src/Volo.Blogging.HttpApi"
-    "modules/blogging/src/Volo.Blogging.HttpApi.Client"
-    "modules/blogging/src/Volo.Blogging.Web"
-    
-    # modules/audit-logging
-    "modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared"
-    "modules/audit-logging/src/Volo.Abp.AuditLogging.Domain"
-    "modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore"
-    "modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB"
-    
-    # modules/background-jobs
-    "modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared"
-    "modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain"
-    "modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore"
-    "modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB"
-    
-    # abp_io/SolutionTemplating
-    "abp_io/src/Volo.Utils.SolutionTemplating"
-)
diff --git a/nupkg/pack.sh b/nupkg/pack.sh
deleted file mode 100755
index 122bedcfba..0000000000
--- a/nupkg/pack.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eE
-. ./common.sh
-
-# Rebuild all solutions
-for solution in "${solutions[@]}"
-do
-    solutionFolder="$rootFolder/$solution"
-    cd "$solutionFolder" \
-    && dotnet restore
-done
-
-# Create all packages
-for project in "${projects[@]}"
-do
-    projectFolder="$rootFolder/$project"
-
-    # Create nuget pack
-    cd "$projectFolder"
-    rm -rf "$projectFolder/bin/Release" \
-    & dotnet pack --no-restore -c Release -p:SourceLinkCreate=true -o "$packFolder"
-done
-
-# Go back to the pack folder
-cd "$packFolder"
\ No newline at end of file