diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.Designer.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.Designer.cs
deleted file mode 100644
index 235567e252..0000000000
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.Designer.cs
+++ /dev/null
@@ -1,984 +0,0 @@
-//
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Volo.Abp.EntityFrameworkCore;
-using VoloDocs.EntityFrameworkCore;
-
-namespace VoloDocs.EntityFrameworkCore.Migrations
-{
- [DbContext(typeof(VoloDocsDbContext))]
- [Migration("20201104131104_Initial")]
- partial class Initial
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .UseIdentityColumns()
- .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("ProductVersion", "5.0.0-rc.2.20475.6");
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("Description")
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsStatic")
- .HasColumnType("bit");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("Regex")
- .HasMaxLength(512)
- .HasColumnType("nvarchar(512)");
-
- b.Property("RegexDescription")
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("Required")
- .HasColumnType("bit");
-
- b.Property("ValueType")
- .HasColumnType("int");
-
- b.HasKey("Id");
-
- b.ToTable("AbpClaimTypes");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("SourceTenantId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("SourceUserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TargetTenantId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TargetUserId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
- .IsUnique()
- .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
-
- b.ToTable("AbpLinkUsers");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDefault")
- .HasColumnType("bit")
- .HasColumnName("IsDefault");
-
- b.Property("IsPublic")
- .HasColumnType("bit")
- .HasColumnName("IsPublic");
-
- b.Property("IsStatic")
- .HasColumnType("bit")
- .HasColumnName("IsStatic");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("NormalizedName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedName");
-
- b.ToTable("AbpRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
- {
- b.Property("Id")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ClaimType")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("ClaimValue")
- .HasMaxLength(1024)
- .HasColumnType("nvarchar(1024)");
-
- b.Property("RoleId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AbpRoleClaims");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Action")
- .HasMaxLength(96)
- .HasColumnType("nvarchar(96)");
-
- b.Property("ApplicationName")
- .HasMaxLength(96)
- .HasColumnType("nvarchar(96)");
-
- b.Property("BrowserInfo")
- .HasMaxLength(512)
- .HasColumnType("nvarchar(512)");
-
- b.Property("ClientId")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("ClientIpAddress")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CorrelationId")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("Identity")
- .HasMaxLength(96)
- .HasColumnType("nvarchar(96)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.Property("TenantName")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("UserName")
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.HasKey("Id");
-
- b.HasIndex("TenantId", "Action");
-
- b.HasIndex("TenantId", "ApplicationName");
-
- b.HasIndex("TenantId", "Identity");
-
- b.HasIndex("TenantId", "UserId");
-
- b.ToTable("AbpSecurityLogs");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("AccessFailedCount")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasDefaultValue(0)
- .HasColumnName("AccessFailedCount");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("datetime2")
- .HasColumnName("DeletionTime");
-
- b.Property("Email")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("Email");
-
- b.Property("EmailConfirmed")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("EmailConfirmed");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("IsExternal")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("IsExternal");
-
- b.Property("LastModificationTime")
- .HasColumnType("datetime2")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("LastModifierId");
-
- b.Property("LockoutEnabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("LockoutEnabled");
-
- b.Property("LockoutEnd")
- .HasColumnType("datetimeoffset");
-
- b.Property("Name")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)")
- .HasColumnName("Name");
-
- b.Property("NormalizedEmail")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("NormalizedEmail");
-
- b.Property("NormalizedUserName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("NormalizedUserName");
-
- b.Property("PasswordHash")
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("PasswordHash");
-
- b.Property("PhoneNumber")
- .HasMaxLength(16)
- .HasColumnType("nvarchar(16)")
- .HasColumnName("PhoneNumber");
-
- b.Property("PhoneNumberConfirmed")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("PhoneNumberConfirmed");
-
- b.Property("SecurityStamp")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("SecurityStamp");
-
- b.Property("Surname")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)")
- .HasColumnName("Surname");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.Property("TwoFactorEnabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("TwoFactorEnabled");
-
- b.Property("UserName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)")
- .HasColumnName("UserName");
-
- 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("Id")
- .HasColumnType("uniqueidentifier");
-
- b.Property("ClaimType")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("nvarchar(256)");
-
- b.Property("ClaimValue")
- .HasMaxLength(1024)
- .HasColumnType("nvarchar(1024)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("AbpUserClaims");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
- {
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("LoginProvider")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("ProviderDisplayName")
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("ProviderKey")
- .IsRequired()
- .HasMaxLength(196)
- .HasColumnType("nvarchar(196)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("UserId", "LoginProvider");
-
- b.HasIndex("LoginProvider", "ProviderKey");
-
- b.ToTable("AbpUserLogins");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
- {
- b.Property("OrganizationUnitId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("CreatorId");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("OrganizationUnitId", "UserId");
-
- b.HasIndex("UserId", "OrganizationUnitId");
-
- b.ToTable("AbpUserOrganizationUnits");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
- {
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("RoleId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("UserId", "RoleId");
-
- b.HasIndex("RoleId", "UserId");
-
- b.ToTable("AbpUserRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
- {
- b.Property("UserId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("LoginProvider")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("Name")
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.Property("Value")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("UserId", "LoginProvider", "Name");
-
- b.ToTable("AbpUserTokens");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Code")
- .IsRequired()
- .HasMaxLength(95)
- .HasColumnType("nvarchar(95)")
- .HasColumnName("Code");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("datetime2")
- .HasColumnName("DeletionTime");
-
- b.Property("DisplayName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)")
- .HasColumnName("DisplayName");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("bit")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("LastModificationTime")
- .HasColumnType("datetime2")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("LastModifierId");
-
- b.Property("ParentId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("Code");
-
- b.HasIndex("ParentId");
-
- b.ToTable("AbpOrganizationUnits");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
- {
- b.Property("OrganizationUnitId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("RoleId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("CreatorId");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("OrganizationUnitId", "RoleId");
-
- b.HasIndex("RoleId", "OrganizationUnitId");
-
- b.ToTable("AbpOrganizationUnitRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("ProviderKey")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("ProviderName")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("TenantId")
- .HasColumnType("uniqueidentifier")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("Name", "ProviderName", "ProviderKey");
-
- b.ToTable("AbpPermissionGrants");
- });
-
- modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("ProviderKey")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("ProviderName")
- .HasMaxLength(64)
- .HasColumnType("nvarchar(64)");
-
- b.Property("Value")
- .IsRequired()
- .HasMaxLength(2048)
- .HasColumnType("nvarchar(2048)");
-
- b.HasKey("Id");
-
- b.HasIndex("Name", "ProviderName", "ProviderKey");
-
- b.ToTable("AbpSettings");
- });
-
- modelBuilder.Entity("Volo.Docs.Documents.Document", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("Content")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreationTime")
- .HasColumnType("datetime2");
-
- b.Property("EditLink")
- .HasMaxLength(2048)
- .HasColumnType("nvarchar(2048)");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("FileName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("Format")
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("LanguageCode")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("LastCachedTime")
- .HasColumnType("datetime2");
-
- b.Property("LastSignificantUpdateTime")
- .HasColumnType("datetime2");
-
- b.Property("LastUpdatedTime")
- .HasColumnType("datetime2");
-
- b.Property("LocalDirectory")
- .HasMaxLength(512)
- .HasColumnType("nvarchar(512)");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(255)
- .HasColumnType("nvarchar(255)");
-
- b.Property("ProjectId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("RawRootUrl")
- .HasMaxLength(2048)
- .HasColumnType("nvarchar(2048)");
-
- b.Property("RootUrl")
- .HasMaxLength(2048)
- .HasColumnType("nvarchar(2048)");
-
- b.Property("Version")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.HasKey("Id");
-
- b.ToTable("DocsDocuments");
- });
-
- modelBuilder.Entity("Volo.Docs.Documents.DocumentContributor", b =>
- {
- b.Property("DocumentId")
- .HasColumnType("uniqueidentifier");
-
- b.Property("Username")
- .HasColumnType("nvarchar(450)");
-
- b.Property("AvatarUrl")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UserProfileUrl")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("DocumentId", "Username");
-
- b.ToTable("DocsDocumentContributors");
- });
-
- modelBuilder.Entity("Volo.Docs.Projects.Project", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uniqueidentifier");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("nvarchar(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("DefaultDocumentName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("DocumentStoreType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ExtraProperties")
- .HasColumnType("nvarchar(max)")
- .HasColumnName("ExtraProperties");
-
- b.Property("Format")
- .HasColumnType("nvarchar(max)");
-
- b.Property("LatestVersionBranchName")
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("MainWebsiteUrl")
- .HasColumnType("nvarchar(max)");
-
- b.Property("MinimumVersion")
- .HasColumnType("nvarchar(max)");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("NavigationDocumentName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("ParametersDocumentName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("nvarchar(128)");
-
- b.Property("ShortName")
- .IsRequired()
- .HasMaxLength(32)
- .HasColumnType("nvarchar(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.IdentityUserOrganizationUnit", b =>
- {
- b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
- .WithMany()
- .HasForeignKey("OrganizationUnitId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Volo.Abp.Identity.IdentityUser", null)
- .WithMany("OrganizationUnits")
- .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.Abp.Identity.OrganizationUnit", b =>
- {
- b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
- .WithMany()
- .HasForeignKey("ParentId");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
- {
- b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
- .WithMany("Roles")
- .HasForeignKey("OrganizationUnitId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("Volo.Abp.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .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();
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
- {
- b.Navigation("Claims");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
- {
- b.Navigation("Claims");
-
- b.Navigation("Logins");
-
- b.Navigation("OrganizationUnits");
-
- b.Navigation("Roles");
-
- b.Navigation("Tokens");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
- {
- b.Navigation("Roles");
- });
-
- modelBuilder.Entity("Volo.Docs.Documents.Document", b =>
- {
- b.Navigation("Contributors");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.cs
deleted file mode 100644
index 1ed082ff34..0000000000
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace VoloDocs.EntityFrameworkCore.Migrations
-{
- public partial class Added_CommitCount : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AddColumn(
- name: "CommitCount",
- table: "DocsDocumentContributors",
- type: "int",
- nullable: false,
- defaultValue: 0);
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropColumn(
- name: "CommitCount",
- table: "DocsDocumentContributors");
- }
- }
-}
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.Designer.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.Designer.cs
similarity index 99%
rename from modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.Designer.cs
rename to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.Designer.cs
index ff28c9f865..fb4fe8bef7 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201208084431_Added_CommitCount.Designer.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.Designer.cs
@@ -11,8 +11,8 @@ using VoloDocs.EntityFrameworkCore;
namespace VoloDocs.EntityFrameworkCore.Migrations
{
[DbContext(typeof(VoloDocsDbContext))]
- [Migration("20201208084431_Added_CommitCount")]
- partial class Added_CommitCount
+ [Migration("20210105171158_Initial")]
+ partial class Initial
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@@ -21,7 +21,7 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.UseIdentityColumns()
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("ProductVersion", "5.0.0");
+ .HasAnnotation("ProductVersion", "5.0.1");
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.cs
similarity index 99%
rename from modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.cs
rename to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.cs
index 88ba99c801..c06a1337de 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20210105171158_Initial.cs
@@ -403,6 +403,7 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
{
DocumentId = table.Column(type: "uniqueidentifier", nullable: false),
Username = table.Column(type: "nvarchar(450)", nullable: false),
+ CommitCount = table.Column(type: "int", nullable: false),
UserProfileUrl = table.Column(type: "nvarchar(max)", nullable: true),
AvatarUrl = table.Column(type: "nvarchar(max)", nullable: true)
},
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
index 112509c609..c36faa83d5 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
@@ -19,7 +19,7 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.UseIdentityColumns()
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("ProductVersion", "5.0.0");
+ .HasAnnotation("ProductVersion", "5.0.1");
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{
diff --git a/modules/docs/app/VoloDocs.Web/appsettings.json b/modules/docs/app/VoloDocs.Web/appsettings.json
index b1fb4d82bc..cba6d1394a 100644
--- a/modules/docs/app/VoloDocs.Web/appsettings.json
+++ b/modules/docs/app/VoloDocs.Web/appsettings.json
@@ -1,6 +1,5 @@
{
"ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True",
- "LogoUrl": "/assets/images/Logo.png",
"ElasticSearch": {
"Url": "http://localhost:9200"
},
diff --git a/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs b/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
index 4aba5776df..50111ab7e6 100644
--- a/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
+++ b/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
using Volo.Docs.Utils;
@@ -43,15 +44,21 @@ namespace Volo.Docs.HtmlConverting
{
try
{
+ var ignoredIndicies = GetIgnoredImageIndicies(html);
+
return Regex.Replace(html, "", match =>
{
+ if (ignoredIndicies != null && ignoredIndicies.Contains(match.Index))
+ {
+ return match.Value;
+ }
+
var link = match.Groups[1].Value;
var imgTag = match.Groups[0].Value;
var title = GetTitleFromTag(imgTag);
return $"{imgTag}";
});
-
}
catch
{
@@ -60,6 +67,44 @@ namespace Volo.Docs.HtmlConverting
}
}
+ private static List GetIgnoredImageIndicies(string html)
+ {
+ return GetIgnoredImageIndicies(FindImgTagsWithinAnchor(html));
+ }
+
+ private static List GetIgnoredImageIndicies(MatchCollection ignoredImages)
+ {
+ if (ignoredImages == null)
+ {
+ return null;
+ }
+
+ var ignoredImageIndicies = new List(ignoredImages.Count);
+ for (var i = 0; i < ignoredImages.Count; i++)
+ {
+ var ignoredImage = ignoredImages[i];
+ var ignoredImgIndex = ignoredImage.Index +
+ ignoredImage.Value.IndexOf("]+)?>(?:(?!<\s*/\s*a\s*>).)*");
+ }
+ catch
+ {
+ // ignored
+ return null;
+ }
+ }
+
private static string GetTitleFromTag(string imgTag)
{
if (string.IsNullOrWhiteSpace(imgTag))