Merge remote-tracking branch 'abpframework/master' into Translate

.gitignore

@@ -285,3 +285,12 @@ framework/test/Volo\.Abp\.AspNetCore\.Mvc\.UI\.Bootstrap\.Demo/package-lock\.jso
 modules/blogging/app/Volo\.BloggingTestApp/package-lock\.json
 
 templates/mvc/src/MyCompanyName\.MyProjectName\.Web/package-lock\.json
+samples/MicroserviceDemo/applications/AuthServer.Host/Logs/logs.txt
+samples/MicroserviceDemo/microservices/IdentityService.Host/Logs/logs.txt
+samples/MicroserviceDemo/applications/BackendAdminApp.Host/Logs/logs.txt
+samples/MicroserviceDemo/microservices/ProductService.Host/Logs/logs.txt
+samples/MicroserviceDemo/gateways/InternalGateway.Host/Logs/logs.txt
+samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Logs/logs.txt
+samples/MicroserviceDemo/applications/PublicWebSite.Host/Logs/logs.txt
+samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Logs/logs.txt
+samples/MicroserviceDemo/microservices/BloggingService.Host/Logs/logs.txt

abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs

@@ -8,20 +8,22 @@
 using Microsoft.Extensions.FileProviders;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Modularity;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theming;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Autofac;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.Web;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement;
+using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.UI;
 using Volo.Abp.VirtualFileSystem;
@@ -41,6 +43,8 @@ namespace Volo.AbpWebSite
         typeof(AbpAccountWebModule),
         typeof(AbpIdentityApplicationModule),
         typeof(AbpIdentityWebModule),
+        typeof(AbpPermissionManagementApplicationModule),
+        typeof(AbpPermissionManagementDomainIdentityModule),
         typeof(BloggingApplicationModule),
         typeof(BloggingWebModule)
         )]
@@ -110,14 +114,14 @@ private static void ConfigureVirtualFileSystem(IServiceCollection services, IHos
             {
                 services.Configure<VirtualFileSystemOptions>(options =>
                 {
-                    options.FileSets.ReplaceEmbeddedByPyhsical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<DocsDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}docs{0}src{0}Volo.Docs.Domain", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<DocsWebModule>(Path.Combine(hostingEnvironment.ContentRootPath,    string.Format("..{0}..{0}..{0}modules{0}docs{0}src{0}Volo.Docs.Web", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<BloggingWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}blogging{0}src{0}Volo.Blogging.Web", Path.DirectorySeparatorChar)));
-                    options.FileSets.ReplaceEmbeddedByPyhsical<AbpAccountWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<DocsDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}docs{0}src{0}Volo.Docs.Domain", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<DocsWebModule>(Path.Combine(hostingEnvironment.ContentRootPath,    string.Format("..{0}..{0}..{0}modules{0}docs{0}src{0}Volo.Docs.Web", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<BloggingWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}blogging{0}src{0}Volo.Blogging.Web", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpAccountWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar)));
                 });
             }
         }
@@ -158,29 +162,28 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             app.UseVirtualFiles();
 
             app.UseAuthentication();
-
-            //TODO: Create an extension method!
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
 
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRouteAndArea();
 
-            AsyncHelper.RunSync(async () =>
+            using (var scope = context.ServiceProvider.CreateScope())
             {
-                await context.ServiceProvider
-                    .GetRequiredService<IIdentityDataSeeder>()
-                    .SeedAsync(
-                        "1q2w3E*",
-                        IdentityPermissions.GetAll()
-                            .Union(BloggingPermissions.GetAll())
-                    );
-            });
+                AsyncHelper.RunSync(async () =>
+                {
+                    await scope.ServiceProvider
+                        .GetRequiredService<IIdentityDataSeeder>()
+                        .SeedAsync(
+                            "1q2w3E*"
+                        );
+
+                    await scope.ServiceProvider
+                        .GetRequiredService<IPermissionDataSeeder>()
+                        .SeedAsync(
+                            RolePermissionValueProvider.ProviderName,
+                            "admin",
+                            IdentityPermissions.GetAll().Union(BloggingPermissions.GetAll())
+                        );
+                });
+            }
         }
     }
 }

abp_io/src/Volo.AbpWebSite.Web/Volo.AbpWebSite.Web.csproj

@@ -31,14 +31,16 @@
     <ProjectReference Include="..\..\..\modules\blogging\src\Volo.Blogging.Application\Volo.Blogging.Application.csproj" />
     <ProjectReference Include="..\..\..\modules\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
     <ProjectReference Include="..\..\..\modules\identity\src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.csproj" />
+    <ProjectReference Include="..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
+    <ProjectReference Include="..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\modules\account\src\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Include=".well-known/README.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Pages\*.js" >
+    <Content Include="Pages\*.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Pages\*.css" />

