Merge branch 'dev' into Docs-module-Alternative-way-(using-branches)-to-get-versions

.github/lock.yml

@@ -0,0 +1,38 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 30
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/stale.yml

@@ -0,0 +1,15 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/angular.yml

@@ -3,15 +3,6 @@ on:
   pull_request:
     paths:
       - 'npm/ng-packs/**'
-    branches:
-      #- master
-      - dev
-  push:
-    paths:
-      - 'npm/ng-packs/**'
-    branches:
-      #- master
-      - dev
 jobs:
   build-test-lint:
     runs-on: ubuntu-18.04
@@ -19,6 +10,6 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - run: yarn && yarn ci
         working-directory: npm/ng-packs

common.props

@@ -1,7 +1,7 @@
 <Project>
-  <PropertyGroup>
+  <PropertyGroup> 
     <LangVersion>latest</LangVersion> 
-    <Version>3.1.0</Version>  
+    <Version>3.1.0</Version>   
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

docs/en/API/Application-Configuration.md

@@ -2,12 +2,12 @@
 
 ABP Framework provides a pre-built and standard endpoint that contains some useful information about the application/service. Here, the list of some fundamental information at this endpoint:
 
-* [Localization](Localization.md) values, supported and the current language of the application.
-* Available and granted [policies](Authorization.md) (permissions) for the current user.
-* [Setting](Settings.md) values for the current user.
-* Info about the [current user](CurrentUser.md) (like id and user name).
-* Info about the current [tenant](Multi-Tenancy.md) (like id and name).
-* [Time zone](Timing.md) information for the current user and the [clock](Timing.md) type of the application.
+* [Localization](../Localization.md) values, supported and the current language of the application.
+* Available and granted [policies](../Authorization.md) (permissions) for the current user.
+* [Setting](../Settings.md) values for the current user.
+* Info about the [current user](../CurrentUser.md) (like id and user name).
+* Info about the current [tenant](../Multi-Tenancy.md) (like id and name).
+* [Time zone](../Timing.md) information for the current user and the [clock](../Timing.md) type of the application.
 
 ## HTTP API
 

docs/en/Authentication/Social-External-Logins.md

@@ -0,0 +1,30 @@
+# Social/External Logins
+
+## ASP.NET Core MVC / Razor Pages UI
+
+The [Account Module](../Modules/Account.md) has already configured to handle social or external logins out of the box. You can follow the ASP.NET Core documentation to add a social/external login provider to your application.
+
+### Example: Facebook Authentication
+
+Follow the [ASP.NET Core Facebook integration document](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins) to support the Facebook login for your application.
+
+#### Add the NuGet Package
+
+Add the [Microsoft.AspNetCore.Authentication.Facebook](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Facebook) package to your project. Based on your architecture, this can be `.Web`, `.IdentityServer` (for tiered setup) or `.Host` project.
+
+#### Configure the Provider
+
+Use the `.AddFacebook(...)` extension method in the `ConfigureServices` method of your [module](../Module-Development-Basics.md), to configure the client:
+
+````csharp
+context.Services.AddAuthentication()
+    .AddFacebook(facebook =>
+    {
+        facebook.AppId = "...";
+        facebook.AppSecret = "...";
+        facebook.Scope.Add("email");
+        facebook.Scope.Add("public_profile");
+    });
+````
+
+> It would be a better practice to use the `appsettings.json` or the ASP.NET Core User Secrets system to store your credentials, instead of a hard-coded value like that. Follow the [Microsoft's document](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins) to learn the user secrets usage.

docs/en/Authorization.md

@@ -284,8 +284,6 @@ You may need to check a policy/permission on the client side. For ASP.NET Core M
 abp.auth.isGranted('MyPermissionName');
 ```
 
-See [abp.auth](UI/AspNetCore/JavaScript-API/Index.md) API documentation for details.
-
 ## Permission Management
 
 Permission management is normally done by an admin user using the permission management modal:

docs/en/Background-Workers-Quartz.md

@@ -1,6 +1,6 @@
 # Quartz Background Worker Manager
 
-[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Worker.md). ABP simply integrates quartz.
+[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Workers.md). ABP simply integrates quartz.
 
 ## Installation
 
@@ -36,6 +36,9 @@ public class YourModule : AbpModule
 }
 ````
 
+> Quartz background worker integration provided `QuartzPeriodicBackgroundWorkerAdapter` to adapt `PeriodicBackgroundWorkerBase` and `AsyncPeriodicBackgroundWorkerBase` derived class. So, you can still fllow the [background workers document](Background-Workers.md) to define the background worker.
+> `BackgroundJobWorker` checks todo jobs every 5 seconds, but quartz will not block when long time jobs are executing. So,after Added Quartz background worker integration, you also need to add [Quartz Background Jobs](Background-Jobs-Quartz.md) or [Hangfire Background Jobs](Background-Jobs-Hangfire.md) to avoid duplicate execution jobs.
+
 ## Configuration
 
 See [Configuration](Background-Jobs-Quartz#Configuration).

docs/en/Best-Practices/Application-Services.md

@@ -206,7 +206,7 @@ This method votes a question and returns the current score of the question.
 
 #### Extra Properties
 
-* **Do** use either `MapExtraPropertiesTo` extension method ([see](Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
+* **Do** use either `MapExtraPropertiesTo` extension method ([see](../Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
 
 #### Manipulating / Deleting Entities
 

docs/en/Blob-Storing-Database.md

@@ -27,7 +27,7 @@ This command adds all the NuGet packages to corresponding layers of your solutio
 
 Here, all the NuGet packages defined by this provider;
 
-* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Domain.Shared)
+* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain.Shared)
 * [Volo.Abp.BlobStoring.Database.Domain](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain)
 * [Volo.Abp.BlobStoring.Database.EntityFrameworkCore](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.EntityFrameworkCore)
 * [Volo.Abp.BlobStoring.Database.MongoDB](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.MongoDB)

docs/en/Entity-Framework-Core-Migrations.md

@@ -2,7 +2,7 @@
 
 This document begins by **introducing the default structure** provided by [the application startup template](Startup-Templates/Application.md) and **discusses various scenarios** you may want to implement for your own application.
 
-> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Index.md).
+> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Part-1.md).
 
 ### Source Code
 

docs/en/Modules/Docs.md

@@ -613,7 +613,7 @@ Configure<DocsElasticSearchOptions>(options =>
 The `Index` is automatically created after the application starts if the `Index` does not exist.
 
 `DefaultElasticClientProvider` is responsible for creating `IElasticClient`. By default, it reads Elastic Search's `Url` from `IConfiguration`.
-If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](Dependency-Injection.md) system.
+If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](../Dependency-Injection.md) system.
 
 ```
 {

docs/en/Startup-Templates/Application.md

@@ -437,7 +437,11 @@ See the [Testing Overview](https://reactjs.org/docs/testing.html) document.
 * [Formik](https://github.com/jaredpalmer/formik) is used to build forms.
 * [Yup](https://github.com/jquense/yup) is used for form validations.
 
+## Social / External Logins
+
+If you want to configure social/external logins for your application, please follow the [Social/External Logins](../Authentication/Social-External-Logins.md) document.
+
 ## What's Next?
 
-- [The getting started document](../Getting-Started-With-Startup-Templates.md) explains how to create a new application in a few minutes.
-- [The application development tutorial](../Tutorials/Part-1) explains step by step application development.
+- [The getting started document](../Getting-Started.md) explains how to create a new application in a few minutes.
+- [The application development tutorial](../Tutorials/Part-1.md) explains step by step application development.

docs/en/Startup-Templates/Module.md

@@ -56,7 +56,7 @@ An `IssueType` enum and an `IssueConsts` class (which may have some constant fie
 
 ### .Domain Project
 
-This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), [value types](../Value-Types.md), [repository interfaces](../Repositories.md) and other domain objects.
+This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), value types, [repository interfaces](../Repositories.md) and other domain objects.
 
 An `Issue` entity, an `IssueManager` domain service and an `IIssueRepository` interface are good candidates for this project.
 

docs/en/Tutorials/Part-1.md

@@ -233,32 +233,30 @@ namespace Acme.BookStore
 
         public async Task SeedAsync(DataSeedContext context)
         {
-            if (await _bookRepository.GetCountAsync() > 0)
+            if (await _bookRepository.GetCountAsync() <= 0)
             {
-                return;
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "1984",
+                        Type = BookType.Dystopia,
+                        PublishDate = new DateTime(1949, 6, 8),
+                        Price = 19.84f
+                    },
+                    autoSave: true
+                );
+
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "The Hitchhiker's Guide to the Galaxy",
+                        Type = BookType.ScienceFiction,
+                        PublishDate = new DateTime(1995, 9, 27),
+                        Price = 42.0f
+                    },
+                    autoSave: true
+                );
             }
-
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "1984",
-                    Type = BookType.Dystopia,
-                    PublishDate = new DateTime(1949, 6, 8),
-                    Price = 19.84f
-                },
-                autoSave: true
-            );
-
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "The Hitchhiker's Guide to the Galaxy",
-                    Type = BookType.ScienceFiction,
-                    PublishDate = new DateTime(1995, 9, 27),
-                    Price = 42.0f
-                },
-                autoSave: true
-            );
         }
     }
 }

docs/en/Tutorials/Part-10.md

@@ -80,7 +80,7 @@ This is a typical migration problem and the decision depends on your case;
 * You can do it programmatically on data migration or seed phase.
 * You can manually handle it on the database.
 
-We prefer to delete the database {{if DB=="EF"}}(run the `Drop-Database` in the *Package Manager Console*){{end}} since this is just an example project and data loss is not important. Since this topic is not related to the ABP Framework, we don't go deeper for all the scenarios.
+We prefer to **delete the database** {{if DB=="EF"}}(run the `Drop-Database` in the *Package Manager Console*){{end}} since this is just an example project and data loss is not important. Since this topic is not related to the ABP Framework, we don't go deeper for all the scenarios.
 
 {{if DB=="EF"}}
 

docs/en/Tutorials/Part-8.md

@@ -439,55 +439,66 @@ namespace Acme.BookStore
 
         public async Task SeedAsync(DataSeedContext context)
         {
-            if (await _bookRepository.GetCountAsync() > 0)
+            if (await _bookRepository.GetCountAsync() <= 0)
             {
-                return;
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "1984",
+                        Type = BookType.Dystopia,
+                        PublishDate = new DateTime(1949, 6, 8),
+                        Price = 19.84f
+                    },
+                    autoSave: true
+                );
+
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "The Hitchhiker's Guide to the Galaxy",
+                        Type = BookType.ScienceFiction,
+                        PublishDate = new DateTime(1995, 9, 27),
+                        Price = 42.0f
+                    },
+                    autoSave: true
+                );
             }
 
             // ADDED SEED DATA FOR AUTHORS
-            
-            await _authorRepository.InsertAsync(
-                await _authorManager.CreateAsync(
-                    "George Orwell",
-                    new DateTime(1903, 06, 25),
-                    "Orwell produced literary criticism and poetry, fiction and polemical journalism; and is best known for the allegorical novella Animal Farm (1945) and the dystopian novel Nineteen Eighty-Four (1949)."
-                )
-            );
-
-            await _authorRepository.InsertAsync(
-                await _authorManager.CreateAsync(
-                    "Douglas Adams",
-                    new DateTime(1952, 03, 11),
-                    "Douglas Adams was an English author, screenwriter, essayist, humorist, satirist and dramatist. Adams was an advocate for environmentalism and conservation, a lover of fast cars, technological innovation and the Apple Macintosh, and a self-proclaimed 'radical atheist'."
-                )
-            );
 
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "1984",
-                    Type = BookType.Dystopia,
-                    PublishDate = new DateTime(1949, 6, 8),
-                    Price = 19.84f
-                },
-                autoSave: true
-            );
+            if (await _authorRepository.GetCountAsync() <= 0)
+            {
+                await _authorRepository.InsertAsync(
+                    await _authorManager.CreateAsync(
+                        "George Orwell",
+                        new DateTime(1903, 06, 25),
+                        "Orwell produced literary criticism and poetry, fiction and polemical journalism; and is best known for the allegorical novella Animal Farm (1945) and the dystopian novel Nineteen Eighty-Four (1949)."
+                    )
+                );
 
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "The Hitchhiker's Guide to the Galaxy",
-                    Type = BookType.ScienceFiction,
-                    PublishDate = new DateTime(1995, 9, 27),
-                    Price = 42.0f
-                },
-                autoSave: true
-            );
+                await _authorRepository.InsertAsync(
+                    await _authorManager.CreateAsync(
+                        "Douglas Adams",
+                        new DateTime(1952, 03, 11),
+                        "Douglas Adams was an English author, screenwriter, essayist, humorist, satirist and dramatist. Adams was an advocate for environmentalism and conservation, a lover of fast cars, technological innovation and the Apple Macintosh, and a self-proclaimed 'radical atheist'."
+                    )
+                );
+            }
         }
     }
 }
 ````
 
