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

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -6,6 +6,7 @@
     "Volo.AbpIo.Commercial:010003": "You are not owner of this organization!",
     "OrganizationNotFoundMessage": "No organization found!",
     "DeveloperCount": "Developer count",
+    "QuestionCount": "Question count",
     "Owners": "Owners",
     "AddMember": "Add member",
     "AddOwner": "Add owner",

common.props

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

docs/en/Modules/Docs.md

@@ -328,7 +328,7 @@ You can use [ABP Framework](https://github.com/abpframework/abp/) GitHub documen
 For `SQL` databases, you can use the below `T-SQL` command to insert the specified sample into your `DocsProjects` table:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***"}', N'/', N'master')
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***"}', N'/', N'master', N'')
 ```
 
 Be aware that `GitHubAccessToken` is masked. It's a private token and you must get your own token and replace the `***` string.
@@ -366,7 +366,7 @@ You can use [ABP Framework](https://github.com/abpframework/abp/) GitHub documen
 For `SQL` databases, you can use the below `T-SQL` command to insert the specified sample into your `DocsProjects` table:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP framework (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL)
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP framework (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL, N'')
 ```
 
 Add one of the sample projects above and run the application. In the menu you will see `Documents` link, click the menu link to open the documents page. 

docs/zh-Hans/Modules/Docs.md

@@ -321,7 +321,7 @@ There are no projects yet!
 对于 `SQL` 数据库,你可以使用下面的 `T-SQL` 命令将指定的示例插入到 `DocsProjects` 表中:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs/zh-Hans/","GitHubAccessToken":"***"}', N'/', N'master')
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939658', N'ABP framework (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"***"}', N'/', N'master', N'')
 ```
 
 请注意，`GitHubAccessToken` 被屏蔽了.它是一个私人令牌,你必须获得自己的令牌并替换 `***` 字符串.
@@ -359,7 +359,7 @@ INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocume
 对于 `SQL` 数据库,你可以使用下面的 `T-SQL` 命令将指定的示例插入到 `DocsProjects` 表中:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP framework (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL)
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP framework (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL, N'')
 ```
 
 添加上面的一个示例项目后运行该应用程序. 在菜单中你会看到`文档` 链接，点击菜单链接打开文档页面.

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
@@ -34,6 +35,10 @@ namespace Volo.Abp.AspNetCore.Auditing
                 try
                 {
                     await next(context);
+                    if (_auditingManager.Current.Log.Exceptions.Any())
+                    {
+                        hasError = true;
+                    }
                 }
                 catch (Exception)
                 {

framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs

@@ -30,10 +30,10 @@ namespace Volo.Abp.Auditing
         /// Default: true.
         /// </summary>
         public bool IsEnabledForAnonymousUsers { get; set; }
-
+
-        /// <summary>
+        /// <summary>
-        /// Audit log on exceptions.
+        /// Audit log on exceptions.
-        /// Default: true.
+        /// Default: true.
         /// </summary>
         public bool AlwaysLogOnException { get; set; }
 

framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\configureawait.props" />
+  <Import Project="..\..\..\common.props" />
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Volo.Abp.Core</AssemblyName>

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs

@@ -1,30 +1,35 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
-using Volo.Abp.Auditing;
+using Volo.Abp.Auditing;
-
+
-namespace Volo.Abp.AspNetCore.Mvc.Auditing
+namespace Volo.Abp.AspNetCore.Mvc.Auditing
-{
+{
-    [Route("api/audit-test")]
+    [Route("api/audit-test")]
-    [Audited]
+    [Audited]
-    public class AuditTestController : AbpController
+    public class AuditTestController : AbpController
-    {
+    {
-        private readonly AbpAuditingOptions _options;
+        private readonly AbpAuditingOptions _options;
-
+
-        public AuditTestController(IOptions<AbpAuditingOptions> options)
+        public AuditTestController(IOptions<AbpAuditingOptions> options)
-        {
+        {
-            _options = options.Value;
+            _options = options.Value;
-        }
+        }
-
+
-        [Route("audit-success")]
+        [Route("audit-success")]
-        public IActionResult AuditSuccessForGetRequests()
+        public IActionResult AuditSuccessForGetRequests()
-        {
+        {
-            return Ok();
+            return Ok();
-        }
+        }
-
+
-        [Route("audit-fail")]
+        [Route("audit-fail")]
-        public IActionResult AuditFailForGetRequests()
+        public IActionResult AuditFailForGetRequests()
-        {
+        {
-            throw new UserFriendlyException("Exception occurred!");
+            throw new UserFriendlyException("Exception occurred!");
-        }
+        }
-    }
+        [Route("audit-fail-object")]
-}
+        public object AuditFailForGetRequestsReturningObject()
+        {
+            throw new UserFriendlyException("Exception occurred!");
+        }
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs

@@ -1,55 +1,65 @@
-using System;
+using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
-using NSubstitute;
+using NSubstitute;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
-using Volo.Abp.Auditing;
+using Volo.Abp.Auditing;
-using Xunit;
+using Xunit;
-
+
-namespace Volo.Abp.AspNetCore.Mvc.Auditing
+namespace Volo.Abp.AspNetCore.Mvc.Auditing
-{
+{
-    public class AuditTestController_Tests : AspNetCoreMvcTestBase
+    public class AuditTestController_Tests : AspNetCoreMvcTestBase
-    {
+    {
-        private readonly AbpAuditingOptions _options;
+        private readonly AbpAuditingOptions _options;
-        private IAuditingStore _auditingStore;
+        private IAuditingStore _auditingStore;
-
+
-        public AuditTestController_Tests()
+        public AuditTestController_Tests()
-        {
+        {
-            _options = ServiceProvider.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+            _options = ServiceProvider.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
-            _auditingStore = ServiceProvider.GetRequiredService<IAuditingStore>();
+            _auditingStore = ServiceProvider.GetRequiredService<IAuditingStore>();
-        }
+        }
-
+
-        protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+        protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
-        {
+        {
-            _auditingStore = Substitute.For<IAuditingStore>();
+            _auditingStore = Substitute.For<IAuditingStore>();
-            services.Replace(ServiceDescriptor.Singleton(_auditingStore));
+            services.Replace(ServiceDescriptor.Singleton(_auditingStore));
-            base.ConfigureServices(context, services);
+            base.ConfigureServices(context, services);
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Should_Trigger_Middleware_And_AuditLog_Success_For_GetRequests()
+        public async Task Should_Trigger_Middleware_And_AuditLog_Success_For_GetRequests()
-        {
+        {
-            _options.IsEnabledForGetRequests = true;
+            _options.IsEnabledForGetRequests = true;
-            _options.AlwaysLogOnException = false;
+            _options.AlwaysLogOnException = false;
-            await GetResponseAsync("api/audit-test/audit-success");
+            await GetResponseAsync("api/audit-test/audit-success");
-            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_Always()
+        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_Always()
-        {
+        {
-            _options.IsEnabled = true;
+            _options.IsEnabled = true;
-            _options.AlwaysLogOnException = true;
+            _options.AlwaysLogOnException = true;
-
+
-            try
+            try
-            {
+            {
-                await GetResponseAsync("api/audit-test/audit-fail", System.Net.HttpStatusCode.Forbidden);
+                await GetResponseAsync("api/audit-test/audit-fail", System.Net.HttpStatusCode.Forbidden);
-            }
+            }
-            catch { }
+            catch { }
-
+
-            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
-        }
+        }
-    }
+        [Fact]
-}
+        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Returns_Object()
+        {
+            _options.IsEnabled = true;
+            _options.AlwaysLogOnException = true;
+
+            await GetResponseAsync("api/audit-test/audit-fail-object", System.Net.HttpStatusCode.Forbidden);
+
+            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
+        }
+    }
+}

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using CommonMark;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Localization;
@@ -30,30 +32,27 @@ namespace Volo.Blogging.Pages.Blog
 
         public string GetShortContent(string content) //TODO: This should be moved to its own place!
         {
-            var openingTag = "<p>";
-            var closingTag = "</p>";
-
             var html = RenderMarkdownToString(content);
-            if (string.IsNullOrWhiteSpace(html))
+            var plainText = Regex.Replace(html, "<[^>]*>", "");
+
+            if (string.IsNullOrWhiteSpace(plainText))
             {
                 return "";
             }
-            var splittedHtml = html.Split(closingTag);
 
-            if (splittedHtml.Length < 1)
+            var firsParag = plainText.Split(Environment.NewLine).FirstOrDefault(s => !string.IsNullOrWhiteSpace(s));
+
+            if (firsParag == null)
             {
-                return "";
+                return plainText;
             }
 
-            var firstHtmlPart = splittedHtml[0];
+            if (firsParag.Length <= MaxShortContentLength)
-            var paragraphStartIndex = firstHtmlPart.IndexOf(openingTag, StringComparison.Ordinal) + openingTag.Length;
-
-            if (firstHtmlPart.Length - paragraphStartIndex <= MaxShortContentLength)
             {
-                return firstHtmlPart.Substring(paragraphStartIndex);
+                return firsParag;
             }
 
-            return firstHtmlPart.Substring(paragraphStartIndex, MaxShortContentLength) + "...";
+            return firsParag.Substring(0, MaxShortContentLength) + "...";
         }
 
         public IHtmlContent RenderMarkdownToHtml(string content)

modules/docs/Volo.Docs.sln

@@ -57,9 +57,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoloDocs.Web", "app\VoloDoc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoloDocs.Migrator", "app\VoloDocs.Migrator\VoloDocs.Migrator.csproj", "{8A5E5001-C017-44A8-ADDA-DC66C102556E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.MongoDB", "src\Volo.Docs.MongoDB\Volo.Docs.MongoDB.csproj", "{DBE846CD-1BED-4F2C-ABF2-94F6240BCB9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB", "src\Volo.Docs.MongoDB\Volo.Docs.MongoDB.csproj", "{DBE846CD-1BED-4F2C-ABF2-94F6240BCB9B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.MongoDB.Tests", "test\Volo.Docs.MongoDB.Tests\Volo.Docs.MongoDB.Tests.csproj", "{C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB.Tests", "test\Volo.Docs.MongoDB.Tests\Volo.Docs.MongoDB.Tests.csproj", "{C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.Designer.cs

@@ -1,465 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using VoloDocs.EntityFrameworkCore;
-
-namespace VoloDocs.EntityFrameworkCore.Migrations
-{
-    [DbContext(typeof(VoloDocsDbContext))]
-    [Migration("20181225134002_Initial20181225")]
-    partial class Initial20181225
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Regex")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("RegexDescription")
-                        .HasMaxLength(128);
-
-                    b.Property<bool>("Required");
-
-                    b.Property<int>("ValueType");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AbpClaimTypes");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
-
-                    b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
-
-                    b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedName")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName");
-
-                    b.ToTable("AbpRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AbpRoleClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AccessFailedCount")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("AccessFailedCount")
-                        .HasDefaultValue(0);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
-
-                    b.Property<string>("Email")
-                        .HasColumnName("Email")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("EmailConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("LockoutEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTimeOffset?>("LockoutEnd");
-
-                    b.Property<string>("Name")
-                        .HasColumnName("Name")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasColumnName("NormalizedEmail")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedUserName")
-                        .IsRequired()
-                        .HasColumnName("NormalizedUserName")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnName("PasswordHash")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnName("PhoneNumber")
-                        .HasMaxLength(16);
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("PhoneNumberConfirmed")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("SecurityStamp")
-                        .IsRequired()
-                        .HasColumnName("SecurityStamp")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Surname")
-                        .HasColumnName("Surname")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("TwoFactorEnabled")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnName("UserName")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("NormalizedEmail");
-
-                    b.HasIndex("NormalizedUserName");
-
-                    b.HasIndex("UserName");
-
-                    b.ToTable("AbpUsers");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<Guid>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AbpUserClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(196);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "LoginProvider");
-
-                    b.HasIndex("LoginProvider", "ProviderKey");
-
-                    b.ToTable("AbpUserLogins");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<Guid>("RoleId");
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId", "UserId");
-
-                    b.ToTable("AbpUserRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.Property<Guid>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(128);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.Property<string>("Value");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AbpUserTokens");
-                });
-
-            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .IsRequired()
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpPermissionGrants");
-                });
-
-            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(2048);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpSettings");
-                });
-
-            modelBuilder.Entity("Volo.Docs.Projects.Project", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
-
-                    b.Property<string>("DefaultDocumentName")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("DocumentStoreType");
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
-
-                    b.Property<string>("Format");
-
-                    b.Property<string>("LatestVersionBranchName")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("MainWebsiteUrl");
-
-                    b.Property<string>("MinimumVersion");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("NavigationDocumentName")
-                        .IsRequired()
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ShortName")
-                        .IsRequired()
-                        .HasMaxLength(32);
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DocsProjects");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany("Claims")
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Claims")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Logins")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Roles")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
-                        .WithMany("Tokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.cs

@@ -0,0 +1,670 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using VoloDocs.EntityFrameworkCore;
+
+namespace VoloDocs.EntityFrameworkCore.Migrations
+{
+    [DbContext(typeof(VoloDocsDbContext))]
+    [Migration("20200218014727_init")]
+    partial class init
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpClaimTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("AbpRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AbpRoleClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
+                        .HasDefaultValue(0);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("AbpUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AbpUserClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(196)")
+                        .HasMaxLength(196);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("AbpUserLogins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("AbpUserRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AbpUserTokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpPermissionGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpSettings");
+                });
+
+            modelBuilder.Entity("Volo.Docs.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("EditLink")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Format")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("LanguageCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<DateTime>("LastCachedTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("LastUpdatedTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("LocalDirectory")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(255)")
+                        .HasMaxLength(255);
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("RawRootUrl")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("RootUrl")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocsDocuments");
+                });
+
+            modelBuilder.Entity("Volo.Docs.Documents.DocumentContributor", b =>
+                {
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("AvatarUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserProfileUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("DocumentId", "Username");
+
+                    b.ToTable("DocsDocumentContributors");
+                });
+
+            modelBuilder.Entity("Volo.Docs.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DefaultDocumentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("DocumentStoreType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Format")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("LatestVersionBranchName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("MainWebsiteUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MinimumVersion")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("NavigationDocumentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ParametersDocumentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ShortName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(32)")
+                        .HasMaxLength(32);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocsProjects");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Docs.Documents.DocumentContributor", b =>
+                {
+                    b.HasOne("Volo.Docs.Documents.Document", null)
+                        .WithMany("Contributors")
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.cs → modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace VoloDocs.EntityFrameworkCore.Migrations
 {
-    public partial class Initial20181225 : Migration
+    public partial class init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -95,8 +95,8 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     NormalizedUserName = table.Column<string>(maxLength: 256, nullable: false),
                     Name = table.Column<string>(maxLength: 64, nullable: true),
                     Surname = table.Column<string>(maxLength: 64, nullable: true),
-                    Email = table.Column<string>(maxLength: 256, nullable: true),
+                    Email = table.Column<string>(maxLength: 256, nullable: false),
-                    NormalizedEmail = table.Column<string>(maxLength: 256, nullable: true),
+                    NormalizedEmail = table.Column<string>(maxLength: 256, nullable: false),
                     EmailConfirmed = table.Column<bool>(nullable: false, defaultValue: false),
                     PasswordHash = table.Column<string>(maxLength: 256, nullable: true),
                     SecurityStamp = table.Column<string>(maxLength: 256, nullable: false),
@@ -112,6 +112,33 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     table.PrimaryKey("PK_AbpUsers", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "DocsDocuments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(nullable: false),
+                    ExtraProperties = table.Column<string>(nullable: true),
+                    ConcurrencyStamp = table.Column<string>(nullable: true),
+                    ProjectId = table.Column<Guid>(nullable: false),
+                    Name = table.Column<string>(maxLength: 255, nullable: false),
+                    Version = table.Column<string>(maxLength: 128, nullable: false),
+                    LanguageCode = table.Column<string>(maxLength: 128, nullable: false),
+                    FileName = table.Column<string>(maxLength: 128, nullable: false),
+                    Content = table.Column<string>(nullable: false),
+                    Format = table.Column<string>(maxLength: 128, nullable: true),
+                    EditLink = table.Column<string>(maxLength: 2048, nullable: true),
+                    RootUrl = table.Column<string>(maxLength: 2048, nullable: true),
+                    RawRootUrl = table.Column<string>(maxLength: 2048, nullable: true),
+                    LocalDirectory = table.Column<string>(maxLength: 512, nullable: true),
+                    CreationTime = table.Column<DateTime>(nullable: false),
+                    LastUpdatedTime = table.Column<DateTime>(nullable: false),
+                    LastCachedTime = table.Column<DateTime>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DocsDocuments", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "DocsProjects",
                 columns: table => new
@@ -124,6 +151,7 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     Format = table.Column<string>(nullable: true),
                     DefaultDocumentName = table.Column<string>(maxLength: 128, nullable: false),
                     NavigationDocumentName = table.Column<string>(maxLength: 128, nullable: false),
+                    ParametersDocumentName = table.Column<string>(maxLength: 128, nullable: false),
                     MinimumVersion = table.Column<string>(nullable: true),
                     DocumentStoreType = table.Column<string>(nullable: true),
                     MainWebsiteUrl = table.Column<string>(nullable: true),
@@ -180,9 +208,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                 name: "AbpUserLogins",
                 columns: table => new
                 {
-                    TenantId = table.Column<Guid>(nullable: true),
                     UserId = table.Column<Guid>(nullable: false),
                     LoginProvider = table.Column<string>(maxLength: 64, nullable: false),
+                    TenantId = table.Column<Guid>(nullable: true),
                     ProviderKey = table.Column<string>(maxLength: 196, nullable: false),
                     ProviderDisplayName = table.Column<string>(maxLength: 128, nullable: true)
                 },
@@ -201,9 +229,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                 name: "AbpUserRoles",
                 columns: table => new
                 {
-                    TenantId = table.Column<Guid>(nullable: true),
                     UserId = table.Column<Guid>(nullable: false),
-                    RoleId = table.Column<Guid>(nullable: false)
+                    RoleId = table.Column<Guid>(nullable: false),
+                    TenantId = table.Column<Guid>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -226,10 +254,10 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                 name: "AbpUserTokens",
                 columns: table => new
                 {
-                    TenantId = table.Column<Guid>(nullable: true),
                     UserId = table.Column<Guid>(nullable: false),
                     LoginProvider = table.Column<string>(maxLength: 64, nullable: false),
                     Name = table.Column<string>(maxLength: 128, nullable: false),
+                    TenantId = table.Column<Guid>(nullable: true),
                     Value = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
@@ -243,6 +271,26 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "DocsDocumentContributors",
+                columns: table => new
+                {
+                    DocumentId = table.Column<Guid>(nullable: false),
+                    Username = table.Column<string>(nullable: false),
+                    UserProfileUrl = table.Column<string>(nullable: true),
+                    AvatarUrl = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DocsDocumentContributors", x => new { x.DocumentId, x.Username });
+                    table.ForeignKey(
+                        name: "FK_DocsDocumentContributors_DocsDocuments_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "DocsDocuments",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateIndex(
                 name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey",
                 table: "AbpPermissionGrants",
@@ -325,6 +373,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             migrationBuilder.DropTable(
                 name: "AbpUserTokens");
 
+            migrationBuilder.DropTable(
+                name: "DocsDocumentContributors");
+
             migrationBuilder.DropTable(
                 name: "DocsProjects");
 
@@ -333,6 +384,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
 
             migrationBuilder.DropTable(
                 name: "AbpUsers");
+
+            migrationBuilder.DropTable(
+                name: "DocsDocuments");
         }
     }
 }

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs

@@ -15,42 +15,52 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
+                .HasAnnotation("ProductVersion", "3.1.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<bool>("IsStatic");
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
                         .HasMaxLength(512);
 
                     b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<bool>("Required");
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
 
-                    b.Property<int>("ValueType");
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -60,35 +70,44 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
                         .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault");
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic");
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
 
                     b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic");
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -100,18 +119,22 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -123,105 +146,133 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<int>("AccessFailedCount")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
                         .HasDefaultValue(0);
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime");
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId");
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId");
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime");
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<string>("Email")
+                        .IsRequired()
                         .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<bool>("EmailConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime");
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
 
                     b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId");
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("LockoutEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
-                    b.Property<DateTimeOffset?>("LockoutEnd");
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
 
                     b.Property<string>("Name")
                         .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("NormalizedEmail")
+                        .IsRequired()
                         .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("NormalizedUserName")
                         .IsRequired()
                         .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PasswordHash")
                         .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("PhoneNumber")
                         .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
                         .HasMaxLength(16);
 
                     b.Property<bool>("PhoneNumberConfirmed")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("SecurityStamp")
                         .IsRequired()
                         .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("Surname")
                         .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId");
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<bool>("TwoFactorEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
                         .HasDefaultValue(false);
 
                     b.Property<string>("UserName")
                         .IsRequired()
                         .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.HasKey("Id");
@@ -240,18 +291,22 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ClaimType")
                         .IsRequired()
+                        .HasColumnType("nvarchar(256)")
                         .HasMaxLength(256);
 
                     b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
                         .HasMaxLength(1024);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -262,19 +317,24 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(196)")
                         .HasMaxLength(196);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "LoginProvider");
 
@@ -285,11 +345,14 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("RoleId");
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("UserId", "RoleId");
 
@@ -300,17 +363,22 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.Property<Guid>("UserId");
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("Value");
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
@@ -320,21 +388,26 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
-                    b.Property<Guid?>("TenantId");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
 
@@ -346,20 +419,25 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
                         .HasMaxLength(64);
 
                     b.Property<string>("Value")
                         .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
                         .HasMaxLength(2048);
 
                     b.HasKey("Id");
@@ -369,43 +447,155 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     b.ToTable("AbpSettings");
                 });
 
+            modelBuilder.Entity("Volo.Docs.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("EditLink")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Format")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("LanguageCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<DateTime>("LastCachedTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("LastUpdatedTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("LocalDirectory")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(255)")
+                        .HasMaxLength(255);
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("RawRootUrl")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("RootUrl")
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocsDocuments");
+                });
+
+            modelBuilder.Entity("Volo.Docs.Documents.DocumentContributor", b =>
+                {
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("AvatarUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserProfileUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("DocumentId", "Username");
+
+                    b.ToTable("DocsDocumentContributors");
+                });
+
             modelBuilder.Entity("Volo.Docs.Projects.Project", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("DefaultDocumentName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<string>("DocumentStoreType");
+                    b.Property<string>("DocumentStoreType")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties");
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("Format");
+                    b.Property<string>("Format")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("LatestVersionBranchName")
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
-                    b.Property<string>("MainWebsiteUrl");
+                    b.Property<string>("MainWebsiteUrl")
+                        .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("MinimumVersion");
+                    b.Property<string>("MinimumVersion")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Name")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("NavigationDocumentName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ParametersDocumentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
                         .HasMaxLength(128);
 
                     b.Property<string>("ShortName")
                         .IsRequired()
+                        .HasColumnType("nvarchar(32)")
                         .HasMaxLength(32);
 
                     b.HasKey("Id");
@@ -415,47 +605,62 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany("Claims")
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
                         .WithMany()
                         .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
                 {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
                         .WithMany("Tokens")
                         .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Docs.Documents.DocumentContributor", b =>
+                {
+                    b.HasOne("Volo.Docs.Documents.Document", null)
+                        .WithMany("Contributors")
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
                 });
 #pragma warning restore 612, 618
         }

modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\..\configureawait.props" />
 
@@ -19,6 +19,10 @@
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -34,6 +38,7 @@
     <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" />
+    <ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Application\Volo.Abp.Account.Application.csproj" />
   </ItemGroup>
 
   <ItemGroup>

modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs

@@ -31,6 +31,7 @@ using VoloDocs.EntityFrameworkCore;
 using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
+using Volo.Abp.Account;
 using Volo.Abp.Validation.Localization;
 
 namespace VoloDocs.Web
@@ -43,6 +44,7 @@ namespace VoloDocs.Web
         typeof(VoloDocsEntityFrameworkCoreModule),
         typeof(AbpAutofacModule),
         typeof(AbpAccountWebModule),
+        typeof(AbpAccountApplicationModule),
         typeof(AbpIdentityWebModule),
         typeof(AbpIdentityApplicationModule),
         typeof(AbpPermissionManagementDomainIdentityModule),
@@ -142,6 +144,12 @@ namespace VoloDocs.Web
             var env = context.GetEnvironment();
 
             app.UseVirtualFiles();
+            app.UseRouting();
+
+            app.UseAuthentication();
+            app.UseAuthorization();
+
+            app.UseAbpRequestLocalization();
 
             app.UseSwagger();
             app.UseSwaggerUI(options =>
@@ -149,24 +157,11 @@ namespace VoloDocs.Web
                 options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API");
             });
 
-            app.UseAuthentication();
-
-            app.UseAbpRequestLocalization();
-
             app.UseStatusCodePagesWithReExecute("/error/{0}");
            
             //app.UseMiddleware<GlobalExceptionHandlerMiddleware>();
 
-            app.UseMvc(routes =>
+            app.UseMvcWithDefaultRouteAndArea();
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
-
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
 
             using (var scope = context.ServiceProvider.CreateScope())
             {

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissionDefinitionProvider.cs

@@ -14,6 +14,9 @@ namespace Volo.Docs.Admin
             projects.AddChild(DocsAdminPermissions.Projects.Update, L("Permission:Edit"));
             projects.AddChild(DocsAdminPermissions.Projects.Delete, L("Permission:Delete"));
             projects.AddChild(DocsAdminPermissions.Projects.Create, L("Permission:Create"));
+
+            group.AddPermission(DocsAdminPermissions.Documents.Default, L("Permission:Documents"));
+
         }
 
         private static LocalizableString L(string name)

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs

@@ -14,6 +14,12 @@ namespace Volo.Docs.Admin
             public const string Create = Default + ".Create";
         }
 
+        public static class Documents
+        {
+            public const string Default = GroupName + ".Documents";
+        }
+
+
         public static string[] GetAll()
         {
             return ReflectionHelper.GetPublicConstantsRecursively(typeof(DocsAdminPermissions));

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Docs.Admin.Documents
+{
+    public interface IDocumentAdminAppService : IApplicationService
+    {
+        Task PullAllAsync(PullAllDocumentInput input);
+
+        Task PullAsync(PullDocumentInput input);
+    }
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/PullAllDocumentInput.cs

@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Docs.Documents;
+
+namespace Volo.Docs.Admin.Documents
+{
+    public class PullAllDocumentInput
+    {
+        public Guid ProjectId { get; set; }
+
+        [StringLength(DocumentConsts.MaxLanguageCodeNameLength)]
+        public string LanguageCode { get; set; }
+
+        [StringLength(DocumentConsts.MaxVersionNameLength)]
+        public string Version { get; set; }
+    }
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/PullDocumentInput.cs

@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Docs.Documents;
+
+namespace Volo.Docs.Admin.Documents
+{
+    public class PullDocumentInput
+    {
+        public Guid ProjectId { get; set; }
+
+        [StringLength(DocumentConsts.MaxNameLength)]
+        public string Name { get; set; }
+
+        [StringLength(DocumentConsts.MaxLanguageCodeNameLength)]
+        public string LanguageCode { get; set; }
+
+        [StringLength(DocumentConsts.MaxVersionNameLength)]
+        public string Version { get; set; }
+    }
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json

@@ -6,11 +6,13 @@
     "Permission:Edit": "Edit",
     "Permission:Delete": "Delete",
     "Permission:Create": "Create",
+    "Permission:Documents": "Documents",
     "Menu:DocumentManagement": "Documents",
     "Menu:ProjectManagement": "Projects",
     "CreateANewProject": "Create new project",
     "Edit": "Edit",
     "Create": "Create",
+    "Pull": "Pull",
     "Projects": "Projects",
     "Name": "Name",
     "ShortName": "ShortName",
@@ -27,6 +29,9 @@
     "DisplayName:LatestVersionBranchName": "Latest version branch name",
     "DisplayName:GitHubRootUrl": "GitHub root URL",
     "DisplayName:GitHubAccessToken": "GitHub access token",
-    "DisplayName:GitHubUserAgent": "GitHub user agent"
+    "DisplayName:GitHubUserAgent": "GitHub user agent",
+    "DisplayName:All": "Pull all",
+    "DisplayName:LanguageCode": "Language code",
+    "DisplayName:Version": "Version"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json

@@ -6,11 +6,13 @@
     "Permission:Edit": "Düzenle",
     "Permission:Delete": "Sil",
     "Permission:Create": "Oluştur",
+    "Permission:Documents": "Döküman",
     "Menu:DocumentManagement": "Dökümanlar",
     "Menu:ProjectManagement": "Projeler",
     "CreateANewProject": "Yeni proje oluştur",
     "Edit": "Düzenle",
     "Create": "Yeni oluştur",
+    "Pull": "çekme",
     "Projects": "Projeler",
     "Name": "İsim",
     "ShortName": "Kısa isim",
@@ -26,6 +28,9 @@
     "DisplayName:MainWebsiteUrl": "Ana web site URL",
     "DisplayName:LatestVersionBranchName": "Son versiyon Branch adı",
     "DisplayName:GitHubRootUrl": "GitHub kök adresi",
-    "DisplayName:GitHubAccessToken": "GitHub erişim token"
+    "DisplayName:GitHubAccessToken": "GitHub erişim token",
+    "DisplayName:All": "Çekme bütün",
+    "DisplayName:LanguageCode": "Dil kodu",
+    "DisplayName:Version": "versiyon"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hans.json

@@ -6,11 +6,13 @@
     "Permission:Edit": "编辑",
     "Permission:Delete": "删除",
     "Permission:Create": "创建",
+    "Permission:Documents": "文档",
     "Menu:DocumentManagement": "文档",
     "Menu:ProjectManagement": "项目",
     "CreateANewProject": "创建新项目",
     "Edit": "编辑",
     "Create": "创建",
+    "Pull": "拉取",
     "Projects": "项目",
     "Name": "名称",
     "ShortName": "简称",
@@ -27,6 +29,9 @@
     "DisplayName:LatestVersionBranchName": "最新版本的分支名称",
     "DisplayName:GitHubRootUrl": "GitHub根网址",
     "DisplayName:GitHubAccessToken": "GitHub访问令牌",
-    "DisplayName:GitHubUserAgent": "GitHub用户代理"
+    "DisplayName:GitHubUserAgent": "GitHub用户代理",
+    "DisplayName:All": "拉取所有",
+    "DisplayName:LanguageCode": "语言代码",
+    "DisplayName:Version": "版本"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hant.json

@@ -6,11 +6,13 @@
     "Permission:Edit": "編輯",
     "Permission:Delete": "刪除",
     "Permission:Create": "建立",
+    "Permission:Documents": "文件",
     "Menu:DocumentManagement": "文件管理",
     "Menu:ProjectManagement": "專案管理",
     "CreateANewProject": "建立新專案",
     "Edit": "編輯",
     "Create": "建立",
+    "Pull": "拉取",
     "Projects": "專案",
     "Name": "名稱",
     "ShortName": "簡稱",
@@ -27,6 +29,9 @@
     "DisplayName:LatestVersionBranchName": "最新版本的分支名稱",
     "DisplayName:GitHubRootUrl": "GitHub根網址",
     "DisplayName:GitHubAccessToken": "GitHub 存取Token ",
-    "DisplayName:GitHubUserAgent": "GitHub 使用者代理"
+    "DisplayName:GitHubUserAgent": "GitHub 使用者代理",
+    "DisplayName:All": "拉取所有",
+    "DisplayName:LanguageCode": "語言代碼",
+    "DisplayName:Version": "版本"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Newtonsoft.Json;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
+using Volo.Docs.Documents;
+using Volo.Docs.Projects;
+
+namespace Volo.Docs.Admin.Documents
+{
+    [Authorize(DocsAdminPermissions.Documents.Default)]
+    public class DocumentAdminAppService : ApplicationService, IDocumentAdminAppService
+    {
+        private readonly IProjectRepository _projectRepository;
+        private readonly IDocumentRepository _documentRepository;
+        private readonly IDocumentSourceFactory _documentStoreFactory;
+        private readonly IDistributedCache<DocumentUpdateInfo> _documentUpdateCache;
+
+        public DocumentAdminAppService(IProjectRepository projectRepository,
+            IDocumentRepository documentRepository,
+            IDocumentSourceFactory documentStoreFactory, 
+            IDistributedCache<DocumentUpdateInfo> documentUpdateCache)
+        {
+            _projectRepository = projectRepository;
+            _documentRepository = documentRepository;
+            _documentStoreFactory = documentStoreFactory;
+            _documentUpdateCache = documentUpdateCache;
+        }
+
+        public async Task PullAllAsync(PullAllDocumentInput input)
+        {
+            var project = await _projectRepository.GetAsync(input.ProjectId);
+
+            var navigationFile = await GetDocumentAsync(
+                project,
+                project.NavigationDocumentName,
+                input.LanguageCode,
+                input.Version
+            );
+
+            var nav = JsonConvert.DeserializeObject<NavigationNode>(navigationFile.Content);
+            var leafs = nav.Items.GetAllNodes(x => x.Items)
+                .Where(x => x.IsLeaf && !x.Path.IsNullOrWhiteSpace())
+                .ToList();
+
+            var source = _documentStoreFactory.Create(project.DocumentStoreType);
+
+            var documents = new List<Document>();
+            foreach (var leaf in leafs)
+            {
+                var sourceDocument =
+                    await source.GetDocumentAsync(project, leaf.Path, input.LanguageCode, input.Version);
+                documents.Add(sourceDocument);
+            }
+
+            foreach (var document in documents)
+            {
+                await _documentRepository.DeleteAsync(document.ProjectId, document.Name,
+                    document.LanguageCode,
+                    document.Version);
+
+                await _documentRepository.InsertAsync(document, true);
+                await UpdateDocumentUpdateInfoCache(document);
+            }
+        }
+
+        public async Task PullAsync(PullDocumentInput input)
+        {
+            var project = await _projectRepository.GetAsync(input.ProjectId);
+
+            var source = _documentStoreFactory.Create(project.DocumentStoreType);
+            var sourceDocument = await source.GetDocumentAsync(project, input.Name, input.LanguageCode, input.Version);
+
+            await _documentRepository.DeleteAsync(sourceDocument.ProjectId, sourceDocument.Name,
+                sourceDocument.LanguageCode, sourceDocument.Version);
+            await _documentRepository.InsertAsync(sourceDocument, true);
+            await UpdateDocumentUpdateInfoCache(sourceDocument);
+        }
+
+        private async Task UpdateDocumentUpdateInfoCache(Document document)
+        {
+            var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
+            await _documentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
+            {
+                Name = document.Name,
+                CreationTime = document.CreationTime,
+                LastUpdatedTime = document.LastUpdatedTime
+            });
+        }
+
+        private async Task<Document> GetDocumentAsync(
+            Project project,
+            string documentName,
+            string languageCode,
+            string version)
+        {
+            version = string.IsNullOrWhiteSpace(version) ? project.LatestVersionBranchName : version;
+            var source = _documentStoreFactory.Create(project.DocumentStoreType);
+            var document = await source.GetDocumentAsync(project, documentName, languageCode, version);
+            return document;
+        }
+    }
+}

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs

@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Docs.Admin.Documents;
+
+namespace Volo.Docs.Admin
+{
+    [RemoteService]
+    [Area("docs")]
+    [ControllerName("DocumentsAdmin")]
+    [Route("api/docs/admin/documents")]
+    public class DocumentsAdminController : AbpController, IDocumentAdminAppService
+    {
+        private readonly IDocumentAdminAppService _documentAdminAppService;
+
+        public DocumentsAdminController(IDocumentAdminAppService documentAdminAppService)
+        {
+            _documentAdminAppService = documentAdminAppService;
+        }
+
+        [HttpPost]
+        [Route("PullAll")]
+        public Task PullAllAsync(PullAllDocumentInput input)
+        {
+            return _documentAdminAppService.PullAllAsync(input);
+        }
+
+        [HttpPost]
+        [Route("Pull")]
+        public Task PullAsync(PullDocumentInput input)
+        {
+             return _documentAdminAppService.PullAsync(input);
+        }
+    }
+}

modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
+using Volo.Docs.Admin.Documents;
 using Volo.Docs.Admin.Pages.Docs.Admin.Projects;
 using Volo.Docs.Admin.Projects;
 
@@ -15,6 +16,9 @@ namespace Volo.Docs.Admin
 
             CreateMap<ProjectDto, EditModel.EditGithubProjectViewModel > ()
                 .Ignore(x => x.GitHubAccessToken).Ignore(x => x.GitHubRootUrl).Ignore(x => x.GitHubUserAgent);
+
+            CreateMap<PullModel.PullDocumentViewModel, PullAllDocumentInput>();
+            CreateMap<PullModel.PullDocumentViewModel, PullDocumentInput>();
         }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml

@@ -20,6 +20,7 @@
     <abp-script src="/Pages/Docs/Admin/Projects/index.js" />
     <abp-script src="/Pages/Docs/Admin/Projects/create.js" />
     <abp-script src="/Pages/Docs/Admin/Projects/edit.js" />
+    <abp-script src="/Pages/Docs/Admin/Projects/pull.js" />
 }
 
 <abp-card>

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml

@@ -0,0 +1,22 @@
+@page
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Docs.Admin.Pages.Docs.Admin.Projects
+@inherits Volo.Docs.Admin.Pages.Docs.Admin.DocsAdminPage
+@model Volo.Docs.Admin.Pages.Docs.Admin.Projects.PullModel
+@{
+    Layout = null;
+}
+
+@if (Model.PullDocument != null)
+{
+    <abp-dynamic-form submit-button="false" abp-model="@Model.PullDocument" asp-page="/Docs/Admin/Projects/Pull">
+        <abp-modal size="@(AbpModalSize.Default)">
+            <abp-modal-header title="@L["Pull"].Value"></abp-modal-header>
+            <abp-modal-body>
+                <abp-form-content />
+            </abp-modal-body>
+            <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)">
+            </abp-modal-footer>
+        </abp-modal>
+    </abp-dynamic-form>
+}

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs

@@ -0,0 +1,75 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Docs.Admin.Documents;
+using Volo.Docs.Admin.Projects;
+using Volo.Docs.Documents;
+
+namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
+{
+    public class PullModel : DocsAdminPageModel
+    {
+        [BindProperty]
+        public PullDocumentViewModel PullDocument { get; set; }
+
+        private readonly IProjectAdminAppService _projectAppService;
+        private readonly IDocumentAdminAppService _documentAppService;
+
+        public PullModel(IProjectAdminAppService projectAppService, 
+            IDocumentAdminAppService documentAppService)
+        {
+            _projectAppService = projectAppService;
+            _documentAppService = documentAppService;
+        }
+
+        public async Task<ActionResult> OnGetAsync(Guid id)
+        {
+            var project = await _projectAppService.GetAsync(id);
+
+            PullDocument = new PullDocumentViewModel()
+            {
+                ProjectId = project.Id,
+                All = false
+            };
+
+            return Page();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            if (PullDocument.All)
+            {
+                await _documentAppService.PullAllAsync(
+                    ObjectMapper.Map<PullDocumentViewModel, PullAllDocumentInput>(PullDocument));
+            }
+            else
+            {
+                await _documentAppService.PullAsync(
+                    ObjectMapper.Map<PullDocumentViewModel, PullDocumentInput>(PullDocument));
+            }
+
+            return NoContent();
+        }
+
+        public class PullDocumentViewModel
+        {
+            [HiddenInput]
+            public Guid ProjectId { get; set; }
+
+            public bool All { get; set; }
+
+            [Required]
+            [StringLength(DocumentConsts.MaxNameLength)]
+            public string Name { get; set; }
+
+            [Required]
+            [StringLength(DocumentConsts.MaxLanguageCodeNameLength)]
+            public string LanguageCode { get; set; }
+
+            [Required]
+            [StringLength(DocumentConsts.MaxVersionNameLength)]
+            public string Version { get; set; }
+        }
+    }
+}

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.js

@@ -0,0 +1,23 @@
+var abp = abp || {};
+
+$(function () {
+    abp.modals.projectPull = function () {
+        var initModal = function (publicApi, args) {
+            var $form = publicApi.getForm();
+            var fg = $form.find("#PullDocument_Name").parent();
+            var nameInput = fg.html();
+
+            $form.find("input:checkbox").change(function() {
+                if ($(this).prop("checked")) {
+                    fg.html("");
+                } else {
+                    fg.html(nameInput);
+                }
+            });
+        };
+
+        return {
+            initModal: initModal
+        };
+    };
+});

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js

@@ -12,6 +12,11 @@
         modalClass: 'projectEdit'
     });
 
+    var _pullModal = new abp.ModalManager({
+        viewUrl: abp.appPath + 'Docs/Admin/Projects/Pull',
+        modalClass: 'projectPull'
+    });
+
 
     var _dataTable = $('#ProjectsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
         processing: true,
@@ -48,6 +53,15 @@
                                             _dataTable.ajax.reload();
                                         });
                                 }
+                            },
+                            {
+                                text: l('Pull'),
+                                visible: abp.auth.isGranted('Docs.Admin.Documents'),
+                                action: function (data) {
+                                    _pullModal.open({
+                                        Id: data.record.id
+                                    });
+                                }
                             }
                         ]
                 }

modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/DocumentWithDetailsDto.cs

@@ -7,23 +7,31 @@ namespace Volo.Docs.Documents
     [Serializable]
     public class DocumentWithDetailsDto
     {
-        public string Title { get; set; }
+        public virtual string Name { get; set; }
 
-        public string Content { get; set; }
+        public virtual string Version { get; set; }
 
-        public string Format { get; set; }
+        public virtual string LanguageCode { get; set; }
 
-        public string EditLink { get; set; }
+        public virtual string FileName { get; set; }
 
-        public string RootUrl { get; set; }
+        public virtual string Content { get; set; }
 
-        public string RawRootUrl { get; set; }
+        public virtual string Format { get; set; }
 
-        public string Version { get; set; }
+        public virtual string EditLink { get; set; }
 
-        public string LocalDirectory { get; set; }
+        public virtual string RootUrl { get; set; }
 
-        public string FileName { get; set; }
+        public virtual string RawRootUrl { get; set; }
+
+        public virtual string LocalDirectory { get; set; }
+
+        public virtual DateTime CreationTime { get; set; }
+
+        public virtual DateTime LastUpdatedTime { get; set; }
+
+        public virtual DateTime LastCachedTime { get; set; }
 
         public ProjectDto Project { get; set; }
 

modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/IDocumentAppService.cs

@@ -9,7 +9,7 @@ namespace Volo.Docs.Documents
 
         Task<DocumentWithDetailsDto> GetDefaultAsync(GetDefaultDocumentInput input);
 
-        Task<DocumentWithDetailsDto> GetNavigationAsync(GetNavigationDocumentInput input);
+        Task<NavigationNode> GetNavigationAsync(GetNavigationDocumentInput input);
 
         Task<DocumentParametersDto> GetParametersAsync(GetParametersDocumentInput input);
 

modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Hosting;
@@ -13,24 +14,27 @@ namespace Volo.Docs.Documents
     public class DocumentAppService : DocsAppServiceBase, IDocumentAppService
     {
         private readonly IProjectRepository _projectRepository;
-        private readonly IDocumentStoreFactory _documentStoreFactory;
+        private readonly IDocumentRepository _documentRepository;
-        protected IDistributedCache<DocumentWithDetailsDto> DocumentCache { get; }
+        private readonly IDocumentSourceFactory _documentStoreFactory;
         protected IDistributedCache<LanguageConfig> LanguageCache { get; }
         protected IDistributedCache<DocumentResourceDto> ResourceCache { get; }
+        protected IDistributedCache<DocumentUpdateInfo> DocumentUpdateCache { get; }
         protected IHostEnvironment HostEnvironment { get; }
         public DocumentAppService(
             IProjectRepository projectRepository,
-            IDocumentStoreFactory documentStoreFactory,
+            IDocumentRepository documentRepository,
-            IDistributedCache<DocumentWithDetailsDto> documentCache,
+            IDocumentSourceFactory documentStoreFactory,
             IDistributedCache<LanguageConfig> languageCache,
             IDistributedCache<DocumentResourceDto> resourceCache,
+            IDistributedCache<DocumentUpdateInfo> documentUpdateCache,
             IHostEnvironment hostEnvironment)
         {
             _projectRepository = projectRepository;
+            _documentRepository = documentRepository;
             _documentStoreFactory = documentStoreFactory;
-            DocumentCache = documentCache;
             LanguageCache = languageCache;
             ResourceCache = resourceCache;
+            DocumentUpdateCache = documentUpdateCache;
             HostEnvironment = hostEnvironment;
         }
 
@@ -58,16 +62,35 @@ namespace Volo.Docs.Documents
             );
         }
 
-        public virtual async Task<DocumentWithDetailsDto> GetNavigationAsync(GetNavigationDocumentInput input)
+        public virtual async Task<NavigationNode> GetNavigationAsync(GetNavigationDocumentInput input)
         {
             var project = await _projectRepository.GetAsync(input.ProjectId);
 
-            return await GetDocumentWithDetailsDtoAsync(
+            var navigationDocument = await GetDocumentWithDetailsDtoAsync(
                 project,
                 project.NavigationDocumentName,
                 input.LanguageCode,
                 input.Version
             );
+
+            var navigationNode = JsonConvert.DeserializeObject<NavigationNode>(navigationDocument.Content);
+
+            var leafs = navigationNode.Items.GetAllNodes(x => x.Items)
+                .Where(x => !x.Path.IsNullOrWhiteSpace())
+                .ToList();
+
+            foreach (var leaf in leafs)
+            {
+                var cacheKey = $"DocumentUpdateInfo{project.Id}#{leaf.Path}#{input.LanguageCode}#{input.Version}";
+                var documentUpdateInfo = await DocumentUpdateCache.GetAsync(cacheKey);
+                if (documentUpdateInfo != null)
+                {
+                    leaf.CreationTime = documentUpdateInfo.CreationTime;
+                    leaf.LastUpdatedTime = documentUpdateInfo.LastUpdatedTime;
+                }
+            }
+
+            return navigationNode;
         }
 
         public async Task<DocumentResourceDto> GetResourceAsync(GetDocumentResourceInput input)
@@ -78,8 +101,8 @@ namespace Volo.Docs.Documents
 
             async Task<DocumentResourceDto> GetResourceAsync()
             {
-                var store = _documentStoreFactory.Create(project.DocumentStoreType);
+                var source = _documentStoreFactory.Create(project.DocumentStoreType);
-                var documentResource = await store.GetResource(project, input.Name, input.LanguageCode, input.Version);
+                var documentResource = await source.GetResource(project, input.Name, input.LanguageCode, input.Version);
 
                 return ObjectMapper.Map<DocumentResource, DocumentResourceDto>(documentResource);
             }
@@ -136,15 +159,27 @@ namespace Volo.Docs.Documents
         {
             version = string.IsNullOrWhiteSpace(version) ? project.LatestVersionBranchName : version;
 
-            var cacheKey = $"Document@{project.ShortName}#{languageCode}#{documentName}#{version}";
-
             async Task<DocumentWithDetailsDto> GetDocumentAsync()
             {
-                Logger.LogInformation($"Not found in the cache. Requesting {documentName} from the store...");
+                Logger.LogInformation($"Not found in the cache. Requesting {documentName} from the source...");
-                var store = _documentStoreFactory.Create(project.DocumentStoreType);
+
-                var document = await store.GetDocumentAsync(project, documentName, languageCode, version);
+                var source = _documentStoreFactory.Create(project.DocumentStoreType);
+                var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version);
+
+                await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, sourceDocument.Version);
+                await _documentRepository.InsertAsync(sourceDocument, true);
+
                 Logger.LogInformation($"Document retrieved: {documentName}");
-                return CreateDocumentWithDetailsDto(project, document);
+
+                var cacheKey = $"DocumentUpdateInfo{sourceDocument.ProjectId}#{sourceDocument.Name}#{sourceDocument.LanguageCode}#{sourceDocument.Version}";
+                await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
+                {
+                    Name = sourceDocument.Name,
+                    CreationTime = sourceDocument.CreationTime,
+                    LastUpdatedTime = sourceDocument.LastUpdatedTime
+                });
+
+                return CreateDocumentWithDetailsDto(project, sourceDocument);
             }
 
             if (HostEnvironment.IsDevelopment())
@@ -152,16 +187,30 @@ namespace Volo.Docs.Documents
                 return await GetDocumentAsync();
             }
 
-            return await DocumentCache.GetOrAddAsync(
+            var document = await _documentRepository.FindAsync(project.Id, documentName, languageCode, version);
-                cacheKey,
+            if (document == null)
-                GetDocumentAsync,
+            {
-                () => new DistributedCacheEntryOptions
+                return await GetDocumentAsync();
-                {
+            }
-                    //TODO: Configurable?
+
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(2),
+            //Only the latest version (dev) of the document needs to update the cache.
-                    SlidingExpiration = TimeSpan.FromMinutes(30)
+            if (!project.LatestVersionBranchName.IsNullOrWhiteSpace() &&
-                }
+                document.Version == project.LatestVersionBranchName &&
-            );
+                //TODO: Configurable cache time?
+                document.LastCachedTime + TimeSpan.FromHours(2) < DateTime.Now)
+            {
+                return await GetDocumentAsync();
+            }
+
+            var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
+            await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
+            {
+                Name = document.Name,
+                CreationTime = document.CreationTime,
+                LastUpdatedTime = document.LastUpdatedTime,
+            });
+
+            return CreateDocumentWithDetailsDto(project, document);
         }
 
         protected virtual DocumentWithDetailsDto CreateDocumentWithDetailsDto(Project project, Document document)
@@ -171,6 +220,5 @@ namespace Volo.Docs.Documents
             documentDto.Contributors = ObjectMapper.Map<List<DocumentContributor>, List<DocumentContributorDto>>(document.Contributors);
             return documentDto;
         }
-
     }
 }

modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs

@@ -15,18 +15,18 @@ namespace Volo.Docs.Projects
     {
         private readonly IProjectRepository _projectRepository;
         private readonly IDistributedCache<List<VersionInfo>> _versionCache;
-        private readonly IDocumentStoreFactory _documentStoreFactory;
+        private readonly IDocumentSourceFactory _documentSource;
         protected IDistributedCache<LanguageConfig> LanguageCache { get; }
 
         public ProjectAppService(
             IProjectRepository projectRepository,
             IDistributedCache<List<VersionInfo>> versionCache,
-            IDocumentStoreFactory documentStoreFactory,
+            IDocumentSourceFactory documentSource,
             IDistributedCache<LanguageConfig> languageCache)
         {
             _projectRepository = projectRepository;
             _versionCache = versionCache;
-            _documentStoreFactory = documentStoreFactory;
+            _documentSource = documentSource;
             LanguageCache = languageCache;
         }
 
@@ -68,7 +68,7 @@ namespace Volo.Docs.Projects
 
         protected virtual async Task<List<VersionInfo>> GetVersionsAsync(Project project)
         {
-            var store = _documentStoreFactory.Create(project.DocumentStoreType);
+            var store = _documentSource.Create(project.DocumentStoreType);
             var versions = await store.GetVersionsAsync(project);
 
             if (!versions.Any())
@@ -108,7 +108,7 @@ namespace Volo.Docs.Projects
         private async Task<LanguageConfig> GetLanguageListInternalAsync(string shortName, string version)
         {
             var project = await _projectRepository.GetByShortNameAsync(shortName);
-            var store = _documentStoreFactory.Create(project.DocumentStoreType);
+            var store = _documentSource.Create(project.DocumentStoreType);
 
             async Task<LanguageConfig> GetLanguagesAsync()
             {

modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentConsts.cs

@@ -3,5 +3,13 @@
     public static class DocumentConsts
     {
         public const int MaxNameLength = 255;
+        public const int MaxVersionNameLength = 128;
+        public const int MaxLanguageCodeNameLength = 128;
+        public const int MaxFileNameNameLength = 128;
+        public const int MaxFormatNameLength = 128;
+        public const int MaxEditLinkLength = 2048;
+        public const int MaxRootUrlLength = 2048;
+        public const int MaxRawRootUrlLength = 2048;
+        public const int MaxLocalDirectoryLength = 512;
     }
 }

modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Volo.Docs.Documents
+{
+    [Serializable]
+    public class DocumentUpdateInfo
+    {
+        public virtual string Name { get; set; }
+
+        public virtual DateTime CreationTime { get; set; }
+
+        public virtual DateTime LastUpdatedTime { get; set; }
+    }
+}

modules/docs/src/Volo.Docs.Web/Models/NavigationNode.cs → modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs

@@ -22,6 +22,10 @@ namespace Volo.Docs.Documents
 
         public bool IsEmpty => Text == null && Path == null;
 
+        public virtual DateTime? CreationTime { get; set; }
+
+        public virtual DateTime? LastUpdatedTime { get; set; }
+
         public bool IsSelected(string documentName)
         {
             if (documentName == null)
@@ -50,4 +54,24 @@ namespace Volo.Docs.Documents
             return false;
         }
     }
+
+    public static class NavigationNodeExtension
+    {
+        public static IEnumerable<NavigationNode> GetAllNodes(this IEnumerable<NavigationNode> source, Func<NavigationNode, IEnumerable<NavigationNode>> selector)
+        {
+            if (source == null)
+            {
+                yield break;
+            }
+
+            foreach (var item in source)
+            {
+                yield return item;
+                foreach (var subItem in GetAllNodes(selector(item), selector))
+                {
+                    yield return subItem;
+                }
+            }
+        }
+    }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs

@@ -32,10 +32,10 @@ namespace Volo.Docs
                     .AddVirtualJson("/Volo/Docs/Localization/Domain");
             });
 