build-all.ps1

@@ -20,7 +20,8 @@ $solutionPaths = (
     "abp_io",
     "templates/module",
     "templates/service",
-    "templates/mvc"
+    "templates/mvc",
+    "samples/MicroserviceDemo"
 )
 
 # Build all solutions

common.props

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

docs/en/Event-Bus.md

@@ -0,0 +1,3 @@
+# Event Bus
+
+TODO

docs/en/Microservice-Architecture.md

@@ -0,0 +1,30 @@
+# Microservice Architecture
+
+*"Microservices are a software development technique—a variant of the **service-oriented architecture** (SOA) architectural style that structures an application as a collection of **loosely coupled services**. In a microservices architecture, services are **fine-grained** and the protocols are **lightweight**. The benefit of decomposing an application into different smaller services is that it improves **modularity**. This makes the application easier to understand, develop, test, and become more resilient to architecture erosion. It **parallelizes development** by enabling small autonomous teams to **develop, deploy and scale** their respective services independently. It also allows the architecture of an individual service to emerge through **continuous refactoring**. Microservices-based architectures enable **continuous delivery and deployment**."*
+
+— [Wikipedia](https://en.wikipedia.org/wiki/Microservices)
+
+## Introduction
+
+One of the major goals of the ABP framework is to provide a convenient infrastructure to create microservice solutions. To make this possible,
+
+* Provides a [module system](Module-Development-Basics.md) that allows you to split your application into modules where each module may have its own database, entities, services, APIs, UI components/pages... etc.
+* Offers an [architectural model](Best-Practices/Module-Architecture.md) to develop your modules to be compatible to microservice development and deployment.
+* Provides [best practices guide](Best-Practices/Index.md) to develop your module standards-compliance.
+* Provides base infrastructure to implement [Domain Driven Design](Domain-Driven-Design.md) in your microservices.
+* Provide services to [automatically create REST-style APIs](AspNetCore/Auto-API-Controllers.md) from your application services.
+* Provide services to [automatically create C# API clients](AspNetCore/Dynamic-CSharp-API-Clients.md) that makes easy to consume your services from another service/application.
+* Provides a [distributed event bus](Event-Bus.md) to communicate your services.
+* Provides many other services to make your daily development easier.
+
+## Microservice for New Applications
+
+One common advise to start a new solution is **always to start with a monolith**, keep it modular and split into microservices once the monolith becomes a problem. This makes your progress fast in the beginning especially if your team is small and you don't want to deal with challanges of the microservice architecture. 
+
+However, developing such a well-modular application can be a problem since it is **hard to keep modules isolated** from each other as you would do it for microservices (see [Stefan Tilkov's article](https://martinfowler.com/articles/dont-start-monolith.html) about that). Microservice architecture naturally forces you to develop well isolated services, but in a modular monolithic application it's easy to tight couple modules to each other and design **weak module boundaries** and API contracts.
+
+ABP can help you in that point by oferring a **microservice-compatible, strict module architecture** where your module is splitted into multiple layers/projects and developed in its own VS solution completely isolated and independent from other modules. Such a developed module is a natural microservice yet it can be easily plugged-in a monolithic application. See the [module development best practice guide](Best-Practices/Index.md) that offers a **microservice-first module design**. All [standard ABP modules](https://github.com/abpframework/abp/tree/master/modules) are developed based on this guide. So, you can use these modules by embedding into your monolithic solution or deploy them separately and use via remote APIs. They can share a single database or can have their own database based on your simple configuration.
+
+## Microservice Demo Solution
+
+The [sample microservice solution](Samples/Microservice-Demo.md) demonstrates a complete microservice solution based on the ABP framework.

docs/en/Samples/Microservice-Demo.md

@@ -0,0 +1,40 @@
+# Microservice Demo Solution
+
+*"Microservices are a software development technique—a variant of the **service-oriented architecture** (SOA) architectural style that structures an application as a collection of **loosely coupled services**. In a microservices architecture, services are **fine-grained** and the protocols are **lightweight**. The benefit of decomposing an application into different smaller services is that it improves **modularity**. This makes the application easier to understand, develop, test, and become more resilient to architecture erosion. It **parallelizes development** by enabling small autonomous teams to **develop, deploy and scale** their respective services independently. It also allows the architecture of an individual service to emerge through **continuous refactoring**. Microservices-based architectures enable **continuous delivery and deployment**."*
+
+— [Wikipedia](https://en.wikipedia.org/wiki/Microservices)
+
+## Introduction
+
+One of the major goals of the ABP framework is to provide a [convenient infrastructure to create microservice solutions](Microservice-Architecture.md).
+
+This sample aims to demonstrate a simple yet complete microservice solution;
+
+* Has multiple, independent, self-deployable **microservices**.
+* Multiple **web applications**, each uses a different API gateway.
+* Has multiple **gateways** / BFFs (Backend for Frontends) developed using the [Ocelot](https://github.com/ThreeMammals/Ocelot) library.
+* Has an **authentication service** developed using the [IdentityServer](https://identityserver.io/) framework. It's also a SSO (Single Sign On) application with necessary UIs.
+* Has **multiple databases**. Some microservices has their own database while some services/applications shares a database (to demonstrate different use cases).
+* Has different types of databases: **SQL Server** (with **Entity Framework Core** ORM) and **MongoDB**.
+* Has a **console application** to show the simplest way of using a service by authenticating.
+* Uses [Redis](https://redis.io/) for **distributed caching**.
+* Uses [RabbitMQ](https://www.rabbitmq.com/) for service-to-service **messaging**.
+* Uses [Kubernates](https://kubernetes.io/) to **deploy** & run all services and applications.
+
+The diagram below shows the system:
+
+![microservice-sample-diagram](../images/microservice-sample-diagram.png)
+
+### Source Code
+
+You can get the source code from [the GitHub repository](https://github.com/abpframework/abp/tree/master/samples/MicroserviceDemo).
+
+### Status
+
+This sample is still in development, not completed yet.
+
+## Microservices
+
+### Identity Service
+
+...

docs/en/Virtual-File-System.md

@@ -108,7 +108,7 @@ Embedding a file into a module assembly and being able to use it from another pr
 
 Let's assume that you're developing a module that contains an embedded JavaScript file. Whenever you change this file you must re-compile the project, re-start the application and refresh the browser page to take the change. Obviously, this is very time consuming and tedious.
 
-What is needed is the ability for the application to directly use the physical file at development time and a have a browser refresh reflect any change made in the JavaScript file. The `ReplaceEmbeddedByPyhsical` method makes all this possible. 
+What is needed is the ability for the application to directly use the physical file at development time and a have a browser refresh reflect any change made in the JavaScript file. The `ReplaceEmbeddedByPhysical` method makes all this possible. 
 
 The example below shows an application that depends on a module (`MyModule`) that itself contains embedded files.  The application can reach the source code of the module at development time. 
 
@@ -124,8 +124,8 @@ public class MyWebAppModule : AbpModule
         {
             Configure<VirtualFileSystemOptions>(options =>
             {
-                //ReplaceEmbeddedByPyhsical gets the root folder of the MyModule project
-                options.FileSets.ReplaceEmbeddedByPyhsical<MyModule>(
+                //ReplaceEmbeddedByPhysical gets the root folder of the MyModule project
+                options.FileSets.ReplaceEmbeddedByPhysical<MyModule>(
                     Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyModuleProject", Path.DirectorySeparatorChar))
                 );
             });

docs/en/docs-nav.json

@@ -256,10 +256,23 @@
         }
       ]
     },
+    {
+      "text": "Samples",
+      "items": [
+        {
+          "text": "Microservice Demo",
+          "path": "Samples/Microservice-Demo.md"
+        }
+      ]
+    },
     {
       "text": "Application Modules",
       "path": "Modules/Index.md"
     },
+    {
+      "text": "Microservice Architecture",
+      "path": "Microservice-Architecture.md"
+    },
     {
       "text": "Testing"
     },

docs/zh-Hans/Virtual-File-System.md

@@ -109,7 +109,7 @@ public class MyService
 
 假设你正在开发一个包含嵌入式JavaScript文件的模块. 当你更改文件时, 你必须重新编译项目, 重新启动应用程序并刷新浏览器页面以进行更改. 显然, 这是非常耗时和乏味的.
 
-我们需要的是应用程序在开发时直接使用物理文件的能力, 让浏览器刷新时同步JavaScript文件的任何更改. `ReplaceEmbeddedByPyhsical` 方法使其成为可能.
+我们需要的是应用程序在开发时直接使用物理文件的能力, 让浏览器刷新时同步JavaScript文件的任何更改. `ReplaceEmbeddedByPhysical` 方法使其成为可能.
 
 下面的示例展示了应用程序依赖于包含嵌入文件的模块("MyModule"), 并且应用程序可以在开发过程中直接使用模块的源代码.
 
@@ -125,8 +125,8 @@ public class MyWebAppModule : AbpModule
         {
             Configure<VirtualFileSystemOptions>(options =>
             {
-                //ReplaceEmbeddedByPyhsical gets the root folder of the MyModule project
-                options.FileSets.ReplaceEmbeddedByPyhsical<MyModule>(
+                //ReplaceEmbeddedByPhysical gets the root folder of the MyModule project
+                options.FileSets.ReplaceEmbeddedByPhysical<MyModule>(
                     Path.Combine(hostingEnvironment.ContentRootPath, "..\\MyModuleProject")
                 );
             });