+{{if DB=="EF"}}
+
+You can now run the `.DbMigrator` console application to **migrate** the **database schema** and **seed** the initial data.
+
+{{else if DB=="Mongo"}}
+
+You can now run the `.DbMigrator` console application to **seed** the initial data.
+
+{{end}}
+
 ## Testing the Author Application Service
 
 Finally, we can write some tests for the `IAuthorAppService`. Add a new class, named `AuthorAppService_Tests` in the `Authors` namespace (folder) of the `Acme.BookStore.Application.Tests` project:

docs/en/docs-nav.json

@@ -107,6 +107,15 @@
       "text": "CLI",
       "path": "CLI.md"
     },
+    {
+      "text": "Authentication",
+      "items": [
+        {
+          "text": "Social/External Logins",
+          "path": "Authentication/Social-External-Logins.md"
+        }
+      ]
+    },
     {
       "text": "Fundamentals",
       "items": [

docs/zh-Hans/API/Application-Configuration.md

@@ -2,12 +2,12 @@
 
 ABP框架提供了一个预构建的标准端点,其中包含一些有关应用程序/服务的有用信息. 这里是此端点的一些基本信息的列表:
 
-* [本地化](Localization.md)值, 支持应用程序的当前语言.
-* 当前用户可用和已授予的[策略](Authorization.md)(权限).
-* 当前用户的[设置](Settings.md)值.
-* 关于[当前用户](CurrentUser.md)的信息 (如 id 和用户名).
-* 关于当前[租户](Multi-Tenancy.md)的信息 (如 id 和名称).
-* 当前用户的[时区](Timing.md)信息和应用程序的[时钟](Timing.md)类型.
+* [本地化](../Localization.md)值, 支持应用程序的当前语言.
+* 当前用户可用和已授予的[策略](../Authorization.md)(权限).
+* 当前用户的[设置](../Settings.md)值.
+* 关于[当前用户](../CurrentUser.md)的信息 (如 id 和用户名).
+* 关于当前[租户](../Multi-Tenancy.md)的信息 (如 id 和名称).
+* 当前用户的[时区](../Timing.md)信息和应用程序的[时钟](../Timing.md)类型.
 
 ## HTTP API
 

docs/zh-Hans/Authentication/Social-External-Logins.md

@@ -0,0 +1,30 @@
+# 社交/外部登录
+
+## ASP.NET Core MVC / Razor Pages UI
+
+[帐户模块](../Modules/Account.md)已配置为开箱即用的处理社交或外部登录. 你可以按照ASP.NET Core文档向你的应用程序添加社交/外部登录提供程序.
+
+### 示例: Facebook 认证
+
+按照[ASP.NET Core Facebook集成文档](https://docs.microsoft.com/zh-cn/aspnet/core/security/authentication/social/facebook-logins)向你应用程序添加Facebook登录.
+
+#### 添加NuGet包
+
+添加[Microsoft.AspNetCore.Authentication.Facebook]包到你的项目. 基于你的架构,可能是 `.Web`,`.IdentityServer`(对于分层启动)或 `.Host` 项目.
+
+#### 配置提供程序
+
+在你模块的 `ConfigureServices` 方法中使用 `.AddFacebook(...)` 扩展方法来配置客户端:
+
+````csharp
+context.Services.AddAuthentication()
+    .AddFacebook(facebook =>
+    {
+        facebook.AppId = "...";
+        facebook.AppSecret = "...";
+        facebook.Scope.Add("email");
+        facebook.Scope.Add("public_profile");
+    });
+````
+
+> 最佳实践是使用 `appsettings.json` 或ASP.NET Core用户机密系统来存储你的凭据,而不是像这样硬编码值. 请参阅[微软](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins)文档了解如何使用用户机密.

docs/zh-Hans/Authorization.md

@@ -285,8 +285,6 @@ public async Task CreateAsync(CreateAuthorDto input)
 abp.auth.isGranted('MyPermissionName');
 ````
 
-参阅 [abp.auth](AspNetCore/JavaScript-API/Auth.md) API 文档了解详情.
-
 ## 权限管理
 
 通常权限管理是管理员用户使用权限管理模态框进行授权:

docs/zh-Hans/Background-Workers-Quartz.md

@@ -36,6 +36,9 @@ public class YourModule : AbpModule
 }
 ````
 
+> Quartz后台工作者集成提供了 `QuartzPeriodicBackgroundWorkerAdapter` 来适配 `PeriodicBackgroundWorkerBase` 和 `AsyncPeriodicBackgroundWorkerBase` 派生类. 所以你依然可以按照[后台工作者文档](Background-Workers.md)来定义后台作业.
+> `BackgroundJobWorker` 每5秒检查待执行作业,但是长时间的作业不会阻塞quartz. 所以安装Quartz后台工作者集成后,你同时需要安装[Quartz后台作业](Background-Jobs-Quartz.md)或[Hangfire后台作业](Background-Jobs-Hangfire.md)以避免重复执行作业.
+
 ## 配置
 
 参阅[配置](Background-Jobs-Quartz.md#配置).

docs/zh-Hans/Best-Practices/Application-Services.md

@@ -203,7 +203,7 @@ Task<int> VoteAsync(Guid id, VoteType type);
 
 #### 额外的属性
 
-* **推荐** 使用 `MapExtraPropertiesTo` 扩展方法 ([参阅](Object-Extensions.md)) 或配置对象映射 (`MapExtraProperties`) 以允许应用开发人员能够扩展对象和服务.
+* **推荐** 使用 `MapExtraPropertiesTo` 扩展方法 ([参阅](../Object-Extensions.md)) 或配置对象映射 (`MapExtraProperties`) 以允许应用开发人员能够扩展对象和服务.
 
 #### 操作/删除 实体
 

docs/zh-Hans/Blob-Storing-Database.md

@@ -27,7 +27,7 @@ abp add-module Volo.Abp.BlobStoring.Database
 
 这里是此提供程序定义的所有包:
 
-* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Domain.Shared)
+* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain.Shared)
 * [Volo.Abp.BlobStoring.Database.Domain](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain)
 * [Volo.Abp.BlobStoring.Database.EntityFrameworkCore](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.EntityFrameworkCore)
 * [Volo.Abp.BlobStoring.Database.MongoDB](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.MongoDB)

docs/zh-Hans/CLI.md

@@ -90,9 +90,10 @@ abp new Acme.BookStore
   * **`console`**: [Console template](Startup-Templates/Console.md).
 * `--output-folder` 或者 `-o`: 指定输出文件夹,默认是当前目录.
 * `--version` 或者 `-v`: 指定ABP和模板的版本.它可以是 [release tag](https://github.com/abpframework/abp/releases) 或者 [branch name](https://github.com/abpframework/abp/branches). 如果没有指定,则使用最新版本.大多数情况下,你会希望使用最新的版本.
-* `--template-source` 或者 `-ts`: 指定自定义模板源用于生成项目,可以使用本地源和网络源(例如 `D\localTemplate` 或 `https://<your url>.zip`).
+* `--preview`: 使用最新的预发行版本 (仅在未指定 `--version` 且最新稳定版本之后至少有一个预发行版时).
+* `--template-source` 或者 `-ts`: 指定自定义模板源用于生成项目,可以使用本地源和网络源(例如 `D:\local-templat` 或 `https://.../my-template-file.zip`).
 * `--create-solution-folder` 或者 `-csf`: 指定项目是在输出文件夹中的新文件夹中还是直接在输出文件夹中.
-* `--connection-string` 或者 `-cs`:  重写所有 `appsettings.json` 文件的默认连接字符串. 默认连接字符串是 `Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true`. 如果你不想使用默认,你可以设置自己的连接字符串. 默认的数据库提供程序是 `SQL Server`, 所以你只能输入SQL Server连接字符串!
+* `--connection-string` 或者 `-cs`:  重写所有 `appsettings.json` 文件的默认连接字符串. 默认连接字符串是 `Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true`. 默认的数据库提供程序是 `SQL Server`. 如果你使用EF Core但需要更改DBMS,可以按[这里所述](Entity-Framework-Core-Other-DBMS.md)进行更改(创建解决方案之后).
 * `--local-framework-ref --abp-path`: 使用对项目的本地引用,而不是替换为NuGet包引用.
 
 ### add-package
@@ -173,15 +174,15 @@ abp update [options]
   
 ### 切换到每晚构建(预览)包
 
-想要切换到ABP框架的最新预览版可以使用此命令.
+想要切换到ABP框架的最新**每晚构建**预览版可以使用此命令.
 
 用法:
 
 ````bash
-abp switch-to-preview [options]
+abp switch-to-nightly [options]
 ````
 
-你也可以使用切换回稳定版本:
+你也可以使用切换回最新稳定版本:
 
 ````bash
 abp switch-to-stable [options]

docs/zh-Hans/Entity-Framework-Core-Migrations.md

@@ -3,7 +3,7 @@
 
 本文首先介绍[应用程序启动模板](Startup-Templates/Application.md)提供的**默认结构**,并讨论你可能希望为自己的应用程序实现的**各种场景**.
 
-> 本文档适用于希望完全理解和自定义[应用程序启动模板](Startup-Templates/Application.md)附带的数据库结构的人员. 如果你只是想创建实体和管理代码优先(code first)迁移,只需要遵循[启动教程](Tutorials/Index.md).
+> 本文档适用于希望完全理解和自定义[应用程序启动模板](Startup-Templates/Application.md)附带的数据库结构的人员. 如果你只是想创建实体和管理代码优先(code first)迁移,只需要遵循[启动教程](Tutorials/Part-1.md).
 
 ### 源码
 

docs/zh-Hans/Getting-Started-React-Native.md

@@ -0,0 +1,70 @@
+# React Native入门
+
+ABP平台提供了[React Native](https://reactnative.dev/)模板用于开发移动应用程序.
+
+当你按照[入门文档](Getting-Started.md)中所述**创建新应用程序**时,解决方案默认将React Native应用程序包含在 `react-native` 文件夹中.
+
+## 配置你的本地IP地址
+
+运行在Android模拟器或真机上的React Native应用程序无法连接到 `localhost` 上的后.要修复此问题,需要在本地IP上运行后端.
+
+{{ if Tiered == "No"}}
+![React Native host project local IP entry](images/rn-host-local-ip.png)
+
+* 打开 `.HttpApi.Host` 文件夹下的 `appsettings.json` 文件. 将  `SelfUrl` 和 `Authority` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.HttpApi.Host/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
+
+{{ else if Tiered == "Yes" }}
+
+![React Native tiered project local IP entry](images/rn-tiered-local-ip.png)
+
+* 打开 `.IdentityServer` 文件夹下的 `appsettings.json` 文件. 将 `SelfUrl` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.IdentityServer/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.HttpApi.Host` 文件夹下的 `appsettings.json` 文件. 将 `Authority` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.HttpApi.Host/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
+
+{{ end }}
+
+按照**运行HTTP API Host (服务端口)**那样运行后端.
+
+> React Native应用程序不信任自动生成的.NET HTTPS证书,你可以在开发期间使用HTTP.
+
+在 `react-native` 文件夹打开命令行终端,输入 `yarn` 命令(我们推荐使用[yarn](https://yarnpkg.com/)包管理, `npm install` 在大多数情况下也可以工作).
+
+```bash
+yarn
+```
+
+* 打开 `react-nativer` 文件夹下的 `Environment.js` 文件. 将 `apiUrl` 和 `issuer` 属性的 `localhost` 替换为你本地的IP地址:
+
+![react native environment local IP](images/rn-environment-local-ip.png)
+
+{{ if Tiered == "Yes" }}
+
+> 确保 `issuer` 与正在运行的 `.IdentityServer` 项目匹配, `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配.
+
+{{else}}
+
+> 确保 `issuer` 和 `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配
+
+{{ end }}
+
+等到所有node模块加载成功,  执行 `yarn start` (或 `npm start`) 命令:
+
+```bash
+yarn start
+```
+
+等待Expo CLI启动后Expo CLI在 `http://localhost:19002/` 地址要开管理页面.
+
+![expo-interface](images/rn-expo-interface.png)
+
+在上面的管理界面中,可以通过使用[Expo Client](https://expo.io/tools#client)扫描二维码,使用Android模拟器,iOS模拟器或真机来启动应用程序.
+
+> 请参阅expo.io上的[Android Studio模拟器](https://docs.expo.io/workflow/android-simulator/)和[iOS模拟器文档](https://docs.expo.io/workflow/ios-simulator/).
+
+![React Native login screen on iPhone 11](images/rn-login-iphone.png)
+
+输入用户名 **admin**,密码  **1q2w3E*** 登录到应用程序.
+
+应用程序已经启动并执行,你可以基于该启动模板开发应用程序.

docs/zh-Hans/Getting-Started.md

@@ -19,24 +19,27 @@
 
 你需要安装以下工具:
 
-* [Visual Studio 2019 (v16.4+)](https://visualstudio.microsoft.com/vs/) for Windows / [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
-* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/)
+* [Visual Studio 2019 (v16.4+)](https://visualstudio.microsoft.com/vs/) for Windows / [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).<sup id="a-editor">[1](#f-editor)</sup>
+* [.NET Core 3.1+](https://www.microsoft.com/net/download/dotnet-core/)
 
-* [Node v12+](https://nodejs.org)
+* [Node v12 或 v14](https://nodejs.org/en/)
 * [Yarn v1.19+](https://classic.yarnpkg.com/)
+* [Yarn v1.20+ (not v2)](https://classic.yarnpkg.com/en/docs/install) <sup id="a-yarn">[2](#f-yarn)</sup> 或 npm v6+ (与Node一起安装)
 {{ if Tiered == "Yes" }}
 
-* [Redis](https://redis.io/): 应用程序将Redis用作[分布式缓存](../Caching.md). 因此你需要安装并运行Redis.
+* [Redis](https://redis.io/): 入门解决方案将Redis用作[分布式缓存](Caching.md). 因此你需要安装并运行Redis.
 
 {{ end }}
 
-> 你可以也使用其他支持.NET Core 和 ASP.NET Core的编辑器.
+<sup id="f-editor"><b>1</b></sup> _只要支持.NET Core和ASP.NET Core,就可以使用其他编辑器代替Visual Studio._ <sup>[↩](#a-editor)</sup>
+
+<sup id="f-yarn"><b>2</b></sup> _Yarn v2 的工作方式不同,不受支持._ <sup>[↩](#a-yarn)</sup>
 
 ### 安装ABP CLI
 
-[ABP CLI](./CLI.md)是一个命令行页面,用于为基于ABP的应用程序验证和自动化一些任务.
+[ABP CLI](./CLI.md)是一个命令行页面,用于自动执行一些基于ABP的应用程序的常见任务.
 
-> ABP CLI是[ABP框架](https://abp.io/)一个免费开源的工具.
+> ABP CLI是ABP框架一个免费开源的工具.
 
 你需要使用以下命令安排ABP CLI:
 
@@ -59,10 +62,10 @@ dotnet tool update -g Volo.Abp.Cli
 使用ABP CLI的 `new` 命令创建新项目:
 
 ````shell
-abp new Acme.BookStore -t app{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes" && UI != "NG"}} --tiered {{else if Tiered == "Yes" && UI == "NG"}}--separate-identity-server{{end}}
+abp new Acme.BookStore{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes" && UI != "NG"}} --tiered {{else if Tiered == "Yes" && UI == "NG"}}--separate-identity-server{{end}}
 ````
 
-* `-t` 参数指定 [启动模板](Startup-Templates/Application.md) 名称. `app` 是一个启动模板名称,包含了预安装并且配置好的[ABP模块](Modules/Index.md).
+* 此命令还会在解决方案文件夹内创建一个React Native移动应用程序. 如果你不想要它,可以安全地删除它,或者在 `abp new` 命令中指定 `-m none` 选项,以使其完全不包含在解决方案中.
 
 {{ if UI == "NG" }}
 
@@ -70,7 +73,7 @@ abp new Acme.BookStore -t app{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mon
 
 {{ if Tiered == "Yes" }}
 
-* `--separate-identity-server` 参数用于将Identity服务器应用程序与API主机应用程序分隔开. 如果未指定,你将只有一个端点.
+* `--separate-identity-server` 参数用于将Identity服务器应用程序与API主机应用程序分隔开. 如果未指定,则服务器上将只有一个端点.
 
 {{ end }}
 
@@ -90,6 +93,12 @@ abp new Acme.BookStore -t app{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mon
 
 > 你可以使用不同级别的命令空间; 例如. BookStore, Acme.BookStore or Acme.Retail.BookStore.
 
+#### ABP CLI 命令 & 选项
+
+[ABP CLI文档](./CLI.md)涵盖了ABP CLI的所有可用命令和选项. 本文档使用[应用程序启动模板](Startup-Templates/Application.md)创建新的Web应用程序. 有关其他模板,请参见[ABP启动模板](Startup-Templates/Index.md)文档.
+
+> 或者,您可以从[ABP Framework网站](https://abp.io/get-started)中选择"直接下载"选项卡创建新的解决方案.
+
 ## 解决方案结构
 
 {{ if UI == "MVC" }}
@@ -146,7 +155,7 @@ abp new Acme.BookStore -t app{{if UI == "NG"}} -u angular {{end}}{{if DB == "Mon
 
 ## 创建数据库
 
-### 数据库连接字符串
+### 连接字符串
 
 检查 {{if UI == "MVC"}}{{if Tiered == "Yes"}}`.IdentityServer` 和 `.HttpApi.Host` 项目{{else}}`.Web` 项目{{end}}{{else if UI == "NG" }}`.HttpApi.Host` 项目{{end}}下 `appsettings.json` 文件中的 **链接字符串**:
 
@@ -214,7 +223,9 @@ Ef Core具有`Update-Database`命令, 可根据需要创建数据库并应用挂
 
 这将基于配置的连接字符串创建新数据库.
 
-> 使用`.Migrator`工具是建议的方法, 因为它还能初始化初始数据能够正确运行Web应用程序.
+> **使用`.DbMigrator`工具是建议的方法**, 因为它能初始化初始数据能够正确运行Web应用程序.
+>
+> 如果你只是使用 `Update-Database` 命令,你会得到一个空数据库,所以你无法登录到应用程序因为数据库中没有初始管理用户. 不需要种子数据库时,可以在开发期间使用 `Update-Database` 命令. 但是使用 `.DbMigrator` 应用程序会更简单,你始终可以使用它来迁移模式并为数据库添加种子.
 
 {{ else if DB == "Mongo" }}
 
@@ -240,7 +251,7 @@ Ef Core具有`Update-Database`命令, 可根据需要创建数据库并应用挂
 
  ![db-migrator-output](images/db-migrator-output.png)
 
-> 数据库创建后会初始化种子数据, 其中包含用于登录的 `admin` 用户. 所以你至少使用 `.DbMigrator` 一次.
+> 数据库创建后会初始化[种子数据](Data-Seeding.md), 其中包含用于登录的 `admin` 用户. 所以你至少使用 `.DbMigrator` 一次.
 
 {{ end }}
 
@@ -336,83 +347,18 @@ yarn start
 
 {{ end }}
 
-输入用户名 **admin**,密码 **1q2w3E*** 登录到应用程序.
-
-![bookstore-home](images/bookstore-home.png)
-
-应用程序已经启动并执行,你可以基于该启动模板开发应用程序.
+输入用户名 **admin**,密码 **1q2w3E*** 登录到应用程序,应用程序已经启动并执行,你可以基于此启动模板开始开发应用程序.
 
 #### 移动开发
 
-ABP平台提供了[React Native](https://reactnative.dev/)模板用于开发移动应用程序.
-
-> 该解决方案默认 `react-native` 包含了React Native应用程序,如果你不计划使用React Native开发移动应用程序,你可以忽略并删除 `react-native` 文件夹.
-
-运行在Android模拟器或真机上的React Native应用程序无法连接到 `localhost` 上的后.要修复此问题,需要在本地IP上运行后端.
-
-{{ if Tiered == "No"}}
-![React Native host project local IP entry](images/rn-host-local-ip.png)
-
-* 打开 `.HttpApi.Host` 文件夹下的 `appsettings.json` 文件. 将  `SelfUrl` 和 `Authority` 属性的 `localhost` 替换为你本地的IP地址.
-* 打开 `.HttpApi.Host/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
-
-{{ else if Tiered == "Yes" }}
-
-![React Native tiered project local IP entry](images/rn-tiered-local-ip.png)
-
-* 打开 `.IdentityServer` 文件夹下的 `appsettings.json` 文件. 将 `SelfUrl` 属性的 `localhost` 替换为你本地的IP地址.
-* 打开 `.IdentityServer/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
-* 打开 `.HttpApi.Host` 文件夹下的 `appsettings.json` 文件. 将 `Authority` 属性的 `localhost` 替换为你本地的IP地址.
-* 打开 `.HttpApi.Host/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
-
-{{ end }}
-
-按照**运行HTTP API Host (服务端口)**那样运行后端.
-
-> React Native应用程序不信任自动生成的.NET HTTPS证书,你可以在开发期间使用HTTP.
-
-在 `react-native` 文件夹打开命令行终端,输入 `yarn` 命令(我们推荐使用[yarn](https://yarnpkg.com/)包管理, `npm install` 在大多数情况下也可以工作).
-
-```bash
-yarn
-```
-
-* 打开 `react-nativer` 文件夹下的 `Environment.js` 文件. 将 `apiUrl` 和 `issuer` 属性的 `localhost` 替换为你本地的IP地址:
-
-![react native environment local IP](images/rn-environment-local-ip.png)
-
-{{ if Tiered == "Yes" }}
-
-> 确保 `issuer` 与正在运行的 `.IdentityServer` 项目匹配, `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配.
-
-{{else}}
-
-> 确保 `issuer` 和 `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配
-
-{{ end }}
-
-等到所有node模块加载成功,  执行 `yarn start` (或 `npm start`) 命令:
-
-```bash
-yarn start
-```
-
-等待Expo CLI启动后Expo CLI在 `http://localhost:19002/` 地址要开管理页面.
-
-![expo-interface](images/rn-expo-interface.png)
-
-在上面的管理界面中,可以通过使用[Expo Client](https://expo.io/tools#client)扫描二维码,使用Android模拟器,iOS模拟器或真机来启动应用程序.
-
-> 请参阅expo.io上的[Android Studio模拟器](https://docs.expo.io/workflow/android-simulator/)和[iOS模拟器文档](https://docs.expo.io/workflow/ios-simulator/).
-
-![React Native login screen on iPhone 11](images/rn-login-iphone.png)
+当你创建一个新的应用程序时.该解决方案默认包含 `react-native`文件夹. 这是一个基础的[React Native](https://reactnative.dev/)启动模板,用于开发与基于ABP的后端集成的移动应用程序.
 
-输入用户名 **admin**,密码  **1q2w3E*** 登录到应用程序.
+如果你不计划使用React Native开发移动应用程序,你可以忽略并删除 `react-native` 文件夹.
 
-应用程序已经启动并执行,你可以基于该启动模板开发应用程序.
+> 你可以在ABP CLI中指定 `-m none` 选项,以使 `react-native` 目录完全不包含在解决方案中
 
-> [应用程序启动模板](Startup-Templates/Application.md) 包含租户管理和Identity模块.
+请参阅"[React Native入门](Getting-Started-React-Native.md)"文档了解如何配置和运行React Native应用程序.
 
 ## 下一步是什么?
 
-[应用程序开发教程](Tutorials/Part-1.md)
+[Web应用程序开发教程](Tutorials/Part-1.md)

docs/zh-Hans/Index.md

@@ -4,23 +4,17 @@
 
 ABP是一个**开源应用程序框架**,专注于基于ASP.NET Core的Web应用程序开发,但也支持开发其他类型的应用程序.
 
-浏览左侧导航菜单以深入了解文档.
+浏览导航菜单以深入了解文档.
 
 ## 入门
 
-使用ABP开发新项目的最简单方法是使用启动模板:
+使用ABP开发新Web应用程序的最简单方法是使用[入门](Getting-Started.md)教程:
 
-* [ASP.NET Core MVC (Razor Pages) UI 启动模板](Getting-Started.md?UI=MVC&DB=EF&Tiered=No)
-* [Angular UI 启动模板](Getting-Started.md?UI=NG&DB=EF&Tiered=No)
-
-如果你想从头开始(使用空项目),请手动安装ABP框架并使用以下教程:
-
-* [控制台应用程序](Getting-Started-Console-Application.md)
-* [ASP.NET Core Web 应用程序](Getting-Started-AspNetCore-Application.md)
+然后你可以继续进行[Web应用程序开发教程](Tutorials/Part-1.md).
 
 ## 源码
 
-ABP托管在GitHub上, 参见[源代码](https://github.com/abpframework/abp).
+ABP托管在GitHub上, 参见[源代码](https://github.com/abpframework).
 
 ## 贡献代码
 

docs/zh-Hans/Modules/Docs.md

@@ -611,7 +611,7 @@ Configure<DocsElasticSearchOptions>(options =>
 应用程序启动后如果`Index`不存在则会自动创建`Index`.
 
 `DefaultElasticClientProvider`负责创建`IElasticClient`, 默认情况下它会从`IConfiguration`中读取Elastic Search的`Url`.
-如果你的IElasticClient需要其它配置请使用重写IElasticClientProvider服务并在依赖注入系统中替换它.
+如果你的 `IElasticClient` 需要其它配置请使用重写 `IElasticClientProvider` 服务并在[依赖注入](../Dependency-Injection.md)系统中替换它.
 ```
 {
   "ElasticSearch": {

docs/zh-Hans/Modules/Identity.md

@@ -1,3 +1,5 @@
 # 身份管理模块
 
+身份模块基于Microsoft Identity 库用于管理[组织单元](Organization-Units.md), 角色, 用户和他们的权限.
+
 参阅 [源码](https://github.com/abpframework/abp/tree/dev/modules/identity). 文档很快会被完善.

docs/zh-Hans/Modules/Index.md

@@ -17,7 +17,7 @@ ABP是一个 **模块化的应用程序框架** 由十多个 **nuget packages**
 * **Blogging**: 用于创建精美的博客. ABP的[博客](https://blog.abp.io/) 就使用了此模块.
 * [**Docs**](Docs.md): 用于创建技术文档页面. ABP的[文档](https://abp.io/documents/) 就使用了此模块.
 * **Feature Management**: 用于保存和管理功能.
-* **Identity**: 基于Microsoft Identity管理角色,用户和他们的权限.
+* [**Identity**](Identity.md): 基于Microsoft Identity管理组织单元,角色,用户和他们的权限.
 * **Identity Server**: 集成了IdentityServer4.
 * **Permission Management**: 用于保存权限.
 * **Setting Management**: 用于保存设置.

docs/zh-Hans/Modules/Organization-Units.md

@@ -0,0 +1,47 @@
+# 组织单元管理
+
+组织单元(OU)是"身份模块"的一部分,用于**对用户和实体进行分层分组**.
+
+### OrganizationUnit 实体
+
+OU由 **OrganizationUnit** 实体表示. 实体有以下基本属性:
+
+- **TenantId**: OU租户的ID,为null代表是宿主OU.
+- **ParentId**: OU的父亲Id,为null为根OU.
+- **Code**: 租户唯一的分层字符串代码.
+- **DisplayName**: OU的显示名称.
+
+OrganizationUnit实体的主键(Id)是 **Guid** 类型,派生自[**FullAuditedAggregateRoot**](../Entities.md)类.
+
+#### Organization 树
+
+因为OU可以有父亲,租户所有的OU是一个**树**结构. 树有一些规则:
+
+- 可以有多个根(`ParentId` 为 `null`).
+- OU的第一级子级数有限制(面说明的固定OU代码单位长度).
+
+#### OU Code
+
+OU代码由OrganizationUnit Manager自动生成和维护. 看起来像这样的字符串:
+
+"**00001.00042.00005**"
+
+此代码可用于轻松查询数据库中OU的所有子级(递归). 代码有一些规则:
+
+- 必须[租户](../Multi-Tenancy.md)**唯一**的.
+- 同一OU的所有子代均以**父OU的代码开头**.
+- 它是**固定长度**的,并且基于树中OU的级别,如示例中所示.
+- 虽然OU代码是唯一的,但是如果移动OU,它是**可更改的**.
+- 你必须通过Id而不是代码引用OU.
+
+### OrganizationUnit Manager
+
+可以注入 **OrganizationUnitManager** 管理OU. 常见的用例有:
+
+- 创建,更改或删除OU.
+- 在OU树中移动OU.
+- 获取有关OU树及其项的信息
+
+#### 多租户
+
+`OrganizationUnitManager` 设置为一次性为 **单个租户** 工作,默认是 **当前租户**.

docs/zh-Hans/Nightly-Builds.md

@@ -29,13 +29,13 @@
 预览NPM包的最新版本可以通过在应用程序的根文件夹命令运行命令安装:
 
 ```bash
-abp switch-to-preview
+abp switch-to-preview --npm
 ```
 
 如果你正在使用ABP框架预览包,你可以使用此命令切换回稳定版本:
 
 ```bash
-abp switch-to-stable
+abp switch-to-stable --npm
 ```
 
 参阅 [ABP CLI 文档](./CLI.md) 了解更多信息.

docs/zh-Hans/Options.md

@@ -82,7 +82,7 @@ public class MyService : ITransientDependency
 
 对于此类情况,ABP为 `IServiceCollection` 引入了 `PreConfigure<TOptions>` 和 `ExecutePreConfiguredActions<TOptions>` 扩展方法. 该模式的工作原理如下所述.
 
-1. 你的模块中定义计划选项类. 例:
+在你的模块中定义预先选项类. 例:
 
 ````csharp
 public class MyPreOptions

docs/zh-Hans/Repositories.md

@@ -193,8 +193,6 @@ var people = ((IMongoQueryable<Person>)_personRepository
 
 ### 选项-3: IAsyncQueryableExecuter
 
-> 注意,此功能在ABP框架3.0以之后的版本可用,虽然它也可以用于较早的版本,但它提供的方法非常有限.
-
 `IAsyncQueryableExecuter` 是一个用于异步执行 `IQueryable<T>` 对象的服务,**不依赖于实际的数据库提供程序**.
 
 **示例: 注入并使用 `IAsyncQueryableExecuter.ToListAsync()` 方法**

docs/zh-Hans/Road-Map.md

@@ -9,7 +9,6 @@
 
 除了中期目录,还有一些[积压](https://github.com/abpframework/abp/milestone/2)的功能, 这里积压中重要功能的列表:
 
-* [#4098](https://github.com/abpframework/abp/issues/4098) / Blob存储Azure提供者.
 * [#2882](https://github.com/abpframework/abp/issues/2882) / 提供 **gRPC集成** 基础设施 (虽然[已经可以](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo)为你的应用程序创建和使用gRPC端点,但我们计划为所有[标准应用程序模块](https://docs.abp.io/en/abp/latest/Modules/Index)创建端点)
 * [#236](https://github.com/abpframework/abp/issues/236) 基于权限系统的资源
 * [#1754](https://github.com/abpframework/abp/issues/1754) / 多语言实体

docs/zh-Hans/Samples/Index.md

@@ -7,7 +7,7 @@
 演示如何基于微服务体系结构构建系统的完整解决方案.
 
 * [示例的文档](Microservice-Demo.md)
-* [源码](https://github.com/abpframework/abp/tree/dev/samples/MicroserviceDemo)
+* [源码](https://github.com/abpframework/abp-samples/tree/master/MicroserviceDemo)
 * [微服务架构文档](../Microservice-Architecture.md)
 
 ### Book Store
@@ -48,6 +48,8 @@
 * **文本模板 Demo**: 文本模板系统的不同用例.
   * [源码](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo)
   * [文本模板文档](../Text-Templating.md)
+* **存储过程 Demo**: 演示如何以最佳实践使用存储过程,数据库视图和函数.
+  * [源码](https://github.com/abpframework/abp-samples/tree/master/StoredProcedureDemo)
 * **自定义认证**: 如何为ASP.NET Core MVC / Razor Pages应用程序自定义身份验证的解决方案.
   * [源码](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization)
   * 相关 "[How To](../How-To/Index.md)" 文档:

docs/zh-Hans/Samples/Microservice-Demo.md

@@ -28,7 +28,7 @@ ABP框架的主要目标之一就是提供[便捷的基础设施来创建微服
 
 ### 源码
 
-你可以从[GitHub仓库](https://github.com/abpframework/abp/tree/master/samples/MicroserviceDemo)获取源码.
+你可以从[GitHub仓库](https://github.com/abpframework/abp-samples/tree/master/MicroserviceDemo)获取源码.
 
 ## 运行解决方案
 
@@ -43,6 +43,12 @@ ABP框架的主要目标之一就是提供[便捷的基础设施来创建微服
 * [ElasticSearch](https://www.elastic.co/downloads/elasticsearch) 6.6+
 * [Kibana](https://www.elastic.co/downloads/kibana) 6.6+ (可选,建议显示日志)
 
+### 运行基础设施
+
+- 默认情况下运行Docker-compose可以轻松运行预先要求. 如果你没有安装,在windows环境下你可以在[这里](https://docs.docker.com/docker-for-windows/install/)下载并使用[Docker for Windows](https://docs.docker.com/docker-for-windows/).
+* 在 `MicroserviceDemo` 目录下运行命令 `docker-compose -f docker-compose.infrastructure.yml -f docker-compose.infrastructure.override.yml up -d` 或使用powershell运行 `MicroserviceDemo/_run` 文件夹下的 `__Run_Infrastructure.ps1` 脚本.
+* 如果你不想使用docker运行预先要求的服务在你的本地环境,你需要更改微服务示例解决方案项目中的 `appsettings.json` 文件.
+
 ### 打开并构建Visual Studio解决方案
 
 * 在Visual Studio 2017 (15.9.0+)中打开`samples\MicroserviceDemo\MicroserviceDemo.sln`.

docs/zh-Hans/SignalR-Integration.md

@@ -115,7 +115,7 @@ public class MessagingHub : Hub
 }
 ````
 
-`MessasingHub` 集线器的路由为 `/signalr-hubs/messasing`:
+`MessagingHub` 集线器的路由为 `/signalr-hubs/messaging`:
 
 * 添加了标准 `/signalr-hubs/` 前缀.
 * 使用**驼峰命名**集线器名称,不包含 `Hub` 后缀.
@@ -123,7 +123,7 @@ public class MessagingHub : Hub
 如果你想指定路由,你可以使用 `HubRoute` attribute:
 
 ````csharp
-[HubRoute("/my-messasing-hub")]
+[HubRoute("/my-messaging-hub")]
 public class MessagingHub : Hub
 {
     //...

docs/zh-Hans/Startup-Templates/Application.md

@@ -423,7 +423,11 @@ Screens 是通过在 `src/screens` 文件夹中创建将名称分开的文件夹
 * [Formik](https://github.com/jaredpalmer/formik) 用于构建表单.
 * [Yup](https://github.com/jquense/yup) 用于表单验证.
 
+## 社交/外部登录
+
+如果你想要为你的应用程序配置社交/外部登录,请参阅[社交/外部登录](../Authentication/Social-External-Logins.md)文档.
+
 ## 下一步是什么?
 
-* 参阅[ASP.NET Core MVC 模板入门](../Getting-Started-AspNetCore-MVC-Template.md)创建此模板的新解决方案并运行它.
-* 参阅[ASP.NET Core MVC 教程](../Tutorials/AspNetCore-Mvc/Part-I.md)学习使用此模板开发应用程序.
+* [入门文档](../Getting-Started.md)介绍了如何在几分钟内创建新应用程序.
+* [Web应用程序开发教程](../Tutorials/Part-1.md)逐步介绍了应用程序开发.

docs/zh-Hans/Startup-Templates/Module.md

@@ -56,7 +56,7 @@ abp new Acme.IssueManagement -t module --no-ui
 
 ### .Domain 项目
 
-解决方案的领域层. 它主要包含 [实体, 集合根](../Entities.md), [领域服务](../Domain-Services.md), [值类型](../Value-Types.md), [仓储接口](../Repositories.md) 和解决方案的其他领域对象.
+解决方案的领域层. 它主要包含 [实体, 集合根](../Entities.md), [领域服务](../Domain-Services.md), 值类型, [仓储接口](../Repositories.md) 和解决方案的其他领域对象.
 
 例如 `Issue` 实体, `IssueManager` 领域服务和 `IIssueRepository` 接口都适合放在这个项目中.
 

docs/zh-Hans/Text-Templating.md

@@ -4,7 +4,7 @@
 
 ABP框架提供了一个简单有效的文本模板系统,文本模板用于动态渲染基于模板和模型(数据对象)内容:
 
-***TEMPLATE + MODEL ==render==> RENDERED CONTENT***
+Template + Model =renderer=> Rendered Content
 
 它非常类似于 ASP.NET Core Razor View (或 Page):
 

docs/zh-Hans/Tutorials/Part-10.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/Tutorials/Part-4.md

@@ -0,0 +1,255 @@
+# Web应用程序开发教程 - 第三章: 集成测试
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## 关于本教程
+
+在本系列教程中, 你将构建一个名为 `Acme.BookStore` 的用于管理书籍及其作者列表的基于ABP的应用程序.  它是使用以下技术开发的:
+
+* **{{DB_Text}}** 做为ORM提供程序.
+* **{{UI_Value}}** 做为UI框架.
+
+本教程分为以下部分:
+
+- [Part 1: 创建服务端](Part-1.md)
+- [Part 2: 图书列表页面](Part-2.md)
+- [Part 3: 创建,更新和删除图书](Part-3.md)
+- **Part 4: 集成测试**(本章)
+- [Part 5: 授权](Part-5.md)
+- [Part 6: 作者: 领域层](Part-6.md)
+- [Part 7: 作者: 数据库集成](Part-7.md)
+- [Part 8: 作者: 应用服务层](Part-8.md)
+- [Part 9: 作者: 用户页面](Part-9.md)
+- [Part 10: 图书到作者的关系](Part-10.md)
+
+## 下载源码
+
+本教程根据你的**UI** 和 **Database**偏好有多个版,我们准备了两种可供下载的源码组合:
+
+* [MVC (Razor Pages) UI 与 EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI 与 MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## 解决方案中的测试项目
+
+这一部分涵盖了 **服务器端** 测试. 解决方案中有多个测试项目:
+
+![bookstore-test-projects-v2](./images/bookstore-test-projects-{{UI_Text}}.png)
+
+每个项目用于测试相关的应用程序项目.测试项目使用以下库进行测试:
+
+* [xunit](https://xunit.github.io/) 作为主测试框架.
+* [Shoudly](http://shouldly.readthedocs.io/en/latest/) 作为断言库.
+* [NSubstitute](http://nsubstitute.github.io/) 作为模拟库.
+
+{{if DB=="EF"}}
+
+> 测试项目配置为使用 **SQLite内存** 作为数据库. 创建一个单独的数据库实例并使用数据种子系统进行初始化种子数据,为每个测试准备一个新的数据库.
+
+{{else if DB=="Mongo"}}
+
+> **[Mongo2Go](https://github.com/Mongo2Go/Mongo2Go)**库用于模拟MongoDB数据库. 创建一个单独的数据库实例并使用数据种子系统进行初始化种子数据,为每个测试准备一个新的数据库.
+
+{{end}}
+
+## 添加测试数据
+
+如果你已经按照[第一部分](Part-1.md)中的描述创建了数据种子贡献者,则相同的数据也在测试中可用. 因此你可以跳过此部分. 如果你尚未创建种子贡献者,可以使用 `BookStoreTestDataSeedContributor` 来为要在以下测试中使用的相同数据提供种子.
+
+## 测试 BookAppService
+
+在 `Acme.BookStore.Application.Tests` 项目中创建一个名叫 `BookAppService_Tests` 的测试类:
+
+````csharp
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Application.Dtos;
+using Xunit;
+
+namespace Acme.BookStore.Books
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
+    public class BookAppService_Tests : BookStoreApplicationTestBase
+    {
+        private readonly IBookAppService _bookAppService;
+
+        public BookAppService_Tests()
+        {
+            _bookAppService = GetRequiredService<IBookAppService>();
+        }
+
+        [Fact]
+        public async Task Should_Get_List_Of_Books()
+        {
+            //Act
+            var result = await _bookAppService.GetListAsync(
+                new PagedAndSortedResultRequestDto()
+            );
+
+            //Assert
+            result.TotalCount.ShouldBeGreaterThan(0);
+            result.Items.ShouldContain(b => b.Name == "1984");
+        }
+    }
+}
+````
+
+* 测试方法 `Should_Get_List_Of_Books` 直接使用 `BookAppService.GetListAsync` 方法来获取用户列表,并执行检查.
+* 我们可以安全地检查 "1984" 这本书的名称,因为我们知道这本书可以在数据库中找到,我们已将其添加到种子数据中.
+
+新增测试方法,用以测试创建一个**合法**book实体的场景:
+
+````csharp
+[Fact]
+public async Task Should_Create_A_Valid_Book()
+{
+    //Act
+    var result = await _bookAppService.CreateAsync(
+        new CreateUpdateBookDto
+        {
+            Name = "New test book 42",
+            Price = 10,
+            PublishDate = System.DateTime.Now,
+            Type = BookType.ScienceFiction
+        }
+    );
+
+    //Assert
+    result.Id.ShouldNotBe(Guid.Empty);
+    result.Name.ShouldBe("New test book 42");
+}
+````
+
+新增测试方法,用以测试创建一个非法book实体失败的场景:
+
+````csharp
+[Fact]
+public async Task Should_Not_Create_A_Book_Without_Name()
+{
+    var exception = await Assert.ThrowsAsync<AbpValidationException>(async () =>
+    {
+        await _bookAppService.CreateAsync(
+            new CreateUpdateBookDto
+            {
+                Name = "",
+                Price = 10,
+                PublishDate = DateTime.Now,
+                Type = BookType.ScienceFiction
+            }
+        );
+    });
+
+    exception.ValidationErrors
+        .ShouldContain(err => err.MemberNames.Any(mem => mem == "Name"));
+}
+````
+
+* 由于 `Name` 是空值, ABP 抛出一个 `AbpValidationException` 异常.
+
+最终的测试类如下所示:
+
+````csharp
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Validation;
+using Xunit;
+
+namespace Acme.BookStore.Books
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
+    public class BookAppService_Tests : BookStoreApplicationTestBase
+    {
+        private readonly IBookAppService _bookAppService;
+
+        public BookAppService_Tests()
+        {
+            _bookAppService = GetRequiredService<IBookAppService>();
+        }
+
+        [Fact]
+        public async Task Should_Get_List_Of_Books()
+        {
+            //Act
+            var result = await _bookAppService.GetListAsync(
+                new PagedAndSortedResultRequestDto()
+            );
+
+            //Assert
+            result.TotalCount.ShouldBeGreaterThan(0);
+            result.Items.ShouldContain(b => b.Name == "1984");
+        }
+        
+        [Fact]
+        public async Task Should_Create_A_Valid_Book()
+        {
+            //Act
+            var result = await _bookAppService.CreateAsync(
+                new CreateUpdateBookDto
+                {
+                    Name = "New test book 42",
+                    Price = 10,
+                    PublishDate = System.DateTime.Now,
+                    Type = BookType.ScienceFiction
+                }
+            );
+
+            //Assert
+            result.Id.ShouldNotBe(Guid.Empty);
+            result.Name.ShouldBe("New test book 42");
+        }
+        
+        [Fact]
+        public async Task Should_Not_Create_A_Book_Without_Name()
+        {
+            var exception = await Assert.ThrowsAsync<AbpValidationException>(async () =>
+            {
+                await _bookAppService.CreateAsync(
+                    new CreateUpdateBookDto
+                    {
+                        Name = "",
+                        Price = 10,
+                        PublishDate = DateTime.Now,
+                        Type = BookType.ScienceFiction
+                    }
+                );
+            });
+
+            exception.ValidationErrors
+                .ShouldContain(err => err.MemberNames.Any(mem => mem == "Name"));
+        }
+    }
+}
+````
+
+打开**测试资源管理器**(测试 -> Windows -> 测试资源管理器)并**执行**所有测试:
+
+![bookstore-appservice-tests](./images/bookstore-appservice-tests.png)
+
+恭喜你, **绿色图标**表示测试已成功通过!
+
+## 下一章
+
+查看本教程的[下一章](Part-5.md).

docs/zh-Hans/Tutorials/Part-5.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/Tutorials/Part-6.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/Tutorials/Part-7.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/Tutorials/Part-8.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/Tutorials/Part-9.md

@@ -0,0 +1 @@
+TODO..

docs/zh-Hans/UI/Angular/Custom-Setting-Page.md

@@ -2,38 +2,33 @@
 
 不同的模块提供它们的设置选项卡. 你可以通过3个步骤在项目中自定义设置页面.
 
-1. 创建一个组件
+1. 使用以下命令创建一个组件
 
-```js
-import { Select } from '@ngxs/store';
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-your-custom-settings',
-  template: `
-    custom-settings works! 
-  `,
-})
-export class YourCustomSettingsComponent {
-  // Your component logic
-}
+```bash
+yarn ng generate component my-settings
 ```
 
-2. 添加 `YourCustomSettingsComponent` 到 `AppModule` 中的 `declarations`和 `entryComponents` 数组中.
-
-3. 打开 `app.component.ts` 在 `ngOnInit` 添加以下内容:
+2. 打开 `app.component.ts` 做以下修改:
 
 ```js
-import { addSettingTab } from '@abp/ng.theme.shared';
-// ...
-
-ngOnInit() {
-  addSettingTab({
-    component: YourCustomSettingsComponent,
-    name: 'Type here the setting tab title (you can type a localization key, e.g: AbpAccount::Login',
-    order: 4,
-    requiredPolicy: 'type here a policy key'
-  });
+import { Component } from '@angular/core';
+import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService
+import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent
+
+@Component(/* component metadata */)
+export class AppComponent {
+  constructor(private settingTabs: SettingTabsService) // injected MySettingsComponent
+  {
+    // added below
+    settingTabs.add([
+      {
+        name: 'MySettings',
+        order: 1,
+        requiredPolicy: 'policy key here',
+        component: MySettingsComponent,
+      },
+    ]);
+  }
 }
 ```
 

docs/zh-Hans/UI/Angular/Localization.md

@@ -146,16 +146,6 @@ this.store.selectSnapshot(
         "build": {
           "options": {
             "styles": [
-              {
-                "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css",
-                "inject": false,
-                "bundleName": "bootstrap-rtl.min"
-              },
-              {
-                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
-                "inject": true,
-                "bundleName": "bootstrap-ltr.min"
-              },
               {
                 "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                 "inject": true,
@@ -166,6 +156,16 @@ this.store.selectSnapshot(
                 "inject": true,
                 "bundleName": "fontawesome-v4-shims.min"
               },
+              {
+                "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css",
+                "inject": false,
+                "bundleName": "bootstrap-rtl.min"
+              },
+              {
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap-ltr.min"
+              },
               "apps/dev-app/src/styles.scss"
             ],
           }
@@ -174,6 +174,7 @@ this.store.selectSnapshot(
     }
   }
 }
+```
 
 #### 步骤 2. 清除AppComponent中延迟加载的Fontawesome
 
@@ -192,6 +193,32 @@ import { Component } from '@angular/core';
 export class AppComponent {}
 ```
 
+## 文化名称到语言环境文件名的映射
+
+.NET中定义的某些文化名称与Angular语言环境不匹配. 在这种情况下Angular应用程序在运行时会引发如下错误:
+
+![locale-error](./images/locale-error.png)
+
+如果你看到这样的错误,你应该像下面这样传递 `cultureNameToLocaleFileNameMapping` 属性到CoreModule的forRoot静态方法.
+
+```js
+// app.module.ts
+
+@NgModule({
+  imports: [
+    // other imports
+     CoreModule.forRoot({
+      // other options
+      cultureNameToLocaleFileNameMapping: { 
+        "DotnetCultureName": "AngularLocaleFileName",
+        "pt-BR": "pt"  // example
+      }
+    })
+    //...
+```
+
+查看 [Angular中所有的语言环境文件](https://github.com/angular/angular/tree/master/packages/common/locales).
+
 ## 另请参阅
 
 * [ASP.NET Core中的本地化](../../Localization.md)

docs/zh-Hans/UI/Angular/Migration-Guide-v3.md

@@ -18,7 +18,7 @@ yarn ng update @angular/cli @angular/core --force
 
 - 更新你的package.json并安装新的软件包
 - 修改tsconfig.json文件创建一个"Solution Style"配置
-- 重命名 `browserlist` 为 `.browserlistrc`
+- 重命名 `browserslist` 为 `.browserslistrc`
 
 另一方面,如果你单独使用 `yarn ng update` 命令检查首先要更新哪些包会更好. Angular会给你一个要更新的包列表.
 
@@ -144,42 +144,33 @@ export class AppModule {}
 AppRoutingModule:
 
 ```js
-import { DynamicLayoutComponent } from '@abp/ng.core';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 const routes: Routes = [
   {
     path: '',
-    component: DynamicLayoutComponent,
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        loadChildren: () => import('./home/home.module')
-          .then(m => m.HomeModule),
-      },
-      {
-        path: 'account',
-        loadChildren: () => import('@abp/ng.account')
-          .then(m => m.AccountModule.forLazy({ redirectUrl: '/' })),
-      },
-      {
-        path: 'identity',
-        loadChildren: () => import('@abp/ng.identity')
-          .then(m => m.IdentityModule.forLazy()),
-      },
-      {
-        path: 'tenant-management',
-        loadChildren: () => import('@abp/ng.tenant-management')
-          .then(m => m.TenantManagementModule.forLazy()),
-      },
-      {
-        path: 'setting-management',
-        loadChildren: () => import('@abp/ng.setting-management')
-          .then(m => m.SettingManagementModule.forLazy()),
-      },
-    ],
+    pathMatch: 'full',
+    loadChildren: () => import('./home/home.module').then(m => m.HomeModule),
+  },
+  {
+    path: 'account',
+    loadChildren: () =>
+      import('@abp/ng.account').then(m => m.AccountModule.forLazy({ redirectUrl: '/' })),
+  },
+  {
+    path: 'identity',
+    loadChildren: () => import('@abp/ng.identity').then(m => m.IdentityModule.forLazy()),
+  },
+  {
+    path: 'tenant-management',
+    loadChildren: () =>
+      import('@abp/ng.tenant-management').then(m => m.TenantManagementModule.forLazy()),
+  },
+  {
+    path: 'setting-management',
+    loadChildren: () =>
+      import('@abp/ng.setting-management').then(m => m.SettingManagementModule.forLazy()),
   },
 ];
 
@@ -190,7 +181,7 @@ const routes: Routes = [
 export class AppRoutingModule {}
 ```
 
-> 你可能已经注意到我们在top级别路由组件上使用了 `DynamicLayoutComponent`. 我们这样做是为了避免不必要的渲染和闪烁. 这不是强制的,但是我们建议在你的应用程序路由中做同样的事情.
+> 你可能已经注意到我们在AppComponent模板中使用了 `<abp-dynamic-layout>` 而不是 `<router-outlet>`. 我们这样做是为了避免不必要的渲染和闪烁. 这不是强制的,但是我们建议在你的应用程序路由中做同样的事情.
 
 #### 如何迁移?
 
@@ -200,7 +191,7 @@ export class AppRoutingModule {}
 - 调用 `ThemeBasicModule` 的静态 `forRoot` 方法(或商业上的 `ThemeLeptonModule`),并从导入中删除 `SharedModule`(除非已在其中添加了根模块所需的任何内容).
 - 在app路由模块中直接导入延迟ABP模块 (如 `() => import('@abp/ng.identity').then(...)`).
 - 在所有延迟模块 `then` 中调用的静态 `forLazy` 方法,即使配置没有被传递.
-- [可选]使用 `DynamicLayoutComponent` 添加空的父路由,获得更好的性能和UX.
+- [可选]添加 `<abp-dynamic-layout></abp-dynamic-layout>` 到AppComponent模板并且删除 `<router-outlet></router-outlet>`,获得更好的性能和UX.
 
 ### RoutesService
 
@@ -233,9 +224,10 @@ export class AppRoutingModule {}
 
 从ABP v3开始,我们已切换到经过严格测试,执行良好的数据表格:[ngx-datatable](https://github.com/swimlane/ngx-datatable). 所有的ABP模块都已经实现了ngx-datatable. `ThemeSharedModule` 已经导出了 `NgxDatatableModule`. 因此如果你在终端运行 `yarn add @swimlane/ngx-datatable` 来安装这个包,它将在你的应用的所有模块中可用.
 
-为了正确设置样式,你需要在angular.json文件的样式部分中添加以下内容:
+为了正确设置样式,你需要在angular.json文件的样式部分中添加以下内容(在其他所有元素之上):
 
 ```json
+"styles": [
   {
     "input": "node_modules/@swimlane/ngx-datatable/index.css",
     "inject": true,
@@ -250,7 +242,9 @@ export class AppRoutingModule {}
     "input": "node_modules/@swimlane/ngx-datatable/themes/material.css",
     "inject": true,
     "bundleName": "ngx-datatable-material"
-  }
+  },
+  // other styles
+]
 ```
 
 由于尚未删除 `abp-table`, 因此以前由ABP v2.x构建的模块不会突然丢失所有. 但是它们的外观与内置ABP v3模块有所不同, 因此你可能希望将这些模块中的表转换为ngx-datatable. 为了减少将abp-table转换为ngx-datatable所需的工作量,我们修改了 `ListService` 以使其与 `ngx-datatable` 一起很好地工作,并引入了两个新指令: `NgxDatatableListDirective` 和 `NgxDatatableDefaultDirective`.
@@ -348,7 +342,103 @@ export class SomeComponent {
 - 如果可以的话,根据上面的例子更新你的模.
 - 如果你稍后需要这样做,并且打算保留abp-table一段时间,请确保根据此处描述的[破坏性更改](List-Service.md)更新分页.
 
-**重要说明:**abp-table没有被删除,但已被弃用并在以后的版本中删除. 请考虑切换到ngx-datatable。
+**重要说明:**abp-table没有被删除,但已被弃用并在以后的版本中删除. 请考虑切换到ngx-datatable.
+
+### 扩展系统[商业版]
+
+扩展程序系统现在是开源的, 可以从 `@abp/ng.theme.shared/extensions` 而不是从 `@volo/abp.commercial.ng.ui` 中获取. 同样,根据config软件包的新结构,如上所述通过 `forLazy` 静态方法进行配置.
+
+#### 如何迁移?
+
+如果你以前从未使用过扩展系统,则无需执行任何操作. 否则请再次检查文档以查看更改. 扩展系统本身的工作原理与以前相同,唯一的变化是你从中导入的包,静态方法以及您将贡献者传递给的模块.
+
+
+### Lepton 主题Logo [商业版]
+
+在ABP v2.x中,Lepton每个颜色主题都有一个亮徽标和一个暗徽标. 我们意识到我们可以使它仅使用一个浅色和一个深色徽标. 因此我们更改了Lepton查找徽标图像的方式,现在你只需要在项目中包含 `logo-light.png` 和 `logo-dark.png`.
+
+#### 如何迁移?
+
+如果你之前已切换模板徽标PNG,则更改很简单:
+
+- 转到 `/assets/images/logo` 目录.
+- 重命名 `theme1.png` 为 `logo-light.png` 并且重命名 `theme1-reverse.png` 为 `logo-dark.png`.
+- 删除所有其他 `theme*.png` 文件.
+
+如果你更换了徽标组件,则更改有些不同,但仍然很简单. `LayoutStateService` 有两个新成员: `primaryLogoColor` 和 `secondaryLogoColor`. 它们有 `'light'` 和 `'dark'` 设置值做为可观察流. 你可以使用 `async` 管道在自定义徽标组件模板中使用它们的值. 这是一个完整的示例,其中涵盖了主要和辅助(帐户)布局徽标. 
+
+```js
+import { AddReplaceableComponent } from '@abp/ng.core';
+import { CommonModule } from '@angular/common';
+import { APP_INITIALIZER, Component, Injector, NgModule } from '@angular/core';
+import { Store } from '@ngxs/store';
+import { eAccountComponents } from '@volo/abp.ng.account';
+import {
+  AccountLayoutComponent,
+  eThemeLeptonComponents,
+  LayoutStateService,
+} from '@volo/abp.ng.theme.lepton';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Component({
+  template: `
+    <div class="account-brand p-4 text-center mb-1" *ngIf="isAccount; else link">
+      <ng-template [ngTemplateOutlet]="link"></ng-template>
+    </div>
+
+    <ng-template #link>
+      <a [style.background-image]="logoUrl | async" class="navbar-brand" routerLink="/"></a>
+    </ng-template>
+  `,
+})
+export class LogoComponent {
+  isAccount: boolean;
+
+  logoColor: Observable<'dark' | 'light'>;
+
+  get logoUrl() {
+    return this.logoColor.pipe(map(color => `url(/assets/images/logo/logo-${color}.png)`));
+  }
+
+  constructor(injector: Injector) {
+    const layout = injector.get(LayoutStateService);
+    this.isAccount = Boolean(injector.get(AccountLayoutComponent, false));
+    this.logoColor = this.isAccount ? layout.secondaryLogoColor : layout.primaryLogoColor;
+  }
+}
+
+@NgModule({
+  imports: [CommonModule],
+  declarations: [LogoComponent],
+  exports: [LogoComponent],
+})
+export class LogoModule {}
+
+export const APP_LOGO_PROVIDER = [
+  { provide: APP_INITIALIZER, useFactory: switchLogos, multi: true, deps: [Store] },
+];
+
+export function switchLogos(store: Store) {
+  return () => {
+    store.dispatch(
+      new AddReplaceableComponent({
+        component: LogoComponent,
+        key: eThemeLeptonComponents.Logo,
+      }),
+    );
+
+    store.dispatch(
+      new AddReplaceableComponent({
+        component: LogoComponent,
+        key: eAccountComponents.Logo,
+      }),
+    );
+  };
+}
+```
+
+只要将 `APP_LOGO_PROVIDER` 添加到根模块的提供程序(通常是 `AppModule` ),你就会有一个调整主题颜色的自定义徽标组件.
 
 ### 过时的接口
 

docs/zh-Hans/UI/Angular/Modifying-the-Menu.md

@@ -2,8 +2,6 @@
 
 菜单在 @abp/ng.theme.basic包 `ApplicationLayoutComponent` 内部. 有几种修改菜单的方法,本文档介绍了这些方法. 如果你想完全替换菜单,请参考[组件替换文档]了解如何替换布局.
 
-<!-- TODO: Replace layout replacement document with component replacement. Layout replacement document will be created.-->
-
 ## 如何添加Logo
 
 环境变量中的 `logoUrl` 是logo的url.
@@ -212,51 +210,65 @@ this.routes.remove(['Your navigation']);
 
 ## 如何在菜单的右侧添加元素
 
-右侧的元素存储在 @abp/ng.theme.basic 包的 `LayoutState` 中.
-
-`LayoutStateService` 的 `dispatchAddNavigationElement` 方法添加元素到右侧的菜单.
-
-你可以通过将模板添加到 `app.component` 调用 `dispatchAddNavigationElement` 方法来插入元素:
+你可以通过调用 `NavItemsService` 的 `addItems` 方法将元素添加到菜单的右侧. 这是一个单例服务,即以根身份提供. 因此你可以立即注入并使用它.
 
 ```js
-import { Layout, LayoutStateService } from '@abp/ng.theme.basic'; // added this line
+import { NavItemsService } from '@abp/ng.theme.shared';
+import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-root',
   template: `
-  
-    <!-- Added below content -->
-    <ng-template #search
-      ><input type="search" placeholder="Search" class="bg-transparent border-0"
-    /></ng-template>
+    <input type="search" placeholder="Search" class="bg-transparent border-0 color-white" />
   `,
 })
-export class AppComponent {
-  // Added ViewChild
-  @ViewChild('search', { static: false, read: TemplateRef }) searchElementRef: TemplateRef<any>;
-
-  constructor(private layout: LayoutStateService) {} // injected LayoutStateService
+export class MySearchInputComponent {}
 
-  // Added ngAfterViewInit
-  ngAfterViewInit() {
-    const newElement = {
-      name: 'Search',
-      element: this.searchElementRef,
-      order: 1,
-    } as Layout.NavigationElement;
 
-    this.layout.dispatchAddNavigationElement(newElement);
+@Component(/* component metadata */)
+export class AppComponent {
+  constructor(private navItems: NavItemsService) {
+    navItems.addItems([
+      {
+        id: 'MySearchInput',
+        order: 1,
+        component: MySearchInputComponent,
+      },
+      {
+        id: 'SignOutIcon',
+        html: '<i class="fas fa-sign-out-alt fa-lg text-white m-2"><i>',
+        action: () => console.log('Clicked the sign out icon'),
+        order: 101, // puts as last element
+      },
+    ]);
   }
 }
 ```
 
-上面我们在菜单添加了一个搜索输入,最终UI如下:
+上面我们在菜单添加了一个搜索输入和退出登录图标,最终UI如下:
 
 ![navigation-menu-search-input](./images/navigation-menu-search-input.png)
 
-## 如何删除右侧菜单元素
+> 默认元素的排序为 `100`. 如果要将自定义元素放在默认值之前,请指定一个排序,最高为 `99`. 如果要将自定义元素放在默认值之后,请指定排序从 `101` 开始. 最后如果必须在默认值之间放置一个项目,请按如下所述修补默认元素顺序. 但有一个警告:我们将来可能会添加另一个默认元素,排序也为 `100`.
+
+## 如何修补或删除右侧部分元素
+
+`NavItemsService` 的 `patchItem` 方法通过 `id` 查找元素,并将配置替换为第二个参数传递的新配置.  `removeItem` 方法会找到一个元素并删除.
+
+```js
+export class AppComponent {
+  constructor(private navItems: NavItemsService) {
+    navItems.patchItem(eThemeBasicComponents.Languages, {
+      requiredPolicy: 'new policy here',
+      order: 1,
+    });
+
+    navItems.removeItem(eThemeBasicComponents.CurrentUser);
+  }
+}
+```
 
-TODO
+* 使用新的 `requiredPolicy` 和新的 `order` 修补了语言下拉菜单元素.
+* 删除了当前用户的下拉菜单元素.
 
 ## 下一步是什么?
 

docs/zh-Hans/UI/Angular/Permission-Management.md

@@ -55,7 +55,9 @@ export class YourComponent {
 
 如果你想要在导航过程中控制经过身份验证的用户对路由的访问权限,可以使用 `PermissionGuard`.
 
-将 `requiredPolicy` 添加到路由模块中的 `routes`属性.
+* 从@abp/ng.core导入PermissionGuard.
+* 添加 `canActivate: [PermissionGuard]` 到你的路由对象.
+* 添加  `requiredPolicy` 到路由模块路由的 `data` 属性.
 
 ```js
 import { PermissionGuard } from '@abp/ng.core';
@@ -66,9 +68,7 @@ const routes: Routes = [
     component: YourComponent,
     canActivate: [PermissionGuard],
     data: {
-      routes: {
-        requiredPolicy: 'AbpIdentity.Roles.Create',
-      },
+        requiredPolicy: 'YourProjectName.YourComponent', // policy key for your component
     },
   },
 ];

docs/zh-Hans/UI/Angular/Service-Proxies.md

@@ -33,7 +33,7 @@ abp generate-proxy
 服务的 `providerIn` 属性定义为 `'root'`. 因此无需将服务作为提供程序添加到模块. 你可以通过将服务注入到构造函数中来使用它,如下所示:
 
 ```js
-import { AbpApplicationConfigurationService } from '../app/shared/services';
+import { AbpApplicationConfigurationService } from '../abp/applicationconfiguration/services';
 
 //...
 export class HomeComponent{
@@ -49,14 +49,14 @@ Angular编译器会从最终输出中删除那些没有被注入的服务. 参
 
 ### Models
 
-生成的模型与后端中的dto匹配. 每个模型在 `src/app/*/shared/models` 文件夹生成一个类.
+生成的模型与后端中的dto匹配. 每个模型在 `src/app/*/models` 文件夹生成一个类.
 
 `@abp/ng.core` 包有一些[基类](https://github.com/abpframework/abp/blob/dev/npm/ng-packs/packages/core/src/lib/models/dtos.ts). 一些模型扩展了这些类.
 
 可以如下所示创建一个类的实例:
 
 ```js
-import { IdentityRoleCreateDto } from '../identity/shared/models';
+import { IdentityRoleCreateDto } from '../identity/role/models'
 //...
 const instance = new IdentityRoleCreateDto({name: 'Role 1', isDefault: false, isPublic: true})
 ```

docs/zh-Hans/UI/Angular/Subscription-Service.md

@@ -0,0 +1,205 @@
+# 轻松取消将你的观察取消订阅
+
+`SubscriptionService` 是一个实用工具服务,它提供了一个简单的取消订阅Angular组件和指令中的RxJS可观察对象的功能. 请参见[为什么在实例销毁时要取消订阅可观察对象](https://angular.io/guide/lifecycle-hooks#cleaning-up-on-instance-destruction).
+
+## 入门
+
+你必须在组件或指令级别提供 `SubscriptionService`,因为它没有在**根中提供**,而且它与组件/指令的生命周期同步. 只有在此之后，您才能注入并开始使用它。
+
+```js
+import { SubscriptionService } from '@abp/ng.core';
+
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent {
+  count$ = interval(1000);
+
+  constructor(private subscription: SubscriptionService) {
+    this.subscription.addOne(this.count$, console.log);
+  }
+}
+```
+
+由 `count$` 发出的值将被记录下来,直到组件被销毁. 你不必手动退订.
+
+> 请不要尝试使用单例 `SubscriptionService`. 这是行不通的.
+
+## 用法
+
+## 如何订阅可观察对象
+
+你可以传递 `next` 函数和 `error` 函数.
+
+
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    const source$ = interval(1000);
+    const nextFn = value => console.log(value * 2);
+    const errorFn = error => {
+      console.error(error);
+      return of(null);
+    };
+
+    this.subscription.addOne(source$, nextFn, errorFn);
+  }
+}
+```
+
+或者,你可以传递一个观察者.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    const source$ = interval(1000);
+    const observer = {
+      next: value => console.log(value * 2),
+      complete: () => console.log('DONE'),
+    };
+
+    this.subscription.addOne(source$, observer);
+  }
+}
+```
+
+`addOne` 方法返回单个订阅以便你以后使用它. 有关详细信息,请参见下面的主题.
+
+### 实例销毁之前如何退订
+
+有两种方法可以做到这一点. 如果你不想再次订阅.可以使用 `closeAll` 方法.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    this.subscription.closeAll();
+  }
+}
+```
+
+这将清除所有订阅,你将无法再次订阅. 如果你打算添加另一个订阅,可以使用`reset`方法.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    this.subscription.reset();
+    this.subscription.addOne(interval(1000), console.warn);
+  }
+}
+```
+
+### 如何取消单个订阅
+
+有时你可能需要取消订阅特定的订阅,但保留其他订阅. 在这种情况下,你可以使用 `closeOne` 方法.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  countSubscription: Subscription;
+
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.countSubscription = this.subscription.addOne(
+      interval(1000),
+      console.log
+    );
+  }
+
+  onSomeEvent() {
+    this.subscription.closeOne(this.countSubscription);
+    console.log(this.countSubscription.closed); // true
+  }
+}
+```
+
+### 如何从跟踪的订阅中删除单个订阅
+
+你可能需要控制特定的订阅. 在这种情况下你可以使用 `removeOne` 方法将其从跟踪的订阅中删除.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  countSubscription: Subscription;
+
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.countSubscription = this.subscription.addOne(
+      interval(1000),
+      console.log
+    );
+  }
+
+  onSomeEvent() {
+    this.subscription.removeOne(this.countSubscription);
+    console.log(this.countSubscription.closed); // false
+  }
+}
+```
+
+### 如何检查是否全部取消订阅
+
+使用 `isClosed` 检查 `closeAll` 是否被调用.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    console.log(this.subscription.isClosed); // false
+  }
+}
+```
+
+## 下一步是什么?
+
+- [ListService](./List-Service.md)

docs/zh-Hans/UI/Angular/Track-By-Service.md

@@ -99,4 +99,4 @@ class DemoComponent {
 
 ## 下一步是什么?
 
-- [ListService](./List-Service.md)
+- [SubscriptionService](./Subscription-Service.md)

docs/zh-Hans/UI/AspNetCore/Dynamic-JavaScript-Proxies.md

@@ -0,0 +1,3 @@
+# Dynamic JavaScript HTTP API Proxies
+
+TODO

docs/zh-Hans/docs-nav.json

@@ -80,6 +80,15 @@
       "text": "CLI",
       "path": "CLI.md"
     },
+    {
+      "text": "认证",
+      "items": [
+        {
+          "text": "社交/外部登录",
+          "path": "Authentication/Social-External-Logins.md"
+        }
+      ]
+    },
     {
       "text": "基础知识",
       "items": [
@@ -440,12 +449,25 @@
               "text": "TrackByService",
               "path": "UI/Angular/Track-By-Service.md"
             },
+            {
+              "text": "SubscriptionService",
+              "path": "UI/Angular/Subscription-Service.md"
+            },
             {
               "text": "ListService",
               "path": "UI/Angular/List-Service.md"
             }
           ]
         },
+        {
+          "text": "React Native",
+          "items": [
+            {
+              "text": "入门",
+              "path": "Getting-Started-React-Native.md"
+            }
+          ]
+        },
         {
           "text": "通用",
           "items": [
@@ -624,6 +646,10 @@
     {
       "text": "API文档",
       "path": "{ApiDocumentationUrl}"
+    },
+    {
+      "text": "官方包",
+      "path": "https://abp.io/packages"
     }
   ]
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -13,7 +12,6 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Application.Services;
-using Volo.Abp.AspNetCore.Mvc.ApiExploring;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.Utils;
 using Volo.Abp.DependencyInjection;
@@ -67,34 +65,51 @@ namespace Volo.Abp.AspNetCore.Mvc
 
         private void AddApiDescriptionToModel(
             ApiDescription apiDescription,
-            ApplicationApiDescriptionModel applicationModel, 
+            ApplicationApiDescriptionModel applicationModel,
             ApplicationApiDescriptionModelRequestDto input)
         {
-            var controllerType = apiDescription.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.AsType();
+            var controllerType = apiDescription
+                .ActionDescriptor
+                .AsControllerActionDescriptor()
+                .ControllerTypeInfo;
+
             var setting = FindSetting(controllerType);
 
-            var moduleModel = applicationModel.GetOrAddModule(GetRootPath(controllerType, setting), GetRemoteServiceName(controllerType, setting));
+            var moduleModel = applicationModel.GetOrAddModule(
+                GetRootPath(controllerType, setting),
+                GetRemoteServiceName(controllerType, setting)
+            );
 
-            var controllerModel = moduleModel.GetOrAddController(controllerType.FullName, CalculateControllerName(controllerType, setting), controllerType, _modelOptions.IgnoredInterfaces);
+            var controllerModel = moduleModel.GetOrAddController(
+                controllerType.FullName,
+                CalculateControllerName(controllerType, setting),
+                controllerType,
+                _modelOptions.IgnoredInterfaces
+            );
 
             var method = apiDescription.ActionDescriptor.GetMethodInfo();
 
             var uniqueMethodName = GetUniqueActionName(method);
             if (controllerModel.Actions.ContainsKey(uniqueMethodName))
             {
-                Logger.LogWarning($"Controller '{controllerModel.ControllerName}' contains more than one action with name '{uniqueMethodName}' for module '{moduleModel.RootPath}'. Ignored: " + method);
+                Logger.LogWarning(
+                    $"Controller '{controllerModel.ControllerName}' contains more than one action with name '{uniqueMethodName}' for module '{moduleModel.RootPath}'. Ignored: " +
+                    method);
                 return;
             }
 
             Logger.LogDebug($"ActionApiDescriptionModel.Create: {controllerModel.ControllerName}.{uniqueMethodName}");
 
-            var actionModel = controllerModel.AddAction(uniqueMethodName, ActionApiDescriptionModel.Create(
+            var actionModel = controllerModel.AddAction(
                 uniqueMethodName,
-                method,
-                apiDescription.RelativePath,
-                apiDescription.HttpMethod,
-                GetSupportedVersions(controllerType, method, setting)
-            ));
+                ActionApiDescriptionModel.Create(
+                    uniqueMethodName,
+                    method,
+                    apiDescription.RelativePath,
+                    apiDescription.HttpMethod,
+                    GetSupportedVersions(controllerType, method, setting)
+                )
+            );
 
             if (input.IncludeTypes)
             {
@@ -106,11 +121,14 @@ namespace Volo.Abp.AspNetCore.Mvc
 
         private static string CalculateControllerName(Type controllerType, ConventionalControllerSetting setting)
         {
-            var controllerName = controllerType.Name.RemovePostFix("Controller").RemovePostFix(ApplicationService.CommonPostfixes);
+            var controllerName = controllerType.Name.RemovePostFix("Controller")
+                .RemovePostFix(ApplicationService.CommonPostfixes);
 
             if (setting?.UrlControllerNameNormalizer != null)
             {
-                controllerName = setting.UrlControllerNameNormalizer(new UrlControllerNameNormalizerContext(setting.RootPath, controllerName));
+                controllerName =
+                    setting.UrlControllerNameNormalizer(
+                        new UrlControllerNameNormalizerContext(setting.RootPath, controllerName));
             }
 
             return controllerName;
@@ -139,7 +157,8 @@ namespace Volo.Abp.AspNetCore.Mvc
             return methodNameBuilder.ToString();
         }
 
-        private static List<string> GetSupportedVersions(Type controllerType, MethodInfo method, ConventionalControllerSetting setting)
+        private static List<string> GetSupportedVersions(Type controllerType, MethodInfo method,
+            ConventionalControllerSetting setting)
         {
             var supportedVersions = new List<ApiVersion>();
 
@@ -172,17 +191,23 @@ namespace Volo.Abp.AspNetCore.Mvc
             AddCustomTypesToModel(applicationModel, method.ReturnType);
         }
 
-        private static void AddCustomTypesToModel(ApplicationApiDescriptionModel applicationModel, [CanBeNull] Type type)
+        private static void AddCustomTypesToModel(ApplicationApiDescriptionModel applicationModel,
+            [CanBeNull] Type type)
         {
             if (type == null)
             {
                 return;
             }
 
+            if (type.IsGenericParameter)
+            {
+                return;
+            }
+
             type = AsyncHelper.UnwrapTask(type);
 
             if (type == typeof(object) ||
-                type == typeof(void) || 
+                type == typeof(void) ||
                 type == typeof(Enum) ||
                 type == typeof(ValueType) ||
                 TypeHelper.IsPrimitiveExtended(type))
@@ -190,41 +215,67 @@ namespace Volo.Abp.AspNetCore.Mvc
                 return;
             }
 
-            if (TypeHelper.IsEnumerable(type, out var itemType))
+            if (TypeHelper.IsDictionary(type, out var keyType, out var valueType))
             {
-                AddCustomTypesToModel(applicationModel, itemType);
+                AddCustomTypesToModel(applicationModel, keyType);
+                AddCustomTypesToModel(applicationModel, valueType);
                 return;
             }
 
-            if (TypeHelper.IsDictionary(type, out var keyType, out var valueType))
+            if (TypeHelper.IsEnumerable(type, out var itemType))
             {
-                AddCustomTypesToModel(applicationModel, keyType);
-                AddCustomTypesToModel(applicationModel, valueType);
+                AddCustomTypesToModel(applicationModel, itemType);
                 return;
             }
 
-            /* TODO: Add interfaces
-             */
+            if (type.IsGenericType && !type.IsGenericTypeDefinition)
+            {
+                var genericTypeDefinition = type.GetGenericTypeDefinition();
+
+                AddCustomTypesToModel(applicationModel, genericTypeDefinition);
+
+                foreach (var genericArgument in type.GetGenericArguments())
+                {
+                    AddCustomTypesToModel(applicationModel, genericArgument);
+                }
 
-            var typeName = TypeHelper.GetFullNameHandlingNullableAndGenerics(type);
+                return;
+            }
 
+            var typeName = CalculateTypeName(type);
             if (applicationModel.Types.ContainsKey(typeName))
             {
                 return;
             }
-            
-            var typeModel = TypeApiDescriptionModel.Create(type);
-            applicationModel.Types[typeName] = typeModel;
+
+            applicationModel.Types[typeName] = TypeApiDescriptionModel.Create(type);
 
             AddCustomTypesToModel(applicationModel, type.BaseType);
 
-            foreach (var propertyInfo in type.GetProperties())
+            foreach (var propertyInfo in type.GetProperties().Where(p => p.DeclaringType == type))
             {
                 AddCustomTypesToModel(applicationModel, propertyInfo.PropertyType);
             }
         }
 
-        private void AddParameterDescriptionsToModel(ActionApiDescriptionModel actionModel, MethodInfo method, ApiDescription apiDescription)
+        private static string CalculateTypeName(Type type)
+        {
+            if (!type.IsGenericTypeDefinition)
+            {
+                return TypeHelper.GetFullNameHandlingNullableAndGenerics(type);
+            }
+
+            var i = 0;
+            var argumentList = type
+                .GetGenericArguments()
+                .Select(_ => "T" + i++)
+                .JoinAsString(",");
+
+            return $"{type.FullName.Left(type.FullName.IndexOf('`'))}<{argumentList}>";
+        }
+
+        private void AddParameterDescriptionsToModel(ActionApiDescriptionModel actionModel, MethodInfo method,
+            ApiDescription apiDescription)
         {
             if (!apiDescription.ParameterDescriptions.Any())
             {
@@ -240,8 +291,8 @@ namespace Volo.Abp.AspNetCore.Mvc
             {
                 var parameterDescription = apiDescription.ParameterDescriptions[i];
                 var matchedMethodParamName = matchedMethodParamNames.Length > i
-                                                 ? matchedMethodParamNames[i]
-                                                 : parameterDescription.Name;
+                    ? matchedMethodParamNames[i]
+                    : parameterDescription.Name;
 
                 actionModel.AddParameter(ParameterApiDescriptionModel.Create(
                         parameterDescription.Name,
@@ -273,7 +324,8 @@ namespace Volo.Abp.AspNetCore.Mvc
             return modelNameProvider.Name ?? parameterInfo.Name;
         }
 
-        private static string GetRootPath([NotNull] Type controllerType, [CanBeNull] ConventionalControllerSetting setting)
+        private static string GetRootPath([NotNull] Type controllerType,
+            [CanBeNull] ConventionalControllerSetting setting)
         {
             if (setting != null)
             {
@@ -296,7 +348,8 @@ namespace Volo.Abp.AspNetCore.Mvc
                 return setting.RemoteServiceName;
             }
 
-            var remoteServiceAttr = controllerType.GetCustomAttributes().OfType<RemoteServiceAttribute>().FirstOrDefault();
+            var remoteServiceAttr =
+                controllerType.GetCustomAttributes().OfType<RemoteServiceAttribute>().FirstOrDefault();
             if (remoteServiceAttr?.Name != null)
             {
                 return remoteServiceAttr.Name;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs

@@ -5,6 +5,7 @@ namespace Volo.Abp.Cli.ProjectModification
     [Flags]
     public enum NpmApplicationType
     {
-        Mvc = 1
+        Mvc = 1,
+        Angular = 2
     }
-}
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -39,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectModification
             EfCoreMigrationAdder efCoreMigrationAdder,
             DerivedClassFinder derivedClassFinder,
             ProjectNpmPackageAdder projectNpmPackageAdder,
-            NpmGlobalPackagesChecker npmGlobalPackagesChecker, 
+            NpmGlobalPackagesChecker npmGlobalPackagesChecker,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
             SourceCodeDownloadService sourceCodeDownloadService,
             SolutionFileModifier solutionFileModifier,
@@ -159,7 +159,7 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 Directory.Delete(demoFolder, true);
             }
-            
+
             var hostFolder = Path.Combine(targetModuleFolder, "host");
             if (Directory.Exists(hostFolder))
             {
@@ -186,7 +186,9 @@ namespace Volo.Abp.Cli.ProjectModification
                 await ProjectNugetPackageAdder.AddAsync(targetProjectFile, nugetPackage);
             }
 
-            if (!module.NpmPackages.IsNullOrEmpty())
+            var mvcNpmPackages = module.NpmPackages?.Where(p => p.ApplicationType.HasFlag(NpmApplicationType.Mvc)).ToList();
+
+            if (!mvcNpmPackages.IsNullOrEmpty())
             {
                 var targetProjects = ProjectFinder.FindNpmTargetProjectFile(projectFiles);
                 if (targetProjects.Any())
@@ -195,8 +197,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
                     foreach (var targetProject in targetProjects)
                     {
-                        foreach (var npmPackage in module.NpmPackages.Where(p =>
-                            p.ApplicationType.HasFlag(NpmApplicationType.Mvc)))
+                        foreach (var npmPackage in mvcNpmPackages)
                         {
                             await ProjectNpmPackageAdder.AddAsync(Path.GetDirectoryName(targetProject), npmPackage);
                         }
@@ -222,7 +223,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
 
             var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj"));
-            
+
             if (dbMigrationsProject == null)
             {
                 Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project.");
@@ -241,7 +242,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             if (addedNewBuilder && !skipDbMigrations)
             {
-                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject); 
+                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject);
             }
         }
 
@@ -274,4 +275,4 @@ namespace Volo.Abp.Cli.ProjectModification
                 .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host"));
         }
     }
-}
+}

framework/src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs

@@ -9,6 +9,14 @@ namespace System.Collections.Generic
     /// </summary>
     public static class AbpListExtensions
     {
+        public static void InsertRange<T>(this IList<T> source, int index, IEnumerable<T> items)
+        {
+            foreach (var item in items)
+            {
+                source.Insert(index++, item);
+            }
+        }
+
         public static int FindIndex<T>(this IList<T> source, Predicate<T> selector)
         {
             for (var i = 0; i < source.Count; ++i)
@@ -182,7 +190,7 @@ namespace System.Collections.Generic
         /// <param name="getDependencies">Function to resolve the dependencies</param>
         /// <returns>
         /// Returns a new list ordered by dependencies.
-        /// If A depends on B, then B will come before than A in the resulting list. 
+        /// If A depends on B, then B will come before than A in the resulting list.
         /// </returns>
         public static List<T> SortByDependencies<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> getDependencies)
         {
@@ -202,14 +210,15 @@ namespace System.Collections.Generic
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <typeparam name="T">The type of the members of values.</typeparam>
         /// <param name="item">Item to resolve</param>
         /// <param name="getDependencies">Function to resolve the dependencies</param>
         /// <param name="sorted">List with the sortet items</param>
         /// <param name="visited">Dictionary with the visited items</param>
-        private static void SortByDependenciesVisit<T>(T item, Func<T, IEnumerable<T>> getDependencies, List<T> sorted, Dictionary<T, bool> visited)
+        private static void SortByDependenciesVisit<T>(T item, Func<T, IEnumerable<T>> getDependencies, List<T> sorted,
+            Dictionary<T, bool> visited)
         {
             bool inProcess;
             var alreadyVisited = visited.TryGetValue(item, out inProcess);

framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs

@@ -71,7 +71,7 @@ namespace Volo.Abp.Reflection
                 return true;
             }
 
-            if (includeNullables && IsNullable(type))
+            if (includeNullables && IsNullable(type) && type.GenericTypeArguments.Any())
             {
                 return IsPrimitiveExtendedInternal(type.GenericTypeArguments[0], includeEnums);
             }
@@ -197,7 +197,7 @@ namespace Volo.Abp.Reflection
                 return $"{genericType.FullName.Left(genericType.FullName.IndexOf('`'))}<{type.GenericTypeArguments.Select(GetFullNameHandlingNullableAndGenerics).JoinAsString(",")}>";
             }
 
-            return type.FullName;
+            return type.FullName ?? type.Name;
         }
 
         public static string GetSimplifiedName([NotNull] Type type)
@@ -295,8 +295,12 @@ namespace Volo.Abp.Reflection
             {
                 return "number";
             }
+            else if (type == typeof(object))
+            {
+                return "object";
+            }
 
-            return type.FullName;
+            return type.FullName ?? type.Name;
         }
 
         public static object ConvertFromString<TTargetType>(string value)

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/ar.json

@@ -1,4 +1,4 @@
-{
+{
   "culture": "ar",
   "texts": {
     "DisplayName:Abp.Mailing.DefaultFromAddress": "العنوان الإفتراضي",
@@ -18,6 +18,8 @@
     "Description:Abp.Mailing.Smtp.Password": "كلمة المرور لاسم المستخدم المرتبط ببيانات الاعتماد.",
     "Description:Abp.Mailing.Smtp.Domain": "اسم المجال أو الكمبيوتر الذي يتحقق من بيانات الاعتماد.",
     "Description:Abp.Mailing.Smtp.EnableSsl": "ما إذا كان SmtpClient يستخدم (SSL) لتشفير الاتصال.",
-    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "إرسال الصلاحيات الافتراضية مع الطلب."
+    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "إرسال الصلاحيات الافتراضية مع الطلب.",
+    "TextTemplate:StandardEmailTemplates.Layout": "نموذج تخطيط إفتراضي للبريد الإلكتروني",
+    "TextTemplate:StandardEmailTemplates.Message": "نموذج بسيط للرسائل الإلكترونية"
   }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EntityHistory/EntityHistoryHelper.cs

@@ -242,7 +242,7 @@ namespace Volo.Abp.EntityFrameworkCore.EntityHistory
                 }
             }
 
-            if (IsBaseAuditProperty(propertyInfo, entityType))
+            if (propertyInfo != null && IsBaseAuditProperty(propertyInfo, entityType))
             {
                 return false;
             }

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -17,7 +17,6 @@ using Volo.Abp.Http.Modeling;
 using Volo.Abp.Http.ProxyScripting.Generators;
 using Volo.Abp.Json;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
 using Volo.Abp.Tracing;
 

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApiTypeNameHelper.cs

@@ -0,0 +1,38 @@
+using System;
+using Volo.Abp.Reflection;
+
+namespace Volo.Abp.Http.Modeling
+{
+    public static class ApiTypeNameHelper
+    {
+        public static string GetTypeName(Type type)
+        {
+            if (TypeHelper.IsDictionary(type, out var keyType, out var valueType))
+            {
+                return $"{{{GetTypeName(keyType)}:{GetTypeName(valueType)}}}";
+            }
+
+            if (TypeHelper.IsEnumerable(type, out var itemType, includePrimitives: false))
+            {
+                return $"[{GetTypeName(itemType)}]";
+            }
+
+            return TypeHelper.GetFullNameHandlingNullableAndGenerics(type);
+        }
+
+        public static string GetSimpleTypeName(Type type)
+        {
+            if (TypeHelper.IsDictionary(type, out var keyType, out var valueType))
+            {
+                return  $"{{{GetSimpleTypeName(keyType)}:{GetSimpleTypeName(valueType)}}}";
+            }
+
+            if (TypeHelper.IsEnumerable(type, out var itemType, includePrimitives: false))
+            {
+                return  $"[{GetSimpleTypeName(itemType)}]";
+            }
+
+            return TypeHelper.GetSimplifiedName(type);
+        }
+    }
+}

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs

@@ -30,11 +30,11 @@ namespace Volo.Abp.Http.Modeling
             {
                 Name = parameterInfo.Name,
                 TypeAsString = parameterInfo.ParameterType.GetFullNameWithAssemblyName(),
-                Type = parameterInfo.ParameterType != null ? TypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType) : null,
-                TypeSimple = parameterInfo.ParameterType != null ? TypeHelper.GetSimplifiedName(parameterInfo.ParameterType) : null,
+                Type = TypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType),
+                TypeSimple = ApiTypeNameHelper.GetSimpleTypeName(parameterInfo.ParameterType),
                 IsOptional = parameterInfo.IsOptional,
                 DefaultValue = parameterInfo.HasDefaultValue ? parameterInfo.DefaultValue : null
             };
         }
     }
-}
+}