-            Configure<DocumentStoreOptions>(options =>
+            Configure<DocumentSourceOptions>(options =>
             {
-                options.Stores[GithubDocumentStore.Type] = typeof(GithubDocumentStore);
+                options.Sources[GithubDocumentSource.Type] = typeof(GithubDocumentSource);
-                options.Stores[FileSystemDocumentStore.Type] = typeof(FileSystemDocumentStore);
+                options.Sources[FileSystemDocumentSource.Type] = typeof(FileSystemDocumentSource);
             });
 
             context.Services.AddHttpClient(GithubRepositoryManager.HttpClientName, client =>

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs

@@ -1,27 +1,110 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using Volo.Abp;
+using Volo.Abp.Domain.Entities;
 
 namespace Volo.Docs.Documents
 {
-    public class Document
+    public class Document : AggregateRoot<Guid>
     {
-        public string Title { get; set; }
+        public virtual Guid ProjectId { get; protected set; }
 
-        public string Content { get; set; }
+        public virtual string Name { get; protected set; }
 
-        public string Format { get; set; }
+        public virtual string Version { get; protected set; }
 
-        public string EditLink { get; set; }
+        public virtual string LanguageCode { get; protected set; }
 
-        public string RootUrl { get; set; }
+        public virtual string FileName { get; set; }
 
-        public string RawRootUrl { get; set; }
+        public virtual string Content { get; set; }
 
-        public string Version { get; set; }
+        public virtual string Format { get; set; }
 
-        public string LocalDirectory { get; set; }
+        public virtual string EditLink { get; set; }
 
-        public string FileName { get; set; }
+        public virtual string RootUrl { get; set; }
 
-        public List<DocumentContributor> Contributors { get; set; }
+        public virtual string RawRootUrl { get; set; }
+
+        public virtual string LocalDirectory { get; set; }
+
+        public virtual DateTime CreationTime { get; set; }
+        
+        public virtual DateTime LastUpdatedTime { get; set; }
+
+        public virtual DateTime LastCachedTime { get; set; }
+
+        public virtual List<DocumentContributor> Contributors { get; set; }
+
+        protected Document()
+        {
+            Contributors = new List<DocumentContributor>();
+            ExtraProperties = new Dictionary<string, object>();
+        }
+
+        public Document(
+            Guid id,
+            Guid projectId,
+            [NotNull] string name,
+            [NotNull] string version,
+            [NotNull] string languageCode,
+            [NotNull] string fileName,
+            [NotNull] string content,
+            [NotNull] string format,
+            [NotNull] string editLink,
+            [NotNull] string rootUrl,
+            [NotNull] string rawRootUrl,
+            [NotNull] string localDirectory,
+            DateTime creationTime,
+            DateTime lastUpdatedTime,
+            DateTime lastCachedTime
+        )
+        {
+            Id = id;
+            ProjectId = projectId;
+
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name));
+            Version = Check.NotNullOrWhiteSpace(version, nameof(version));
+            LanguageCode = Check.NotNullOrWhiteSpace(languageCode, nameof(languageCode));
+            FileName = Check.NotNullOrWhiteSpace(fileName, nameof(fileName));
+            Content = Check.NotNullOrWhiteSpace(content, nameof(content));
+            Format = Check.NotNullOrWhiteSpace(format, nameof(format));
+            EditLink = Check.NotNullOrWhiteSpace(editLink, nameof(editLink));
+            RootUrl = Check.NotNullOrWhiteSpace(rootUrl, nameof(rootUrl));
+            RawRootUrl = Check.NotNullOrWhiteSpace(rawRootUrl, nameof(rawRootUrl));
+            LocalDirectory = Check.NotNull(localDirectory, nameof(localDirectory));
+
+            CreationTime = creationTime;
+            LastUpdatedTime = lastUpdatedTime;
+            LastCachedTime = lastCachedTime;
+
+            Contributors = new List<DocumentContributor>();
+            ExtraProperties = new Dictionary<string, object>();
+        }
+
+        public virtual void AddContributor(string username, string userProfileUrl, string avatarUrl)
+        {
+            Contributors.AddIfNotContains(new DocumentContributor(Id, username, userProfileUrl, avatarUrl));
+        }
+
+        public virtual void RemoveAllContributors()
+        {
+            Contributors.Clear();
+        }
+
+        public virtual void RemoveContributor(string username, string userProfileUrl, string avatarUrl)
+        {
+            Contributors.RemoveAll(r =>
+                r.Username == username && r.UserProfileUrl == userProfileUrl && r.AvatarUrl == avatarUrl);
+        }
+
+        public virtual DocumentContributor FindContributor(string username, string userProfileUrl, string avatarUrl)
+        {
+            return Contributors.FirstOrDefault(r =>
+                r.Username == username && r.UserProfileUrl == userProfileUrl && r.AvatarUrl == avatarUrl);
+        }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentContributor.cs

@@ -1,15 +1,39 @@
 using System;
-using System.Collections.Generic;
+using Volo.Abp.Domain.Entities;
-using System.Text;
 
 namespace Volo.Docs.Documents
 {
-    public class DocumentContributor
+    public class DocumentContributor : Entity
     {
+        public Guid DocumentId { get; set; }
+
         public string Username { get; set; }
 
         public string UserProfileUrl { get; set; }
 
         public string AvatarUrl { get; set; }
+
+        protected DocumentContributor()
+        {
+
+        }
+
+        public virtual bool Equals(Guid documentId, string username)
+        {
+            return DocumentId == documentId && Username == username;
+        }
+
+        public DocumentContributor(Guid documentId, string username, string userProfileUrl, string avatarUrl)
+        {
+            DocumentId = documentId;
+            Username = username;
+            UserProfileUrl = userProfileUrl;
+            AvatarUrl = avatarUrl;
+        }
+
+        public override object[] GetKeys()
+        {
+            return new object[] { DocumentId, Username };
+        }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentStoreFactory.cs → modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentSourceFactory.cs

@@ -6,28 +6,28 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Docs.Documents
 {
-    public class DocumentStoreFactory : IDocumentStoreFactory, ITransientDependency
+    public class DocumentSourceFactory : IDocumentSourceFactory, ITransientDependency
     {
-        protected DocumentStoreOptions Options { get; }
+        protected DocumentSourceOptions Options { get; }
         protected IServiceProvider ServiceProvider { get; }
 
-        public DocumentStoreFactory(
+        public DocumentSourceFactory(
             IServiceProvider serviceProvider,
-            IOptions<DocumentStoreOptions> options)
+            IOptions<DocumentSourceOptions> options)
         {
             Options = options.Value;
             ServiceProvider = serviceProvider;
         }
 
-        public virtual IDocumentStore Create(string storeType)
+        public virtual IDocumentSource Create(string sourceType)
         {
-            var serviceType = Options.Stores.GetOrDefault(storeType);
+            var serviceType = Options.Sources.GetOrDefault(sourceType);
             if (serviceType == null)
             {
-                throw new ApplicationException($"Unknown document store: {storeType}");
+                throw new ApplicationException($"Unknown document store: {sourceType}");
             }
 
-            return (IDocumentStore) ServiceProvider.GetRequiredService(serviceType);
+            return (IDocumentSource) ServiceProvider.GetRequiredService(serviceType);
         }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentSourceOptions.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Docs.Documents
+{
+    public class DocumentSourceOptions
+    {
+        public Dictionary<string, Type> Sources { get; set; }
+
+        public DocumentSourceOptions()
+        {
+            Sources = new Dictionary<string, Type>();
+        }
+    }
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentStoreOptions.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Volo.Docs.Documents
-{
-    public class DocumentStoreOptions
-    {
-        public Dictionary<string, Type> Stores { get; set; }
-
-        public DocumentStoreOptions()
-        {
-            Stores = new Dictionary<string, Type>();
-        }
-    }
-}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace Volo.Docs.Documents
+{
+    public interface IDocumentRepository : IBasicRepository<Document>
+    {
+        Task<Document> FindAsync(Guid projectId, string name, string languageCode, string version,
+            bool includeDetails = true,
+            CancellationToken cancellationToken = default);
+
+        Task DeleteAsync(Guid projectId, string name, string languageCode, string version,
+            CancellationToken cancellationToken = default);
+    }
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs → modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSource.cs

@@ -6,7 +6,7 @@ using Volo.Docs.Projects;
 
 namespace Volo.Docs.Documents
 {
-    public interface IDocumentStore : IDomainService
+    public interface IDocumentSource : IDomainService
     {
         Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version);
 

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSourceFactory.cs

@@ -0,0 +1,7 @@
+namespace Volo.Docs.Documents
+{
+    public interface IDocumentSourceFactory
+    {
+        IDocumentSource Create(string sourceType);
+    }
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStoreFactory.cs

@@ -1,7 +0,0 @@
-namespace Volo.Docs.Documents
-{
-    public interface IDocumentStoreFactory
-    {
-        IDocumentStore Create(string storeType);
-    }
-}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs → modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Security;
 using System.Threading.Tasks;
@@ -11,7 +12,7 @@ using Volo.Docs.Projects;
 
 namespace Volo.Docs.FileSystem.Documents
 {
-    public class FileSystemDocumentStore : DomainService, IDocumentStore
+    public class FileSystemDocumentSource : DomainService, IDocumentSource
     {
         public const string Type = "FileSystem";
 
@@ -30,16 +31,21 @@ namespace Volo.Docs.FileSystem.Documents
                 localDirectory = documentName.Substring(0, documentName.LastIndexOf('/'));
             }
 
-            return new Document
+            return new Document(GuidGenerator.Create(),
-            {
+                project.Id,
-                Content = content,
+                documentName,
-                FileName = Path.GetFileName(path),
+                version,
-                Format = project.Format,
+                languageCode,
-                LocalDirectory = localDirectory,
+                Path.GetFileName(path),
-                Title = documentName,
+                content,
-                RawRootUrl = $"/document-resources?projectId={project.Id.ToString()}&version={version}&languageCode={languageCode}&name=",
+                project.Format,
-                RootUrl = "/"
+                path,
-            };
+                "/",
+                $"/document-resources?projectId={project.Id.ToString()}&version={version}&languageCode={languageCode}&name=",
+                localDirectory,
+                File.GetCreationTime(path),
+                File.GetLastWriteTime(path),
+                DateTime.Now);
         }
 
         public Task<List<VersionInfo>> GetVersionsAsync(Project project)

modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Projects/ProjectFileSystemExtensions.cs

@@ -24,7 +24,7 @@ namespace Volo.Docs.FileSystem.Projects
         {
             Check.NotNull(project, nameof(project));
 
-            if (project.DocumentStoreType != FileSystemDocumentStore.Type)
+            if (project.DocumentStoreType != FileSystemDocumentSource.Type)
             {
                 throw new ApplicationException("Given project has not a FileSystem document store!");
             }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs → modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs

@@ -16,13 +16,13 @@ namespace Volo.Docs.GitHub.Documents
 {
     //TODO: Needs more refactoring
 
-    public class GithubDocumentStore : DomainService, IDocumentStore
+    public class GithubDocumentSource : DomainService, IDocumentSource
     {
         public const string Type = "GitHub";
 
         private readonly IGithubRepositoryManager _githubRepositoryManager;
 
-        public GithubDocumentStore(IGithubRepositoryManager githubRepositoryManager)
+        public GithubDocumentSource(IGithubRepositoryManager githubRepositoryManager)
         {
             _githubRepositoryManager = githubRepositoryManager;
         }
@@ -34,7 +34,6 @@ namespace Volo.Docs.GitHub.Documents
             var userAgent = project.GetGithubUserAgentOrNull();
             var rawRootUrl = CalculateRawRootUrlWithLanguageCode(rootUrl, languageCode);
             var rawDocumentUrl = rawRootUrl + documentName;
-            var commitHistoryUrl = project.GetGitHubUrlForCommitHistory() + documentName;
             var isNavigationDocument = documentName == project.NavigationDocumentName;
             var isParameterDocument = documentName == project.ParametersDocumentName;
             var editLink = rootUrl.ReplaceFirst("/tree/", "/blob/") + languageCode + "/" + documentName;
@@ -47,20 +46,40 @@ namespace Volo.Docs.GitHub.Documents
                 fileName = documentName.Substring(documentName.LastIndexOf('/') + 1);
             }
 
-            return new Document
+            var fileCommits = await GetFileCommitsAsync(project, version, $"docs/{languageCode}/{documentName}");
+
+            var document=  new Document(GuidGenerator.Create(), 
+                project.Id, 
+                documentName, 
+                version, 
+                languageCode,
+                fileName, 
+                await DownloadWebContentAsStringAsync(rawDocumentUrl, token, userAgent),
+                project.Format, 
+                editLink, 
+                rootUrl,
+                rawRootUrl, 
+                localDirectory,
+                fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
+                fileCommits.FirstOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
+                DateTime.Now);
+
+            var authors =  fileCommits
+                .Where(x => x.Author != null)
+                .Select(x => x.Author)
+                .GroupBy(x => x.Id)
+                .OrderByDescending(x => x.Count())
+                .Select(x => x.FirstOrDefault()).ToList();
+
+            if (!isNavigationDocument && !isParameterDocument)
             {
-                Title = documentName,
+                foreach (var author in authors)
-                EditLink = editLink,
+                {
-                RootUrl = rootUrl,
+                    document.AddContributor(author.Login, author.HtmlUrl, author.AvatarUrl);
-                RawRootUrl = rawRootUrl,
+                }
-                Format = project.Format,
+            }
-                LocalDirectory = localDirectory,
+
-                FileName = fileName,
+            return document;
-                Contributors = new List<DocumentContributor>(),
-                //Contributors = !isNavigationDocument && !isParameterDocument && !isPartialTemplatesDocumentName ? await GetContributors(commitHistoryUrl, token, userAgent): new List<DocumentContributor>(),
-                Version = version,
-                Content = await DownloadWebContentAsStringAsync(rawDocumentUrl, token, userAgent)
-            };
         }
 
         public async Task<List<VersionInfo>> GetVersionsAsync(Project project)
@@ -124,6 +143,15 @@ namespace Volo.Docs.GitHub.Documents
             return await _githubRepositoryManager.GetReleasesAsync(ownerName, repositoryName, project.GetGitHubAccessTokenOrNull());
         }
 
+        private async Task<IReadOnlyList<GitHubCommit>> GetFileCommitsAsync(Project project, string version, string filename)
+        {
+            var url = project.GetGitHubUrl();
+            var ownerName = GetOwnerNameFromUrl(url);
+            var repositoryName = GetRepositoryNameFromUrl(url);
+            return await _githubRepositoryManager.GetFileCommitsAsync(ownerName, repositoryName,
+                version, filename, project.GetGitHubAccessTokenOrNull());
+        }
+
         protected virtual string GetOwnerNameFromUrl(string url)
         {
             try
@@ -183,39 +211,6 @@ namespace Volo.Docs.GitHub.Documents
             }
         }
 
-        private async Task<List<DocumentContributor>> GetContributors(string url, string token, string userAgent)
-        {
-            var contributors = new List<DocumentContributor>();
-
-            try
-            {
-                var commitsJsonAsString = await DownloadWebContentAsStringAsync(url, token, userAgent);
-
-                var commits = JArray.Parse(commitsJsonAsString);
-
-                foreach (var commit in commits)
-                {
-                    var author = commit["author"];
-
-                    contributors.Add(new DocumentContributor
-                    {
-                        Username = (string)author["login"],
-                        UserProfileUrl = (string)author["html_url"],
-                        AvatarUrl = (string)author["avatar_url"]
-                    });
-                }
-
-                contributors = contributors.GroupBy(c => c.Username).OrderByDescending(c=>c.Count())
-                    .Select( c => c.FirstOrDefault()).ToList();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning(ex.Message);
-            }
-            
-            return contributors;
-        }
-
         private static string CalculateRawRootUrlWithLanguageCode(string rootUrl, string languageCode)
         {
             return (rootUrl

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs

@@ -64,5 +64,16 @@ namespace Volo.Docs.GitHub.Documents
                 .Release
                 .GetAll(name, repositoryName)).ToList();
         }
+
+        public async Task<IReadOnlyList<GitHubCommit>> GetFileCommitsAsync(string name, string repositoryName, string version, string filename, string token)
+        {
+            var client = token.IsNullOrWhiteSpace()
+                ? new GitHubClient(new ProductHeaderValue(name))
+                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
+
+            var repo = await client.Repository.Get(name, repositoryName);
+            var request = new CommitRequest { Path = filename, Sha = version };
+            return await client.Repository.Commit.GetAll(repo.Id, request);
+        }
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubRepositoryManager.cs

@@ -15,5 +15,6 @@ namespace Volo.Docs.GitHub.Documents
 
         Task<IReadOnlyList<Release>> GetReleasesAsync(string name, string repositoryName, string token);
 
+        Task<IReadOnlyList<GitHubCommit>> GetFileCommitsAsync(string name, string repositoryName, string version, string filename, string token);
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Projects/ProjectGithubExtensions.cs

@@ -21,14 +21,6 @@ namespace Volo.Docs.GitHub.Projects
                 .Replace("{version}", version);
         }
 
-        public static string GetGitHubUrlForCommitHistory([NotNull] this Project project)
-        {
-            return project
-                .GetGitHubUrl()
-                .Replace("github.com", "api.github.com/repos")
-                .Replace("tree/{version}/", "commits?path=");
-        }
-
         public static void SetGitHubUrl([NotNull] this Project project, string value)
         {
             CheckGitHubProject(project);
@@ -57,7 +49,7 @@ namespace Volo.Docs.GitHub.Projects
         {
             Check.NotNull(project, nameof(project));
 
-            if (project.DocumentStoreType != GithubDocumentStore.Type)
+            if (project.DocumentStoreType != GithubDocumentSource.Type)
             {
                 throw new ApplicationException("Given project has not a Github document store!");
             }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json

@@ -7,6 +7,7 @@
     "ShareOn": "Share on",
     "Version": "Version",
     "Edit": "Edit",
+    "LastEditTime": "Last edit",
     "Delete": "Delete",
     "InThisDocument": "In this document",
     "GoToTop": "Go to top",
@@ -16,6 +17,10 @@
     "NavigationDocumentNotFound": "This version does not have a navigation document!",
     "DocumentNotFoundInSelectedLanguage": "Document in the language you wanted is not found. Document in the default language is shown.",
     "FilterTopics": "Filter topics",
-    "MultipleVersionDocumentInfo": "This document has multiple versions. Select the options best fit for you."
+    "MultipleVersionDocumentInfo": "This document has multiple versions. Select the options best fit for you.",
+    "New": "New",
+    "Upd": "Upd",
+    "NewExplanation": "Created in the last two weeks.",
+    "UpdatedExplanation": "Updated in the last two weeks."
   }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json

@@ -7,6 +7,7 @@
     "ShareOn": "Paylaş",
     "Version": "Versiyon",
     "Edit": "Düzenle",
+    "LastEditTime": "Son Düzenleme",
     "Delete": "Sil",
     "InThisDocument": "Bu dökümanda",
     "GoToTop": "En üste çık",
@@ -15,6 +16,10 @@
     "DocumentNotFound": "Aradığınız döküman bulunamadı!",
     "NavigationDocumentNotFound": "Bu döküman için menü bulunamadı!",
     "DocumentNotFoundInSelectedLanguage": "İstediğiniz dilde belge bulunamadı. Varsayılan dilde belge gösterilir.",
-    "MultipleVersionDocumentInfo": "Bu dökümanın birden çok versiyonu bulunmaktadır. Sizin için en uygun olan seçenekleri seçiniz."
+    "MultipleVersionDocumentInfo": "Bu dökümanın birden çok versiyonu bulunmaktadır. Sizin için en uygun olan seçenekleri seçiniz.",
+    "New": "Yeni",
+    "Upd": "Günc",
+    "NewExplanation": "Son iki hafta içinde oluşturuldu.",
+    "UpdatedExplanation": "Son iki hafta içinde güncellendi."
   }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/zh-Hans.json

@@ -7,6 +7,7 @@
     "ShareOn": "分享到",
     "Version": "版本",
     "Edit": "编辑",
+    "LastEditTime": "上次编辑",
     "Delete": "删除",
     "InThisDocument": "在本文中",
     "GoToTop": "到顶部",
@@ -15,6 +16,10 @@
     "DocumentNotFound": "找不到请求的文档!",
     "NavigationDocumentNotFound": "这个版本没有导航文件!",
     "DocumentNotFoundInSelectedLanguage": "本文档不适用于所选语言, 将以默认语言显示文档.",
-    "FilterTopics": "过滤主题"
+    "FilterTopics": "过滤主题",
+    "New": "新文档",
+    "Upd": "更新",
+    "NewExplanation": "在最近两周内创建.",
+    "UpdatedExplanation": "在最近两周内更新."
   }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/zh-Hant.json

@@ -7,6 +7,7 @@
     "ShareOn": "分享到",
     "Version": "版本",
     "Edit": "編輯",
+    "LastEditTime": "上次編輯",
     "Delete": "刪除",
     "InThisDocument": "在此文件中",
     "GoToTop": "到最上方",
@@ -15,6 +16,10 @@
     "DocumentNotFound": "找不到要求的文件!",
     "NavigationDocumentNotFound": "這個版本沒有導覽文件!",
     "DocumentNotFoundInSelectedLanguage": "本文件不適用於所選語系，將以預設語系顯示.",
-    "FilterTopics": "過濾主題"
+    "FilterTopics": "過濾主題",
+    "New": "新文檔",
+    "Upd": "更新",
+    "NewExplanation": "在最近兩周內創建.",
+    "UpdatedExplanation": "在最近兩周內更新."
   }
 }

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj

@@ -10,6 +10,12 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Volo\Docs\NewFolder\**" />
+    <EmbeddedResource Remove="Volo\Docs\NewFolder\**" />
+    <None Remove="Volo\Docs\NewFolder\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Volo.Docs.Domain\Volo.Docs.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Docs.EntityFrameworkCore;
+
+namespace Volo.Docs.Documents
+{
+    public class EFCoreDocumentRepository : EfCoreRepository<IDocsDbContext, Document>, IDocumentRepository
+    {
+        public EFCoreDocumentRepository(IDbContextProvider<IDocsDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Document> FindAsync(Guid projectId, string name, string languageCode, string version,
+            bool includeDetails = true,
+            CancellationToken cancellationToken = default)
+        {
+            return await DbSet.IncludeDetails(includeDetails)
+                .FirstOrDefaultAsync(x =>
+                    x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode &&
+                    x.Version == version,
+                cancellationToken);
+        }
+
+        public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, CancellationToken cancellationToken = default)
+        {
+            await DeleteAsync(x =>
+                x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode &&
+                x.Version == version, cancellationToken: cancellationToken);
+        }
+    }
+}

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.EntityFrameworkCore
@@ -10,6 +11,10 @@ namespace Volo.Docs.EntityFrameworkCore
     {
         public DbSet<Project> Projects { get; set; }
 
+        public DbSet<Document> Documents { get; set; }
+
+        public DbSet<DocumentContributor> DocumentContributors { get; set; }
+
         public DocsDbContext(DbContextOptions<DocsDbContext> options) 
             : base(options)
         {

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs

@@ -3,6 +3,7 @@ using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.EntityFrameworkCore
@@ -26,8 +27,7 @@ namespace Volo.Docs.EntityFrameworkCore
             {
                 b.ToTable(options.TablePrefix + "Projects", options.Schema);
 
-                b.ConfigureConcurrencyStamp();
+                b.ConfigureByConvention();
-                b.ConfigureExtraProperties();
 
                 b.Property(x => x.Name).IsRequired().HasMaxLength(ProjectConsts.MaxNameLength);
                 b.Property(x => x.ShortName).IsRequired().HasMaxLength(ProjectConsts.MaxShortNameLength);
@@ -36,6 +36,35 @@ namespace Volo.Docs.EntityFrameworkCore
                 b.Property(x => x.ParametersDocumentName).IsRequired().HasMaxLength(ProjectConsts.MaxParametersDocumentNameLength);
                 b.Property(x => x.LatestVersionBranchName).HasMaxLength(ProjectConsts.MaxLatestVersionBranchNameLength);
             });
+
+            builder.Entity<Document>(b =>
+            {
+                b.ToTable(options.TablePrefix + "Documents", options.Schema);
+
+                b.ConfigureByConvention();
+
+                b.Property(x => x.Name).IsRequired().HasMaxLength(DocumentConsts.MaxNameLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(DocumentConsts.MaxVersionNameLength);
+                b.Property(x => x.LanguageCode).IsRequired().HasMaxLength(DocumentConsts.MaxLanguageCodeNameLength);
+                b.Property(x => x.FileName).IsRequired().HasMaxLength(DocumentConsts.MaxFileNameNameLength);
+                b.Property(x => x.Content).IsRequired();
+                b.Property(x => x.Format).HasMaxLength(DocumentConsts.MaxFormatNameLength);
+                b.Property(x => x.EditLink).HasMaxLength(DocumentConsts.MaxEditLinkLength);
+                b.Property(x => x.RootUrl).HasMaxLength(DocumentConsts.MaxRootUrlLength);
+                b.Property(x => x.RawRootUrl).HasMaxLength(DocumentConsts.MaxRawRootUrlLength);
+                b.Property(x => x.LocalDirectory).HasMaxLength(DocumentConsts.MaxLocalDirectoryLength);
+
+                b.HasMany(x => x.Contributors).WithOne()
+                    .HasForeignKey(x => new { x.DocumentId })
+                    .IsRequired();
+            });
+
+            builder.Entity<DocumentContributor>(b =>
+            {
+                b.ToTable(options.TablePrefix + "DocumentContributors", options.Schema);
+
+                b.HasKey(x => new { x.DocumentId, x.Username });
+            });
         }
     }
 }

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsEfCoreQueryableExtensions.cs

@@ -0,0 +1,14 @@
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Volo.Docs.Documents;
+
+namespace Volo.Docs.EntityFrameworkCore
+{
+    public static class DocsEfCoreQueryableExtensions
+    {
+        public static IQueryable<Document> IncludeDetails(this IQueryable<Document> queryable, bool include = true)
+        {
+            return !include ? queryable : queryable.Include(x => x.Contributors);
+        }
+    }
+}

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsEntityFrameworkCoreModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.EntityFrameworkCore
@@ -15,6 +16,7 @@ namespace Volo.Docs.EntityFrameworkCore
             context.Services.AddAbpDbContext<DocsDbContext>(options =>
             {
                 options.AddRepository<Project, EfCoreProjectRepository>();
+                options.AddRepository<Document, EFCoreDocumentRepository>();
             });
         }
     }

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.EntityFrameworkCore
@@ -9,5 +10,9 @@ namespace Volo.Docs.EntityFrameworkCore
     public interface IDocsDbContext : IEfCoreDbContext
     {
         DbSet<Project> Projects { get; set; }
+
+        DbSet<Document> Documents { get; set; }
+
+        DbSet<DocumentContributor> DocumentContributors { get; set; }
     }
 }

modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs

@@ -34,7 +34,7 @@ namespace Volo.Docs.Documents
 
         [HttpGet]
         [Route("navigation")]
-        public virtual Task<DocumentWithDetailsDto> GetNavigationAsync(GetNavigationDocumentInput input)
+        public Task<NavigationNode> GetNavigationAsync(GetNavigationDocumentInput input)
         {
             return DocumentAppService.GetNavigationAsync(input);
         }

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver.Linq;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+using Volo.Docs.MongoDB;
+
+namespace Volo.Docs.Documents
+{
+    public class MongoDocumentRepository : MongoDbRepository<IDocsMongoDbContext, Document, Guid>, IDocumentRepository
+    {
+        public MongoDocumentRepository(IMongoDbContextProvider<IDocsMongoDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Document> FindAsync(Guid projectId, string name, string languageCode, string version,
+            bool includeDetails = true,
+            CancellationToken cancellationToken = default)
+        {
+            return await GetMongoQueryable().FirstOrDefaultAsync(x => x.ProjectId == projectId &&
+                                                                      x.Name == name &&
+                                                                      x.LanguageCode == languageCode &&
+                                                                      x.Version == version, cancellationToken);
+        }
+
+        public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version,
+            CancellationToken cancellationToken = default)
+        {
+            await DeleteAsync(x =>
+                x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode &&
+                x.Version == version, cancellationToken: cancellationToken);
+        }
+    }
+}

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/BloggingMongoDbModule.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.MongoDB;
 using Volo.Docs.Projects;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Docs.Documents;
 
 namespace Volo.Docs.MongoDB
 {
@@ -16,6 +17,7 @@ namespace Volo.Docs.MongoDB
             context.Services.AddMongoDbContext<DocsMongoDbContext>(options =>
             {
                 options.AddRepository<Project, MongoProjectRepository>();
+                options.AddRepository<Document, MongoDocumentRepository>();
             });
         }
     }

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.Data;
 using Volo.Docs.Projects;
 using Volo.Abp.MongoDB;
+using Volo.Docs.Documents;
 
 namespace Volo.Docs.MongoDB
 {
@@ -9,6 +10,7 @@ namespace Volo.Docs.MongoDB
     public class DocsMongoDbContext : AbpMongoDbContext, IDocsMongoDbContext
     {
         public IMongoCollection<Project> Projects => Collection<Project>();
+        public IMongoCollection<Document> Documents => Collection<Document>();
 
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using Volo.Abp;
 using Volo.Abp.MongoDB;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.MongoDB
@@ -23,6 +24,11 @@ namespace Volo.Docs.MongoDB
             {
                 b.CollectionName = options.CollectionPrefix + "Projects";
             });
+
+            builder.Entity<Document>(b =>
+            {
+                b.CollectionName = options.CollectionPrefix + "DocumentS";
+            });
         }
     }
 }

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs

@@ -1,6 +1,7 @@
 using MongoDB.Driver;
 using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
+using Volo.Docs.Documents;
 using Volo.Docs.Projects;
 
 namespace Volo.Docs.MongoDB
@@ -8,8 +9,8 @@ namespace Volo.Docs.MongoDB
     [ConnectionStringName(DocsDbProperties.ConnectionStringName)]
     public interface IDocsMongoDbContext : IAbpMongoDbContext
     {
-
         IMongoCollection<Project> Projects { get; }
 
+        IMongoCollection<Document> Documents { get; }
     }
 }

modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs

@@ -2,8 +2,10 @@
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Volo.Docs.Documents;
+using Volo.Docs.Localization;
 using Volo.Docs.Utils;
 
 namespace Volo.Docs.Areas.Documents.TagHelpers
@@ -15,6 +17,8 @@ namespace Volo.Docs.Areas.Documents.TagHelpers
     {
         private readonly DocsUiOptions _uiOptions;
 
+        private readonly IStringLocalizer<DocsResource> _localizer;
+
         private const string LiItemTemplateWithLink = @"<li class='{0}'><span class='plus-icon'><i class='fa fa-{1}'></i></span>{2}{3}</li>";
 
         private const string ListItemAnchor = @"<a href='{0}' class='{1}'>{2}</a>";
@@ -41,8 +45,9 @@ namespace Volo.Docs.Areas.Documents.TagHelpers
         [HtmlAttributeName("language")]
         public string LanguageCode { get; set; }
 
-        public TreeTagHelper(IOptions<DocsUiOptions> urlOptions)
+        public TreeTagHelper(IOptions<DocsUiOptions> urlOptions, IStringLocalizer<DocsResource> localizer)
         {
+            _localizer = localizer;
             _uiOptions = urlOptions.Value;
         }
 
@@ -118,7 +123,27 @@ namespace Volo.Docs.Areas.Documents.TagHelpers
             }
             else
             {
-                listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path), textCss, node.Text.IsNullOrEmpty() ? "?" : node.Text);
+                var badge = "";
+
+                if (!node.Path.IsNullOrWhiteSpace() && node.CreationTime.HasValue && node.LastUpdatedTime.HasValue)
+                {
+                    var newBadge = "<span class='badge badge-primary ml-2' title=\"" + _localizer["NewExplanation"] + "\">" + _localizer["New"] + "</span>";
+                    var updBadge = "<span class='badge badge-light ml-2' title=\"" + _localizer["UpdatedExplanation"] + "\">" + _localizer["Upd"] + "</span>";
+
+                    if(node.CreationTime + TimeSpan.FromDays(14) > DateTime.Now)
+                    {
+                        badge = newBadge;
+                    }
+                    else if (node.LastUpdatedTime + TimeSpan.FromDays(14) > DateTime.Now)
+                    {
+                        badge = updBadge;
+                    }
+                }
+
+                listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path), textCss,
+                    node.Text.IsNullOrEmpty()
+                        ? "?"
+                        : node.Text + badge);
             }
 
             return string.Format(LiItemTemplateWithLink,

modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs

@@ -8,8 +8,7 @@ namespace Volo.Docs
     {
         public DocsWebAutoMapperProfile()
         {
-            CreateMap<DocumentWithDetailsDto, NavigationWithDetailsDto>()
+
-                .Ignore(x => x.RootNode);
         }
     }
 }

modules/docs/src/Volo.Docs.Web/DocsWebModule.cs

@@ -5,7 +5,9 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -18,7 +20,11 @@ namespace Volo.Docs
 {
     [DependsOn(
         typeof(DocsHttpApiModule),
-        typeof(AbpAspNetCoreMvcUiBootstrapModule)
+        typeof(AbpAutoMapperModule),
+        typeof(AbpAspNetCoreMvcUiBootstrapModule),
+        typeof(AbpAspNetCoreMvcUiThemeSharedModule),
+        typeof(AbpAspNetCoreMvcUiPackagesModule),
+        typeof(AbpAspNetCoreMvcUiBundlingModule)
         )]
     public class DocsWebModule : AbpModule
     {

modules/docs/src/Volo.Docs.Web/Models/NavigationWithDetailsDto.cs

@@ -1,30 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Volo.Docs.Documents
-{
-    public class NavigationWithDetailsDto : DocumentWithDetailsDto
-    {
-        [JsonProperty("items")]
-        public NavigationNode RootNode { get; set; }
-
-        public void ConvertItems()
-        {
-            if (Content.IsNullOrEmpty())
-            {
-                RootNode = new NavigationNode();
-                return;
-            }
-
-            try
-            {
-                RootNode = JsonConvert.DeserializeObject<NavigationNode>(Content);
-            }
-            catch (JsonException ex)
-            {
-                //todo: should log the exception?
-                RootNode = new NavigationNode();
-            }
-        }
-    }
-}

modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@@ -1,10 +1,11 @@
-@page
+@page
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.Anchor
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.Clipboard
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.Popper
+@using Volo.Docs.Pages.Documents.Shared.DocumentNotFoundComponent
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @using Volo.Docs
@@ -39,268 +40,284 @@
         <abp-script src="/Pages/Documents/Project/index.js" />
     </abp-script-bundle>
 }
-<div class="docs-page" data-spy="scroll" data-target="#docs-sticky-index">
+@if (Model.DocumentFound)
-    <div class="row justify-content-end">
+{
-        <div class="col-md-3 docs-sidebar dark-sidebar">
+    <div class="docs-page" data-spy="scroll" data-target="#docs-sticky-index">
-            <div class="docs-sidebar-wrapper">
+        <div class="row justify-content-end">
+            <div class="col-md-3 docs-sidebar dark-sidebar">
+                <div class="docs-sidebar-wrapper">
 
-                <div class="docs-top">
+                    <div class="docs-top">
-                    <nav class="navbar navbar-logo">
+                        <nav class="navbar navbar-logo">
-                        @if (!Model.Project.Name.IsNullOrWhiteSpace())
+                            @if (!Model.Project.Name.IsNullOrWhiteSpace())
-                        {
+                            {
-                            <a class="navbar-brand w-100" href="@Model.CreateVersionLink(Model.LatestVersionInfo, Model.GetSpecificVersionOrLatest())">
+                                <a class="navbar-brand w-100" href="@Model.CreateVersionLink(Model.LatestVersionInfo, Model.GetSpecificVersionOrLatest())">
-                                <span id="ProjectName">@Model.Project.Name</span><br>
+                                    <span id="ProjectName">@Model.Project.Name</span><br>
-                                <strong class="display-block">
+                                    <strong class="display-block">
-                                    @L["Documents"]
+                                        @L["Documents"]
-                                </strong>
+                                    </strong>
-                            </a>
+                                </a>
-                        }
+                            }
-
-                        @if (!Model.Document.Project.MainWebsiteUrl.IsNullOrWhiteSpace())
-                        {
-                            <a href="@Model.Document.Project.MainWebsiteUrl" class="go-back-site" id="GoToMainWebSite">
-                                <i class="fa fa-chevron-left"></i>
-                                @L["BackToWebsite"]
-                            </a>
-                        }
-
-                        <div class="for-mobile">
-                            <div class="navbar-light">
-                                <button type="button" class="open-dmenu navbar-toggler" aria-label="Close">
-                                    <span class="navbar-toggler-icon"></span>
-                                </button>
-                            </div>
-                        </div>
-                    </nav>
-                </div>
-
-                <div class="docs-tree-list">
 
-                    @if (Model.ShowProjectsCombobox && Model.ProjectSelectItems.Count > 1)
+                            @if (!Model.Document.Project.MainWebsiteUrl.IsNullOrWhiteSpace())
-                    {
+                            {
-                        <div class="docs-version">
+                                <a href="@Model.Document.Project.MainWebsiteUrl" class="go-back-site" id="GoToMainWebSite">
-                            <div class="version-select">
+                                    <i class="fa fa-chevron-left"></i>
-                                <div class="input-group">
+                                    @L["BackToWebsite"]
-                                    <div class="input-group-prepend">
+                                </a>
-                                        <label class="input-group-text">
+                            }
-                                            <i class="fa fa-folder-open" aria-hidden="true" data-toggle="tooltip" title="@L["Project"]"></i>
-                                        </label>
-                                    </div>
 
-                                    <select asp-items="Model.ProjectSelectItems" class="form-control" onchange="window.location.pathname = this.value"></select>
+                            <div class="for-mobile">
+                                <div class="navbar-light">
+                                    <button type="button" class="open-dmenu navbar-toggler" aria-label="Close">
+                                        <span class="navbar-toggler-icon"></span>
+                                    </button>
                                 </div>
                             </div>
-                        </div>
+                        </nav>
-                    }
+                    </div>
 
-                    <div class="row">
+                    <div class="docs-tree-list">
-                        @if (Model.VersionSelectItems.Any())
-                        {
-                            <div class="col @(Model.LanguageSelectListItems.Count > 1?"pr-0":"")">
-                                <div class="docs-version @(Model.LanguageSelectListItems.Count > 1?"pr-1":"")">
-                                    <div class="version-select">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <label class="input-group-text">
-                                                    <i class="fa fa-check-square-o" aria-hidden="true" data-toggle="tooltip" title="@L["Version"]"></i>
-                                                </label>
-                                            </div>
 
-                                            <select asp-items="Model.VersionSelectItems" class="form-control" onchange="if (this.value) { window.location.replace(this.value) }"></select>
+                        @if (Model.ShowProjectsCombobox && Model.ProjectSelectItems.Count > 1)
+                        {
+                            <div class="docs-version">
+                                <div class="version-select">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <label class="input-group-text">
+                                                <i class="fa fa-folder-open" aria-hidden="true" data-toggle="tooltip" title="@L["Project"]"></i>
+                                            </label>
                                         </div>
+
+                                        <select asp-items="Model.ProjectSelectItems" class="form-control" onchange="window.location.pathname = this.value"></select>
                                     </div>
                                 </div>
                             </div>
                         }
 
-                        @if (Model.LanguageSelectListItems.Count > 1)
+                        <div class="row">
-                        {
+                            @if (Model.VersionSelectItems.Any())
-                            <div class="col  @(Model.VersionSelectItems.Any()?"pl-0":"")">
+                            {
-                                <div class="docs-version docs-language @(Model.VersionSelectItems.Any()?"pl-1":"")">
+                                <div class="col @(Model.LanguageSelectListItems.Count > 1?"pr-0":"")">
-                                    <div class="version-select">
+                                    <div class="docs-version @(Model.LanguageSelectListItems.Count > 1?"pr-1":"")">
-                                        <div class="input-group">
+                                        <div class="version-select">
-                                            <div class="input-group-prepend">
+                                            <div class="input-group">
-                                                <label class="input-group-text">
+                                                <div class="input-group-prepend">
-                                                    <i class="fa fa-globe" aria-hidden="true" data-toggle="tooltip" title="@L["Language"]"></i>
+                                                    <label class="input-group-text">
-                                                </label>
+                                                        <i class="fa fa-check-square-o" aria-hidden="true" data-toggle="tooltip" title="@L["Version"]"></i>
+                                                    </label>
+                                                </div>
+
+                                                <select asp-items="Model.VersionSelectItems" class="form-control" onchange="if (this.value) { window.location.replace(this.value) }"></select>
                                             </div>
-                                            <select asp-items="Model.LanguageSelectListItems" class="form-control" onchange="window.location.replace(this.value)"></select>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
+                            }
-                        }
-                    </div>
 
-                    <div class="docs-version mb-4">
+                            @if (Model.LanguageSelectListItems.Count > 1)
-                        <div class="version-select">
+                            {
-                            <div class="input-group">
+                                <div class="col  @(Model.VersionSelectItems.Any()?"pl-0":"")">
-                                <div class="input-group-prepend">
+                                    <div class="docs-version docs-language @(Model.VersionSelectItems.Any()?"pl-1":"")">
-                                    <label class="input-group-text"><i class="fa fa-filter"></i></label>
+                                        <div class="version-select">
+                                            <div class="input-group">
+                                                <div class="input-group-prepend">
+                                                    <label class="input-group-text">
+                                                        <i class="fa fa-globe" aria-hidden="true" data-toggle="tooltip" title="@L["Language"]"></i>
+                                                    </label>
+                                                </div>
+                                                <select asp-items="Model.LanguageSelectListItems" class="form-control" onchange="window.location.replace(this.value)"></select>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-
+                            }
-                                <input class="form-control" type="search" placeholder="@L["FilterTopics"].Value" aria-label="Filter">
-                            </div>
                         </div>
-                    </div>
 
+                        <div class="docs-version mb-4">
+                            <div class="version-select">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <label class="input-group-text"><i class="fa fa-filter"></i></label>
+                                    </div>
 
-                    @if (Model.Navigation == null || Model.Navigation.Content.IsNullOrEmpty())
+                                    <input class="form-control" type="search" placeholder="@L["FilterTopics"].Value" aria-label="Filter">
-                    {
+                                </div>
-                        <div class="text-muted p-3">
+                            </div>
-                            <i class="fa fa-warning"></i> @L["NavigationDocumentNotFound"]
                         </div>
-                    }
-                    else
-                    {
-                        <ul root-node="@Model.Navigation.RootNode"
-                            version="@(Model.LatestVersionInfo == null || Model.LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version)"
-                            project-name="@Model.ProjectName"
-                            project-format="@Model.Project.Format"
-                            selected-document-name="@Model.DocumentNameWithExtension"
-                            language="@Model.LanguageCode"
-                            id="sidebar-scroll"
-                            class="nav nav-list"></ul>
-                    }
-                </div>
-
-            </div>
-        </div>
 
-        @if (Model.Document != null)
-        {
-            <div class="col-md-7 docs-content bg-white">
-                <div class="docs-link-btns">
-                    <div class="float-left">
-                        @(L["ShareOn"].Value + " :")
-                        <a href="#" target="_blank" class="share-button twitter" id="TwitterShareLink" title="Twitter">
-                            <i class="fa fa-twitter"></i>
-                        </a>
-                        <a href="#" target="_blank" class="share-button linkedin" id="LinkedinShareLink" title="LinkedIn">
-                            <i class="fa fa-linkedin"></i>
-                        </a>
-                        <a href="#" target="_blank" class="share-button email" id="EmailShareLink" title="E-mail">
-                            <i class="fa fa-envelope-square"></i>
-                        </a>
-                    </div>
 
-                    <div class="float-right">
+                        @if (Model.Navigation == null || !Model.Navigation.HasChildItems)
-                        @if (!string.IsNullOrEmpty(Model.Document.EditLink))
                         {
-                            <a href="@Model.Document.EditLink" target="_blank"> <i class="fa fa-edit"></i> @L["Edit"]</a>
+                            <div class="text-muted p-3">
+                                <i class="fa fa-warning"></i> @L["NavigationDocumentNotFound"]
+                            </div>
+                        }
+                        else
+                        {
+                            <ul root-node="@Model.Navigation"
+                                version="@(Model.LatestVersionInfo == null || Model.LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version)"
+                                project-name="@Model.ProjectName"
+                                project-format="@Model.Project.Format"
+                                selected-document-name="@Model.DocumentNameWithExtension"
+                                language="@Model.LanguageCode"
+                                id="sidebar-scroll"
+                                class="nav nav-list"></ul>
                         }
                     </div>
+
                 </div>
+            </div>
 
-                <div class="docs-content-field">
+            @if (Model.Document != null)
-                    <div class="docs-text-field">
+            {
-                        <div class="position-relative">
+                <div class="col-md-7 docs-content bg-white">
-                            @if (Model.Document.Contributors != null && Model.Document.Contributors.Count > 0)
+                    <div class="docs-link-btns">
+                        <div class="float-left">
+                            @(L["ShareOn"].Value + " :")
+                            <a href="#" target="_blank" class="share-button twitter" id="TwitterShareLink" title="Twitter">
+                                <i class="fa fa-twitter"></i>
+                            </a>
+                            <a href="#" target="_blank" class="share-button linkedin" id="LinkedinShareLink" title="LinkedIn">
+                                <i class="fa fa-linkedin"></i>
+                            </a>
+                            <a href="#" target="_blank" class="share-button email" id="EmailShareLink" title="E-mail">
+                                <i class="fa fa-envelope-square"></i>
+                            </a>
+                        </div>
+
+                        <div class="float-right">
+                            @if (!string.IsNullOrEmpty(Model.Document.EditLink))
                             {
-                                <div class="contributors">
+                                <a href="@Model.Document.EditLink" target="_blank"> <i class="fa fa-edit"></i> @(L["Edit"]) (@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString())</a>
-                                    <small class="text-muted">@(L["Contributors"].Value + " :")</small>
-                                    @foreach (var contributor in Model.Document.Contributors)
-                                    {
-                                        <a href="@contributor.UserProfileUrl" target="_blank">
-                                            <img src="@contributor.AvatarUrl"
-                                                 class="contributors-avatar" height="21" width="21" title="@contributor.Username" />
-                                        </a>
-                                    }
-                                </div>
                             }
+                        </div>
 
-                            @if (Model.DocumentPreferences != null && Model.DocumentPreferences.Parameters != null && Model.DocumentPreferences.Parameters.Any())
+                        <div class="float-right mr-3">
+                            @if (Model.Document.Contributors != null && Model.Document.Contributors.Count > 0)
                             {
-                                <div class="alert alert-primary alert-criteria">
+                                @(L["Contributors"].Value + " :")
-                                    <abp-row>
+                                @foreach (var contributor in Model.Document.Contributors)
-                                        <abp-column>
+                                {
-                                            <p class="alert-p mb-2">
+                                    <a href="@contributor.UserProfileUrl" target="_blank">
-                                                <i class="fa fa-info-circle"></i>
+                                        <img src="@contributor.AvatarUrl"
-                                                @L["MultipleVersionDocumentInfo"]
+                                             class="rounded-circle" height="21" width="21" title="@contributor.Username" />
-                                            </p>
+                                    </a>
-                                        </abp-column>
+                                }
-                                    </abp-row>
-                                    <abp-form-row>
-                                        @foreach (var parameter in Model.DocumentPreferences.Parameters)
-                                        {
-                                            <abp-column size="_4">
-                                                <div class="input-group">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text" id="@("Section" + parameter.Name + "ComboboxAddonId")">@(parameter.DisplayName)</span>
-                                                    </div>
-                                                    <select class="doc-section-combobox form-control"
-                                                            aria-describedby="@("Section" + parameter.Name + "ComboboxAddonId")"
-                                                            id="@("Section" + parameter.Name + "ComboboxId")" data-key="@parameter.Name">
-                                                        @foreach (var value in parameter.Values)
-                                                        {
-                                                            @if (value.Key == (Model.UserPreferences.ContainsKey(parameter.Name) ? Model.UserPreferences[parameter.Name] : null))
-                                                            {
-                                                                <option value="@value.Key" selected="selected">@value.Value</option>
-                                                            }
-                                                            else
-                                                            {
-                                                                <option value="@value.Key">@value.Value</option>
-                                                            }
-                                                        }
-                                                    </select>
-                                                </div>
-                                            </abp-column>
-                                        }
-                                    </abp-form-row>
-                                </div>
                             }
                         </div>
 
-                        <div data-spy="scroll" data-target="#docs-sticky-index" data-offset="0">
+                    </div>
-                            <article class="docs-body">
 
-                                @if (Model.DocumentLanguageIsDifferent)
+                    <div class="docs-content-field">
+                        <div class="docs-text-field">
+                            <div class="position-relative">
+                                @if (Model.DocumentPreferences != null && Model.DocumentPreferences.Parameters != null && Model.DocumentPreferences.Parameters.Any())
                                 {
-                                    <abp-alert alert-type="Warning" dismissible="true" class="mb-0">
+                                    <div class="alert alert-primary alert-criteria">
-                                        @L["DocumentNotFoundInSelectedLanguage"]
+                                        <abp-row>
-                                    </abp-alert>
+                                            <abp-column>
+                                                <p class="alert-p mb-2">
+                                                    <i class="fa fa-info-circle"></i>
+                                                    @L["MultipleVersionDocumentInfo"]
+                                                </p>
+                                            </abp-column>
+                                        </abp-row>
+                                        <abp-form-row>
+                                            @foreach (var parameter in Model.DocumentPreferences.Parameters)
+                                            {
+                                                <abp-column size="_4">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text" id="@("Section" + parameter.Name + "ComboboxAddonId")">@(parameter.DisplayName)</span>
+                                                        </div>
+                                                        <select class="doc-section-combobox form-control"
+                                                                aria-describedby="@("Section" + parameter.Name + "ComboboxAddonId")"
+                                                                id="@("Section" + parameter.Name + "ComboboxId")" data-key="@parameter.Name">
+                                                            @foreach (var value in parameter.Values)
+                                                            {
+                                                                @if (value.Key == (Model.UserPreferences.ContainsKey(parameter.Name) ? Model.UserPreferences[parameter.Name] : null))
+                                                                {
+                                                                    <option value="@value.Key" selected="selected">@value.Value</option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@value.Key">@value.Value</option>
+                                                                }
+                                                            }
+                                                        </select>
+                                                    </div>
+                                                </abp-column>
+                                            }
+                                        </abp-form-row>
+                                    </div>
                                 }
-                                @Html.Raw(Model.Document.Content)
+                            </div>
-                            </article>
 
-                            <div id="crawler_link" style="display:none;">
+                            <div data-spy="scroll" data-target="#docs-sticky-index" data-offset="0">
+                                <article class="docs-body">
+
+                                    @if (Model.DocumentLanguageIsDifferent)
+                                    {
+                                        <abp-alert alert-type="Warning" dismissible="true" class="mb-0">
+                                            @L["DocumentNotFoundInSelectedLanguage"]
+                                        </abp-alert>
+                                    }
+                                    @Html.Raw(Model.Document.Content)
+                                </article>
 
+                                <div id="crawler_link" style="display:none;">
+
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="col-md-2 docs-page-index position-relative bg-light">
+                <div class="col-md-2 docs-page-index position-relative bg-light">
 
-                <div id="scroll-index" class="docs-inner-anchors mt-2">
+                    <div id="scroll-index" class="docs-inner-anchors mt-2">
 
-                    <h5>@L["InThisDocument"]</h5>
+                        <h5>@L["InThisDocument"]</h5>
-                    <nav id="docs-sticky-index" class="navbar index-scroll">
+                        <nav id="docs-sticky-index" class="navbar index-scroll">
-                    </nav>
+                        </nav>
 
-                    <div class="row">
+                        <div class="row">
-                        <div class="col p-0 py-3">
+                            <div class="col p-0 py-3">
-                            <a href="javascript:;" class="scroll-top-btn"><i class="fa fa-chevron-up"></i> @L["GoToTop"]</a>
+                                <a href="javascript:;" class="scroll-top-btn"><i class="fa fa-chevron-up"></i> @L["GoToTop"]</a>
+                            </div>
                         </div>
-                    </div>
 
+                    </div>
                 </div>
-            </div>
 
-        }
+            }
-        else
+            else
-        {
+            {
-            <div class="col-md-9 p-5 bg-white">
+                <div class="col-md-9 p-5 bg-white">
-                <p>@L["DocumentNotFound"]</p>
+                    <p>@L["DocumentNotFound"]</p>
 
-                <a href="/">
+                    <a href="/">
-                    <i class="fa fa-chevron-left"></i>
+                        <i class="fa fa-chevron-left"></i>
-                    @L["BackToWebsite"]
+                        @L["BackToWebsite"]
-                </a>
+                    </a>
-            </div>
+                </div>
-        }
+            }
 
+        </div>
     </div>
-</div>
+}
-
+else
+{
+    @(await Component.InvokeAsync<DocumentNotFoundViewComponent>(new
+      {
+          model = new DocumentNotFoundPageModel
+          {
+              ProjectName = Model.ProjectName,
+              DocumentName = Model.DocumentName,
+              LanguageCode = Model.LanguageCode,
+              Version = Model.Version,
+          }
+      }))
+}

modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@@ -33,6 +33,8 @@ namespace Volo.Docs.Pages.Documents.Project
         [BindProperty(SupportsGet = true)]
         public string LanguageCode { get; set; }
 
+        public bool DocumentFound { get; set; } = true;
+
         public string DefaultLanguageCode { get; set; }
 
         public ProjectDto Project { get; set; }
@@ -49,7 +51,7 @@ namespace Volo.Docs.Pages.Documents.Project
 
         public List<SelectListItem> ProjectSelectItems { get; private set; }
 
-        public NavigationWithDetailsDto Navigation { get; private set; }
+        public NavigationNode Navigation { get; private set; }
 
         public VersionInfoViewModel LatestVersionInfo { get; private set; }
 
@@ -86,6 +88,21 @@ namespace Volo.Docs.Pages.Documents.Project
         }
 
         public async Task<IActionResult> OnGetAsync()
+        {
+            try
+            {
+                return await SetPageAsync();
+            }
+            catch (DocumentNotFoundException exception)
+            {
+                Logger.LogWarning(exception.Message);
+
+                DocumentFound = false;
+                return Page();
+            }
+        }
+
+        private async Task<IActionResult> SetPageAsync()
         {
             DocumentsUrlPrefix = _uiOptions.RoutePrefix;
             ShowProjectsCombobox = _uiOptions.ShowProjectsCombobox;
@@ -271,7 +288,7 @@ namespace Volo.Docs.Pages.Documents.Project
         {
             try
             {
-                var document = await _documentAppService.GetNavigationAsync(
+                Navigation = await _documentAppService.GetNavigationAsync(
                     new GetNavigationDocumentInput
                     {
                         ProjectId = Project.Id,
@@ -279,15 +296,11 @@ namespace Volo.Docs.Pages.Documents.Project
                         Version = Version
                     }
                 );
-
-                Navigation = ObjectMapper.Map<DocumentWithDetailsDto, NavigationWithDetailsDto>(document);
             }
             catch (DocumentNotFoundException) //TODO: What if called on a remote service which may return 404
             {
                 return;
             }
-
-            Navigation.ConvertItems();
         }
 
         public string CreateVersionLink(VersionInfoViewModel latestVersion, string version, string documentName = null)

modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/DocumentNotFoundComponent/Default.cshtml

@@ -0,0 +1,53 @@
+@using Volo.Docs.Pages.Documents.Shared.DocumentNotFoundComponent
+@model DocumentNotFoundPageModel
+@{
+}
+<div class="row position-relative vh-100" style="background: #e8e8e8;">
+    <div class="center">
+        <span class="notfound-404">404</span> 
+        <h1>
+            <strong>"@Model.DocumentName"</strong> not found in <strong>@Model.ProjectName</strong> documents, with <strong>@Model.Version</strong> version and <strong>@Model.LanguageCode</strong> language.
+        </h1>
+        <br />
+        <a href="@(Model.DocumentsUrlPrefix + Model.LanguageCode + "/" +Model.ProjectName + "/" + Model.Version)" class="btn btn-primary px-4">
+            Go Back
+        </a>
+    </div>
+</div>
+
+
+<style>
+    h1 {
+        font-size: 1.75em;
+        line-height: 1.75;
+        color: #777; 
+        font-weight: normal;
+    }
+
+        h1 strong {
+            color: #222;
+        }
+
+    .center {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        -webkit-transform: translate(-50%, -50%);
+        -ms-transform: translate(-50%, -50%);
+        transform: translate(-50%, -50%);
+        text-align: center;
+    }
+    
+    .notfound-404 {
+    font-size: 300px;
+    font-weight: 700;
+    line-height: 1.25;
+    margin: 0px;
+    color: #fff;
+    text-transform: uppercase;
+    display: block;
+    margin-bottom: -150px;
+    z-index: -1;
+    position: relative;
+    } 
+</style>

modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/DocumentNotFoundComponent/DocumentNotFoundPageModel.cs

@@ -0,0 +1,15 @@
+namespace Volo.Docs.Pages.Documents.Shared.DocumentNotFoundComponent
+{
+    public class DocumentNotFoundPageModel
+    {
+        public string ProjectName { get; set; }
+
+        public string LanguageCode { get; set; }
+
+        public string Version { get; set; }
+
+        public string DocumentName { get; set; }
+
+        public string DocumentsUrlPrefix { get; set; }
+    }
+}

modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/DocumentNotFoundComponent/DocumentNotFoundViewComponent.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Volo.Docs.Pages.Documents.Shared.DocumentNotFoundComponent
+{
+    public class DocumentNotFoundViewComponent : AbpViewComponent
+    {
+        private readonly DocsUiOptions _options;
+
+        public DocumentNotFoundViewComponent(IOptions<DocsUiOptions> options)
+        {
+            _options = options.Value;
+        }
+        public IViewComponentResult Invoke(DocumentNotFoundPageModel model, string defaultErrorMessageKey)
+        {
+            model.DocumentsUrlPrefix = _options.RoutePrefix;
+
+            return View("~/Pages/Documents/Shared/DocumentNotFoundComponent/Default.cshtml", model);
+        }
+    }
+}

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@@ -18,6 +18,7 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
     <ProjectReference Include="..\Volo.Docs.HttpApi\Volo.Docs.HttpApi.csproj" />
     <PackageReference Include="Markdig.Signed" Version="0.18.0" />
     <PackageReference Include="Scriban" Version="2.1.1" />

modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs

@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Docs.Admin.Documents;
+using Volo.Docs.Documents;
+using Xunit;
+
+namespace Volo.Docs
+{
+    public class DocumentAdminAppService_Tests : DocsAdminApplicationTestBase
+    {
+        private readonly IDocumentAdminAppService _documentAdminAppService;
+        private readonly IDocumentRepository _documentRepository;
+        private readonly DocsTestData _testData;
+
+        public DocumentAdminAppService_Tests()
+        {
+            _documentAdminAppService = GetRequiredService<IDocumentAdminAppService>();
+            _documentRepository = GetRequiredService<IDocumentRepository>();
+            _testData = GetRequiredService<DocsTestData>();
+        }
+
+        [Fact]
+        public async Task PullAsync()
+        {
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull();
+
+            await _documentAdminAppService.PullAsync(new PullDocumentInput
+            {
+                ProjectId = _testData.PorjectId,
+                Name = "Part-I.md",
+                LanguageCode = "en",
+                Version = "1.0.0"
+            });
+
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull();
+        }
+
+        [Fact]
+        public async Task PullAllAsync()
+        {
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull();
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-II.md", "en", "1.0.0")).ShouldBeNull();
+
+            await _documentAdminAppService.PullAllAsync(new PullAllDocumentInput
+            {
+                ProjectId = _testData.PorjectId,
+                LanguageCode = "en",
+                Version = "1.0.0"
+            });
+
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull();
+            (await _documentRepository.FindAsync(_testData.PorjectId, "Part-II.md", "en", "1.0.0")).ShouldNotBeNull();
+        }
+    }
+}

modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocumentSourceFactory_Tests.cs

@@ -0,0 +1,25 @@
+using Shouldly;
+using Volo.Docs.Documents;
+using Volo.Docs.FileSystem.Documents;
+using Volo.Docs.GitHub.Documents;
+using Xunit;
+
+namespace Volo.Docs
+{
+    public class DocumentSourceFactory_Tests : DocsDomainTestBase
+    {
+        private readonly IDocumentSourceFactory _documentSourceFactory;
+
+        public DocumentSourceFactory_Tests()
+        {
+            _documentSourceFactory = GetRequiredService<IDocumentSourceFactory>();
+        }
+
+        [Fact]
+        public void Create()
+        {
+            _documentSourceFactory.Create(GithubDocumentSource.Type).GetType().ShouldBe(typeof(GithubDocumentSource));
+            _documentSourceFactory.Create(FileSystemDocumentSource.Type).GetType().ShouldBe(typeof(FileSystemDocumentSource));
+        }
+    }
+}

modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocumentStoreFactory_Tests.cs

@@ -1,25 +0,0 @@
-using Shouldly;
-using Volo.Docs.Documents;
-using Volo.Docs.FileSystem.Documents;
-using Volo.Docs.GitHub.Documents;
-using Xunit;
-
-namespace Volo.Docs
-{
-    public class DocumentStoreFactory_Tests : DocsDomainTestBase
-    {
-        private readonly IDocumentStoreFactory _documentStoreFactory;
-
-        public DocumentStoreFactory_Tests()
-        {
-            _documentStoreFactory = GetRequiredService<IDocumentStoreFactory>();
-        }
-
-        [Fact]
-        public void Create()
-        {
-            _documentStoreFactory.Create(GithubDocumentStore.Type).GetType().ShouldBe(typeof(GithubDocumentStore));
-            _documentStoreFactory.Create(FileSystemDocumentStore.Type).GetType().ShouldBe(typeof(FileSystemDocumentStore));
-        }
-    }
-}

modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentStore_Tests.cs → modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentSource_Tests.cs

@@ -7,15 +7,15 @@ using Xunit;
 
 namespace Volo.Docs
 {
-    public class GithubDocumentStore_Tests : DocsDomainTestBase
+    public class GithubDocumentSource_Tests : DocsDomainTestBase
     {
-        private readonly IDocumentStoreFactory _documentStoreFactory;
+        private readonly IDocumentSourceFactory _documentSourceFactory;
         private readonly IProjectRepository _projectRepository;
         private readonly DocsTestData _testData;
 
-        public GithubDocumentStore_Tests()
+        public GithubDocumentSource_Tests()
         {
-            _documentStoreFactory = GetRequiredService<IDocumentStoreFactory>();
+            _documentSourceFactory = GetRequiredService<IDocumentSourceFactory>();
             _projectRepository = GetRequiredService<IProjectRepository>();
             _testData = GetRequiredService<DocsTestData>();
         }
@@ -23,15 +23,15 @@ namespace Volo.Docs
         [Fact]
         public async Task GetDocumentAsync()
         {
-            var store = _documentStoreFactory.Create(GithubDocumentStore.Type);
+            var source = _documentSourceFactory.Create(GithubDocumentSource.Type);
 
             var project = await _projectRepository.FindAsync(_testData.PorjectId);
             project.ShouldNotBeNull();
 
-            var document = await store.GetDocumentAsync(project, "index2", "en", "0.123.0");
+            var document = await source.GetDocumentAsync(project, "index2", "en", "0.123.0");
             document.ShouldNotBeNull();
 
-            document.Title.ShouldBe("index2");
+            document.Name.ShouldBe("index2");
             document.FileName.ShouldBe("index2");
             document.Version.ShouldBe("0.123.0");
             document.Content.ShouldBe("stringContent");
@@ -40,12 +40,12 @@ namespace Volo.Docs
         [Fact]
         public async Task GetVersionsAsync()
         {
-            var store = _documentStoreFactory.Create(GithubDocumentStore.Type);
+            var source = _documentSourceFactory.Create(GithubDocumentSource.Type);
 
             var project = await _projectRepository.FindAsync(_testData.PorjectId);
             project.ShouldNotBeNull();
 
-            var document = await store.GetVersionsAsync(project);
+            var document = await source.GetVersionsAsync(project);
             document.ShouldNotBeNull();
 
             document.Count.ShouldBe(1);
@@ -55,12 +55,12 @@ namespace Volo.Docs
         [Fact]
         public async Task GetResource()
         {
-            var store = _documentStoreFactory.Create(GithubDocumentStore.Type);
+            var source = _documentSourceFactory.Create(GithubDocumentSource.Type);
 
             var project = await _projectRepository.FindAsync(_testData.PorjectId);
             project.ShouldNotBeNull();
 
-            var documentResource = await store.GetResource(project, "index.md", "en", "0.123.0");
+            var documentResource = await source.GetResource(project, "index.md", "en", "0.123.0");
             documentResource.ShouldNotBeNull();
 
             documentResource.Content.ShouldBe(new byte[]

modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo/Docs/EntityFrameworkCore/DocumentRepository_Tests.cs

@@ -0,0 +1,6 @@
+namespace Volo.Docs.EntityFrameworkCore
+{
+    public class DocumentRepository_Tests : DocumentRepository_Tests<DocsEntityFrameworkCoreTestModule>
+    {
+    }
+}

modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/Document/DocumentRepository_Tests.cs

@@ -0,0 +1,9 @@
+using Volo.Docs.MongoDB;
+
+namespace Volo.Docs.Document
+{
+    public class DocumentRepository_Tests : DocumentRepository_Tests<DocsMongoDBTestModule>
+    {
+
+    }
+}

modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
@@ -23,6 +23,11 @@ namespace Volo.Docs
             var repositoryManager = Substitute.For<IGithubRepositoryManager>();
             repositoryManager.GetFileRawStringContentAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
                 .Returns("stringContent");
+            repositoryManager.GetFileRawStringContentAsync(
+                    Arg.Is<string>(x => x.Contains("docs-nav.json", StringComparison.InvariantCultureIgnoreCase)),
+                    Arg.Any<string>(), Arg.Any<string>())
+                .Returns("{\"items\":[{\"text\":\"Part-I.md\",\"path\":\"Part-I.md\"},{\"text\":\"Part-II\",\"path\":\"Part-II.md\"}]}");
+
             repositoryManager.GetFileRawByteArrayContentAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
                 .Returns(new byte[] { 0x01, 0x02, 0x03 });
             repositoryManager.GetReleasesAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>())
@@ -47,6 +52,25 @@ namespace Volo.Docs
                         "https://api.github.com/repos/abpframework/abp/zipball/0.15.0",
                         null)
                 });
+            repositoryManager.GetFileCommitsAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(),
+                    Arg.Any<string>(), Arg.Any<string>())
+                .Returns(new List<GitHubCommit>
+                {
+                    new GitHubCommit("", "", "", "", "", null, null,
+                        new Author("hikalkan ", 2, "", "https://avatars1.githubusercontent.com/u/1?v=4", "",
+                            "https://github.com/hikalkan", "", "", "", "", "", "", "", "", "", "", false), "",
+                        new Commit("", "", "", "", "", null, null, "", new Committer("", "", DateTimeOffset.Now),
+                            null, null, new []{ new GitReference("", "", "", "", "", null, null) }, 1, null),
+                        null, "", null, new []{ new GitReference("", "", "", "", "", null, null) }, null),
+
+                    new GitHubCommit("", "", "", "", "", null, null,
+                        new Author("ebicoglu ", 2, "", "https://avatars1.githubusercontent.com/u/2?v=4", "",
+                            "https://github.com/ebicoglu", "", "", "", "", "", "", "", "", "", "", false), "",
+                        new Commit("", "", "", "", "", null, null, "", new Committer("", "", DateTimeOffset.Now),
+                            null, null, new []{ new GitReference("", "", "", "", "", null, null) }, 1, null),
+                        null, "", null, new []{ new GitReference("", "", "", "", "", null, null) }, null)
+                });
+
             services.AddSingleton(repositoryManager);
         }
     }

modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs

@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Docs.Documents;
 using Volo.Docs.GitHub.Documents;
 using Volo.Docs.Projects;
 
@@ -10,13 +12,16 @@ namespace Volo.Docs
     {
         private readonly DocsTestData _testData;
         private readonly IProjectRepository _projectRepository;
+        private readonly IDocumentRepository _documentRepository;
 
         public DocsTestDataBuilder(
             DocsTestData testData, 
-            IProjectRepository projectRepository)
+            IProjectRepository projectRepository, 
+            IDocumentRepository documentRepository)
         {
             _testData = testData;
             _projectRepository = projectRepository;
+            _documentRepository = documentRepository;
         }
 
         public async Task BuildAsync()
@@ -25,7 +30,7 @@ namespace Volo.Docs
                 _testData.PorjectId,
                 "ABP vNext",
                 "ABP",
-                GithubDocumentStore.Type,
+                GithubDocumentSource.Type,
                 "md",
                 "index",
                 "docs-nav.json",
@@ -38,6 +43,12 @@ namespace Volo.Docs
                 .SetProperty("GitHubUserAgent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
 
             await _projectRepository.InsertAsync(project);
+
+            await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project.Id, "CLI.md", "2.0.0", "en", "CLI.md",
+                "this is abp cli", "md", "https://github.com/abpframework/abp/blob/2.0.0/docs/en/CLI.md",
+                "https://github.com/abpframework/abp/tree/2.0.0/docs/",
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
+                DateTime.Now));
         }
     }
 }

modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocumentRepository_Tests.cs

@@ -0,0 +1,38 @@
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Volo.Docs.Documents;
+using Xunit;
+
+namespace Volo.Docs
+{
+    public abstract class DocumentRepository_Tests<TStartupModule> : DocsTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        protected readonly IDocumentRepository DocumentRepository;
+        protected readonly DocsTestData DocsTestData;
+
+        protected DocumentRepository_Tests()
+        {
+            DocumentRepository = GetRequiredService<IDocumentRepository>();
+            DocsTestData = GetRequiredService<DocsTestData>();
+        }
+
+        [Fact]
+        public async Task FindAsync()
+        {
+            var document = await DocumentRepository.FindAsync(DocsTestData.PorjectId, "CLI.md", "en", "2.0.0");
+            document.ShouldNotBeNull();
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            (await DocumentRepository.GetListAsync()).ShouldNotBeEmpty();
+
+            await DocumentRepository.DeleteAsync(DocsTestData.PorjectId, "CLI.md", "en", "2.0.0");
+
+            (await DocumentRepository.GetListAsync()).ShouldBeEmpty();
+        }
+    }
+}

npm/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.1.0",
   "packages": [
     "packs/*"
   ],

npm/ng-packs/lerna.version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.1.0",
   "packages": [
     "packages/*"
   ],

npm/ng-packs/packages/account-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.account.config",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/account/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.account",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.account.config": "^2.0.1",
+    "@abp/ng.account.config": "^2.1.0",
-    "@abp/ng.theme.shared": "^2.0.1"
+    "@abp/ng.theme.shared": "^2.1.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.core",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

npm/ng-packs/packages/core/src/lib/directives/debounce.directive.ts

@@ -1,5 +1,13 @@
-import { Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import {
-import { takeUntilDestroy } from '@ngx-validate/core';
+  Directive,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { takeUntilDestroy } from '../utils/rxjs-utils';
 import { fromEvent } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 
@@ -16,10 +24,7 @@ export class InputEventDebounceDirective implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     fromEvent(this.el.nativeElement, 'input')
-      .pipe(
+      .pipe(debounceTime(this.debounce), takeUntilDestroy(this))
-        debounceTime(this.debounce),
-        takeUntilDestroy(this),
-      )
       .subscribe((event: Event) => {
         this.debounceEvent.emit(event);
       });

npm/ng-packs/packages/feature-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.feature-management",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "^2.0.1"
+    "@abp/ng.theme.shared": "^2.1.0"
   },
   "publishConfig": {
     "access": "public"