Browse Source

Use System.Text.Jons in the Docs module.

Fix #6065
pull/6062/head
maliming 6 years ago
parent
commit
e4952c8234
  1. 474
      modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.Designer.cs
  2. 316
      modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.cs
  3. 472
      modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
  4. 1
      modules/docs/app/VoloDocs.Web/Program.cs
  5. 6
      modules/docs/app/VoloDocs.Web/Properties/launchSettings.json
  6. 2
      modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
  7. 4
      modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
  8. 10
      modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs
  9. 3
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs
  10. 2
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
  11. 27
      modules/docs/src/Volo.Docs.Domain/Volo/Extensions/DocsJsonSerializerHelper.cs
  12. 22
      modules/docs/src/Volo.Docs.Domain/Volo/Extensions/NewtonsoftJsonExtensions.cs
  13. 7
      modules/docs/src/Volo.Docs.Web/HtmlConverting/ScribanDocumentSectionRenderer.cs

474
modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201013055312_Initial.Designer.cs → modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.Designer.cs

@ -11,17 +11,17 @@ using VoloDocs.EntityFrameworkCore;
namespace VoloDocs.EntityFrameworkCore.Migrations namespace VoloDocs.EntityFrameworkCore.Migrations
{ {
[DbContext(typeof(VoloDocsDbContext))] [DbContext(typeof(VoloDocsDbContext))]
[Migration("20201013055312_Initial")] [Migration("20201104131104_Initial")]
partial class Initial partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.UseIdentityColumns()
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("ProductVersion", "3.1.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("ProductVersion", "5.0.0-rc.2.20475.6");
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{ {
@ -31,33 +31,33 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("Description") b.Property<string>("Description")
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsStatic") b.Property<bool>("IsStatic")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("Regex") b.Property<string>("Regex")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("RegexDescription") b.Property<string>("RegexDescription")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<bool>("Required") b.Property<bool>("Required")
.HasColumnType("bit"); .HasColumnType("bit");
@ -105,39 +105,39 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDefault") b.Property<bool>("IsDefault")
.HasColumnName("IsDefault") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsDefault");
b.Property<bool>("IsPublic") b.Property<bool>("IsPublic")
.HasColumnName("IsPublic") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsPublic");
b.Property<bool>("IsStatic") b.Property<bool>("IsStatic")
.HasColumnName("IsStatic") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsStatic");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedName") b.Property<string>("NormalizedName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -153,19 +153,19 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ClaimType") b.Property<string>("ClaimType")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ClaimValue") b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(1024)") .HasMaxLength(1024)
.HasMaxLength(1024); .HasColumnType("nvarchar(1024)");
b.Property<Guid>("RoleId") b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -181,60 +181,60 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("Action") b.Property<string>("Action")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<string>("ApplicationName") b.Property<string>("ApplicationName")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<string>("BrowserInfo") b.Property<string>("BrowserInfo")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("ClientId") b.Property<string>("ClientId")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ClientIpAddress") b.Property<string>("ClientIpAddress")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("CorrelationId") b.Property<string>("CorrelationId")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("Identity") b.Property<string>("Identity")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<string>("TenantName") b.Property<string>("TenantName")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<Guid?>("UserId") b.Property<Guid?>("UserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("UserName") b.Property<string>("UserName")
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.HasKey("Id"); b.HasKey("Id");
@ -257,136 +257,136 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<int>("AccessFailedCount") b.Property<int>("AccessFailedCount")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("AccessFailedCount")
.HasColumnType("int") .HasColumnType("int")
.HasDefaultValue(0); .HasDefaultValue(0)
.HasColumnName("AccessFailedCount");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId") b.Property<Guid?>("DeleterId")
.HasColumnName("DeleterId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime") b.Property<DateTime?>("DeletionTime")
.HasColumnName("DeletionTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("DeletionTime");
b.Property<string>("Email") b.Property<string>("Email")
.IsRequired() .IsRequired()
.HasColumnName("Email") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("Email");
b.Property<bool>("EmailConfirmed") b.Property<bool>("EmailConfirmed")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("EmailConfirmed")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("EmailConfirmed");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsDeleted")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<bool>("IsExternal") b.Property<bool>("IsExternal")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsExternal")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsExternal");
b.Property<DateTime?>("LastModificationTime") b.Property<DateTime?>("LastModificationTime")
.HasColumnName("LastModificationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId") b.Property<Guid?>("LastModifierId")
.HasColumnName("LastModifierId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("LastModifierId");
b.Property<bool>("LockoutEnabled") b.Property<bool>("LockoutEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("LockoutEnabled")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd") b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetimeoffset"); .HasColumnType("datetimeoffset");
b.Property<string>("Name") b.Property<string>("Name")
.HasColumnName("Name") .HasMaxLength(64)
.HasColumnType("nvarchar(64)") .HasColumnType("nvarchar(64)")
.HasMaxLength(64); .HasColumnName("Name");
b.Property<string>("NormalizedEmail") b.Property<string>("NormalizedEmail")
.IsRequired() .IsRequired()
.HasColumnName("NormalizedEmail") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("NormalizedEmail");
b.Property<string>("NormalizedUserName") b.Property<string>("NormalizedUserName")
.IsRequired() .IsRequired()
.HasColumnName("NormalizedUserName") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("NormalizedUserName");
b.Property<string>("PasswordHash") b.Property<string>("PasswordHash")
.HasColumnName("PasswordHash") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("PasswordHash");
b.Property<string>("PhoneNumber") b.Property<string>("PhoneNumber")
.HasColumnName("PhoneNumber") .HasMaxLength(16)
.HasColumnType("nvarchar(16)") .HasColumnType("nvarchar(16)")
.HasMaxLength(16); .HasColumnName("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed") b.Property<bool>("PhoneNumberConfirmed")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("PhoneNumberConfirmed")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("PhoneNumberConfirmed");
b.Property<string>("SecurityStamp") b.Property<string>("SecurityStamp")
.IsRequired() .IsRequired()
.HasColumnName("SecurityStamp") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("SecurityStamp");
b.Property<string>("Surname") b.Property<string>("Surname")
.HasColumnName("Surname") .HasMaxLength(64)
.HasColumnType("nvarchar(64)") .HasColumnType("nvarchar(64)")
.HasMaxLength(64); .HasColumnName("Surname");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<bool>("TwoFactorEnabled") b.Property<bool>("TwoFactorEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("TwoFactorEnabled")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("TwoFactorEnabled");
b.Property<string>("UserName") b.Property<string>("UserName")
.IsRequired() .IsRequired()
.HasColumnName("UserName") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("UserName");
b.HasKey("Id"); b.HasKey("Id");
@ -408,16 +408,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ClaimType") b.Property<string>("ClaimType")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ClaimValue") b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(1024)") .HasMaxLength(1024)
.HasMaxLength(1024); .HasColumnType("nvarchar(1024)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -435,21 +435,21 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("LoginProvider") b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderDisplayName") b.Property<string>("ProviderDisplayName")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(196)") .HasMaxLength(196)
.HasMaxLength(196); .HasColumnType("nvarchar(196)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("UserId", "LoginProvider"); b.HasKey("UserId", "LoginProvider");
@ -467,16 +467,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "UserId"); b.HasKey("OrganizationUnitId", "UserId");
@ -494,8 +494,8 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("UserId", "RoleId"); b.HasKey("UserId", "RoleId");
@ -510,16 +510,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("LoginProvider") b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("Name") b.Property<string>("Name")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<string>("Value") b.Property<string>("Value")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -537,62 +537,62 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Code") b.Property<string>("Code")
.IsRequired() .IsRequired()
.HasColumnName("Code") .HasMaxLength(95)
.HasColumnType("nvarchar(95)") .HasColumnType("nvarchar(95)")
.HasMaxLength(95); .HasColumnName("Code");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId") b.Property<Guid?>("DeleterId")
.HasColumnName("DeleterId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime") b.Property<DateTime?>("DeletionTime")
.HasColumnName("DeletionTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("DeletionTime");
b.Property<string>("DisplayName") b.Property<string>("DisplayName")
.IsRequired() .IsRequired()
.HasColumnName("DisplayName") .HasMaxLength(128)
.HasColumnType("nvarchar(128)") .HasColumnType("nvarchar(128)")
.HasMaxLength(128); .HasColumnName("DisplayName");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsDeleted")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime") b.Property<DateTime?>("LastModificationTime")
.HasColumnName("LastModificationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId") b.Property<Guid?>("LastModifierId")
.HasColumnName("LastModifierId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("LastModifierId");
b.Property<Guid?>("ParentId") b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -612,16 +612,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "RoleId"); b.HasKey("OrganizationUnitId", "RoleId");
@ -638,22 +638,22 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderName") b.Property<string>("ProviderName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -670,21 +670,21 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderName") b.Property<string>("ProviderName")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("Value") b.Property<string>("Value")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.HasKey("Id"); b.HasKey("Id");
@ -701,9 +701,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("Content") b.Property<string>("Content")
.IsRequired() .IsRequired()
@ -713,26 +713,26 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("EditLink") b.Property<string>("EditLink")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("FileName") b.Property<string>("FileName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("Format") b.Property<string>("Format")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("LanguageCode") b.Property<string>("LanguageCode")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<DateTime>("LastCachedTime") b.Property<DateTime>("LastCachedTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -744,29 +744,29 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("LocalDirectory") b.Property<string>("LocalDirectory")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(255)") .HasMaxLength(255)
.HasMaxLength(255); .HasColumnType("nvarchar(255)");
b.Property<Guid>("ProjectId") b.Property<Guid>("ProjectId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("RawRootUrl") b.Property<string>("RawRootUrl")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("RootUrl") b.Property<string>("RootUrl")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("Version") b.Property<string>("Version")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.HasKey("Id"); b.HasKey("Id");
@ -800,28 +800,28 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("DefaultDocumentName") b.Property<string>("DefaultDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("DocumentStoreType") b.Property<string>("DocumentStoreType")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("Format") b.Property<string>("Format")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("LatestVersionBranchName") b.Property<string>("LatestVersionBranchName")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("MainWebsiteUrl") b.Property<string>("MainWebsiteUrl")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -831,23 +831,23 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("NavigationDocumentName") b.Property<string>("NavigationDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ParametersDocumentName") b.Property<string>("ParametersDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ShortName") b.Property<string>("ShortName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(32)") .HasMaxLength(32)
.HasMaxLength(32); .HasColumnType("nvarchar(32)");
b.HasKey("Id"); b.HasKey("Id");
@ -950,6 +950,34 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .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 #pragma warning restore 612, 618
} }
} }

316
modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201013055312_Initial.cs → modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20201104131104_Initial.cs

@ -11,16 +11,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpClaimTypes", name: "AbpClaimTypes",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), Required = table.Column<bool>(type: "bit", nullable: false),
Name = table.Column<string>(maxLength: 256, nullable: false), IsStatic = table.Column<bool>(type: "bit", nullable: false),
Required = table.Column<bool>(nullable: false), Regex = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
IsStatic = table.Column<bool>(nullable: false), RegexDescription = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Regex = table.Column<string>(maxLength: 512, nullable: true), Description = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
RegexDescription = table.Column<string>(maxLength: 128, nullable: true), ValueType = table.Column<int>(type: "int", nullable: false),
Description = table.Column<string>(maxLength: 256, nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
ValueType = table.Column<int>(nullable: false) ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -31,11 +31,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpLinkUsers", name: "AbpLinkUsers",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SourceUserId = table.Column<Guid>(nullable: false), SourceUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SourceTenantId = table.Column<Guid>(nullable: true), SourceTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
TargetUserId = table.Column<Guid>(nullable: false), TargetUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TargetTenantId = table.Column<Guid>(nullable: true) TargetTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -46,20 +46,20 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpOrganizationUnits", name: "AbpOrganizationUnits",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CreationTime = table.Column<DateTime>(nullable: false), Code = table.Column<string>(type: "nvarchar(95)", maxLength: 95, nullable: false),
CreatorId = table.Column<Guid>(nullable: true), DisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
LastModificationTime = table.Column<DateTime>(nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
LastModifierId = table.Column<Guid>(nullable: true), ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
IsDeleted = table.Column<bool>(nullable: false, defaultValue: false), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
DeleterId = table.Column<Guid>(nullable: true), CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DeletionTime = table.Column<DateTime>(nullable: true), LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
TenantId = table.Column<Guid>(nullable: true), LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ParentId = table.Column<Guid>(nullable: true), IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
Code = table.Column<string>(maxLength: 95, nullable: false), DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DisplayName = table.Column<string>(maxLength: 128, nullable: false) DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -76,11 +76,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpPermissionGrants", name: "AbpPermissionGrants",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Name = table.Column<string>(maxLength: 128, nullable: false), Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
ProviderName = table.Column<string>(maxLength: 64, nullable: false), ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
ProviderKey = table.Column<string>(maxLength: 64, nullable: false) ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
}, },
constraints: table => constraints: table =>
{ {
@ -91,15 +91,15 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpRoles", name: "AbpRoles",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
TenantId = table.Column<Guid>(nullable: true), NormalizedName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
Name = table.Column<string>(maxLength: 256, nullable: false), IsDefault = table.Column<bool>(type: "bit", nullable: false),
NormalizedName = table.Column<string>(maxLength: 256, nullable: false), IsStatic = table.Column<bool>(type: "bit", nullable: false),
IsDefault = table.Column<bool>(nullable: false), IsPublic = table.Column<bool>(type: "bit", nullable: false),
IsStatic = table.Column<bool>(nullable: false), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
IsPublic = table.Column<bool>(nullable: false) ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -110,21 +110,21 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpSecurityLogs", name: "AbpSecurityLogs",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), ApplicationName = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
TenantId = table.Column<Guid>(nullable: true), Identity = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
ApplicationName = table.Column<string>(maxLength: 96, nullable: true), Action = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
Identity = table.Column<string>(maxLength: 96, nullable: true), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Action = table.Column<string>(maxLength: 96, nullable: true), UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
UserId = table.Column<Guid>(nullable: true), TenantName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
UserName = table.Column<string>(maxLength: 256, nullable: true), ClientId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
TenantName = table.Column<string>(maxLength: 64, nullable: true), CorrelationId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ClientId = table.Column<string>(maxLength: 64, nullable: true), ClientIpAddress = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
CorrelationId = table.Column<string>(maxLength: 64, nullable: true), BrowserInfo = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
ClientIpAddress = table.Column<string>(maxLength: 64, nullable: true), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
BrowserInfo = table.Column<string>(maxLength: 512, nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
CreationTime = table.Column<DateTime>(nullable: false) ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -135,11 +135,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpSettings", name: "AbpSettings",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Name = table.Column<string>(maxLength: 128, nullable: false), Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Value = table.Column<string>(maxLength: 2048, nullable: false), Value = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: false),
ProviderName = table.Column<string>(maxLength: 64, nullable: true), ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ProviderKey = table.Column<string>(maxLength: 64, nullable: true) ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -150,33 +150,33 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUsers", name: "AbpUsers",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
CreationTime = table.Column<DateTime>(nullable: false), NormalizedUserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
CreatorId = table.Column<Guid>(nullable: true), Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
LastModificationTime = table.Column<DateTime>(nullable: true), Surname = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
LastModifierId = table.Column<Guid>(nullable: true), Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
IsDeleted = table.Column<bool>(nullable: false, defaultValue: false), NormalizedEmail = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
DeleterId = table.Column<Guid>(nullable: true), EmailConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
DeletionTime = table.Column<DateTime>(nullable: true), PasswordHash = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
TenantId = table.Column<Guid>(nullable: true), SecurityStamp = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
UserName = table.Column<string>(maxLength: 256, nullable: false), IsExternal = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
NormalizedUserName = table.Column<string>(maxLength: 256, nullable: false), PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
Name = table.Column<string>(maxLength: 64, nullable: true), PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
Surname = table.Column<string>(maxLength: 64, nullable: true), TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
Email = table.Column<string>(maxLength: 256, nullable: false), LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
NormalizedEmail = table.Column<string>(maxLength: 256, nullable: false), LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
EmailConfirmed = table.Column<bool>(nullable: false, defaultValue: false), AccessFailedCount = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
PasswordHash = table.Column<string>(maxLength: 256, nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
SecurityStamp = table.Column<string>(maxLength: 256, nullable: false), ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
IsExternal = table.Column<bool>(nullable: false, defaultValue: false), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
PhoneNumber = table.Column<string>(maxLength: 16, nullable: true), CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
PhoneNumberConfirmed = table.Column<bool>(nullable: false, defaultValue: false), LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
TwoFactorEnabled = table.Column<bool>(nullable: false, defaultValue: false), LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LockoutEnd = table.Column<DateTimeOffset>(nullable: true), IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
LockoutEnabled = table.Column<bool>(nullable: false, defaultValue: false), DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
AccessFailedCount = table.Column<int>(nullable: false, defaultValue: 0) DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -187,24 +187,24 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "DocsDocuments", name: "DocsDocuments",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), ProjectId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), Name = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: false),
ProjectId = table.Column<Guid>(nullable: false), Version = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Name = table.Column<string>(maxLength: 255, nullable: false), LanguageCode = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Version = table.Column<string>(maxLength: 128, nullable: false), FileName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
LanguageCode = table.Column<string>(maxLength: 128, nullable: false), Content = table.Column<string>(type: "nvarchar(max)", nullable: false),
FileName = table.Column<string>(maxLength: 128, nullable: false), Format = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Content = table.Column<string>(nullable: false), EditLink = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
Format = table.Column<string>(maxLength: 128, nullable: true), RootUrl = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
EditLink = table.Column<string>(maxLength: 2048, nullable: true), RawRootUrl = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
RootUrl = table.Column<string>(maxLength: 2048, nullable: true), LocalDirectory = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
RawRootUrl = table.Column<string>(maxLength: 2048, nullable: true), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
LocalDirectory = table.Column<string>(maxLength: 512, nullable: true), LastUpdatedTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreationTime = table.Column<DateTime>(nullable: false), LastSignificantUpdateTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastUpdatedTime = table.Column<DateTime>(nullable: false), LastCachedTime = table.Column<DateTime>(type: "datetime2", nullable: false),
LastSignificantUpdateTime = table.Column<DateTime>(nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
LastCachedTime = table.Column<DateTime>(nullable: false) ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -215,19 +215,19 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "DocsProjects", name: "DocsProjects",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ExtraProperties = table.Column<string>(nullable: true), Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true), ShortName = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
Name = table.Column<string>(maxLength: 128, nullable: false), Format = table.Column<string>(type: "nvarchar(max)", nullable: true),
ShortName = table.Column<string>(maxLength: 32, nullable: false), DefaultDocumentName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Format = table.Column<string>(nullable: true), NavigationDocumentName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
DefaultDocumentName = table.Column<string>(maxLength: 128, nullable: false), ParametersDocumentName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
NavigationDocumentName = table.Column<string>(maxLength: 128, nullable: false), MinimumVersion = table.Column<string>(type: "nvarchar(max)", nullable: true),
ParametersDocumentName = table.Column<string>(maxLength: 128, nullable: false), DocumentStoreType = table.Column<string>(type: "nvarchar(max)", nullable: true),
MinimumVersion = table.Column<string>(nullable: true), MainWebsiteUrl = table.Column<string>(type: "nvarchar(max)", nullable: true),
DocumentStoreType = table.Column<string>(nullable: true), LatestVersionBranchName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
MainWebsiteUrl = table.Column<string>(nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
LatestVersionBranchName = table.Column<string>(maxLength: 128, nullable: true) ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -238,11 +238,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpOrganizationUnitRoles", name: "AbpOrganizationUnitRoles",
columns: table => new columns: table => new
{ {
RoleId = table.Column<Guid>(nullable: false), RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
OrganizationUnitId = table.Column<Guid>(nullable: false), OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreationTime = table.Column<DateTime>(nullable: false), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CreatorId = table.Column<Guid>(nullable: true), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
TenantId = table.Column<Guid>(nullable: true) CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -265,11 +265,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpRoleClaims", name: "AbpRoleClaims",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(nullable: true), RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ClaimType = table.Column<string>(maxLength: 256, nullable: false), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ClaimValue = table.Column<string>(maxLength: 1024, nullable: true), ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
RoleId = table.Column<Guid>(nullable: false) ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -286,11 +286,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUserClaims", name: "AbpUserClaims",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(nullable: true), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ClaimType = table.Column<string>(maxLength: 256, nullable: false), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ClaimValue = table.Column<string>(maxLength: 1024, nullable: true), ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
UserId = table.Column<Guid>(nullable: false) ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -307,11 +307,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUserLogins", name: "AbpUserLogins",
columns: table => new columns: table => new
{ {
UserId = table.Column<Guid>(nullable: false), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LoginProvider = table.Column<string>(maxLength: 64, nullable: false), LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
TenantId = table.Column<Guid>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ProviderKey = table.Column<string>(maxLength: 196, nullable: false), ProviderKey = table.Column<string>(type: "nvarchar(196)", maxLength: 196, nullable: false),
ProviderDisplayName = table.Column<string>(maxLength: 128, nullable: true) ProviderDisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -328,11 +328,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUserOrganizationUnits", name: "AbpUserOrganizationUnits",
columns: table => new columns: table => new
{ {
UserId = table.Column<Guid>(nullable: false), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
OrganizationUnitId = table.Column<Guid>(nullable: false), OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreationTime = table.Column<DateTime>(nullable: false), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CreatorId = table.Column<Guid>(nullable: true), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
TenantId = table.Column<Guid>(nullable: true) CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -355,9 +355,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUserRoles", name: "AbpUserRoles",
columns: table => new columns: table => new
{ {
UserId = table.Column<Guid>(nullable: false), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RoleId = table.Column<Guid>(nullable: false), RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TenantId = table.Column<Guid>(nullable: true) TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -380,11 +380,11 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "AbpUserTokens", name: "AbpUserTokens",
columns: table => new columns: table => new
{ {
UserId = table.Column<Guid>(nullable: false), UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LoginProvider = table.Column<string>(maxLength: 64, nullable: false), LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Name = table.Column<string>(maxLength: 128, nullable: false), Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
TenantId = table.Column<Guid>(nullable: true), TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
Value = table.Column<string>(nullable: true) Value = table.Column<string>(type: "nvarchar(max)", nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -401,10 +401,10 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
name: "DocsDocumentContributors", name: "DocsDocumentContributors",
columns: table => new columns: table => new
{ {
DocumentId = table.Column<Guid>(nullable: false), DocumentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Username = table.Column<string>(nullable: false), Username = table.Column<string>(type: "nvarchar(450)", nullable: false),
UserProfileUrl = table.Column<string>(nullable: true), UserProfileUrl = table.Column<string>(type: "nvarchar(max)", nullable: true),
AvatarUrl = table.Column<string>(nullable: true) AvatarUrl = table.Column<string>(type: "nvarchar(max)", nullable: true)
}, },
constraints: table => constraints: table =>
{ {

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

@ -16,10 +16,10 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.UseIdentityColumns()
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("ProductVersion", "3.1.8")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("ProductVersion", "5.0.0-rc.2.20475.6");
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{ {
@ -29,33 +29,33 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("Description") b.Property<string>("Description")
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsStatic") b.Property<bool>("IsStatic")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("Regex") b.Property<string>("Regex")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("RegexDescription") b.Property<string>("RegexDescription")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<bool>("Required") b.Property<bool>("Required")
.HasColumnType("bit"); .HasColumnType("bit");
@ -103,39 +103,39 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDefault") b.Property<bool>("IsDefault")
.HasColumnName("IsDefault") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsDefault");
b.Property<bool>("IsPublic") b.Property<bool>("IsPublic")
.HasColumnName("IsPublic") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsPublic");
b.Property<bool>("IsStatic") b.Property<bool>("IsStatic")
.HasColumnName("IsStatic") .HasColumnType("bit")
.HasColumnType("bit"); .HasColumnName("IsStatic");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedName") b.Property<string>("NormalizedName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -151,19 +151,19 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ClaimType") b.Property<string>("ClaimType")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ClaimValue") b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(1024)") .HasMaxLength(1024)
.HasMaxLength(1024); .HasColumnType("nvarchar(1024)");
b.Property<Guid>("RoleId") b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -179,60 +179,60 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("Action") b.Property<string>("Action")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<string>("ApplicationName") b.Property<string>("ApplicationName")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<string>("BrowserInfo") b.Property<string>("BrowserInfo")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("ClientId") b.Property<string>("ClientId")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ClientIpAddress") b.Property<string>("ClientIpAddress")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("CorrelationId") b.Property<string>("CorrelationId")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("Identity") b.Property<string>("Identity")
.HasColumnType("nvarchar(96)") .HasMaxLength(96)
.HasMaxLength(96); .HasColumnType("nvarchar(96)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<string>("TenantName") b.Property<string>("TenantName")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<Guid?>("UserId") b.Property<Guid?>("UserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("UserName") b.Property<string>("UserName")
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.HasKey("Id"); b.HasKey("Id");
@ -255,136 +255,136 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<int>("AccessFailedCount") b.Property<int>("AccessFailedCount")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("AccessFailedCount")
.HasColumnType("int") .HasColumnType("int")
.HasDefaultValue(0); .HasDefaultValue(0)
.HasColumnName("AccessFailedCount");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId") b.Property<Guid?>("DeleterId")
.HasColumnName("DeleterId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime") b.Property<DateTime?>("DeletionTime")
.HasColumnName("DeletionTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("DeletionTime");
b.Property<string>("Email") b.Property<string>("Email")
.IsRequired() .IsRequired()
.HasColumnName("Email") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("Email");
b.Property<bool>("EmailConfirmed") b.Property<bool>("EmailConfirmed")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("EmailConfirmed")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("EmailConfirmed");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsDeleted")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<bool>("IsExternal") b.Property<bool>("IsExternal")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsExternal")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsExternal");
b.Property<DateTime?>("LastModificationTime") b.Property<DateTime?>("LastModificationTime")
.HasColumnName("LastModificationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId") b.Property<Guid?>("LastModifierId")
.HasColumnName("LastModifierId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("LastModifierId");
b.Property<bool>("LockoutEnabled") b.Property<bool>("LockoutEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("LockoutEnabled")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd") b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetimeoffset"); .HasColumnType("datetimeoffset");
b.Property<string>("Name") b.Property<string>("Name")
.HasColumnName("Name") .HasMaxLength(64)
.HasColumnType("nvarchar(64)") .HasColumnType("nvarchar(64)")
.HasMaxLength(64); .HasColumnName("Name");
b.Property<string>("NormalizedEmail") b.Property<string>("NormalizedEmail")
.IsRequired() .IsRequired()
.HasColumnName("NormalizedEmail") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("NormalizedEmail");
b.Property<string>("NormalizedUserName") b.Property<string>("NormalizedUserName")
.IsRequired() .IsRequired()
.HasColumnName("NormalizedUserName") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("NormalizedUserName");
b.Property<string>("PasswordHash") b.Property<string>("PasswordHash")
.HasColumnName("PasswordHash") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("PasswordHash");
b.Property<string>("PhoneNumber") b.Property<string>("PhoneNumber")
.HasColumnName("PhoneNumber") .HasMaxLength(16)
.HasColumnType("nvarchar(16)") .HasColumnType("nvarchar(16)")
.HasMaxLength(16); .HasColumnName("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed") b.Property<bool>("PhoneNumberConfirmed")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("PhoneNumberConfirmed")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("PhoneNumberConfirmed");
b.Property<string>("SecurityStamp") b.Property<string>("SecurityStamp")
.IsRequired() .IsRequired()
.HasColumnName("SecurityStamp") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("SecurityStamp");
b.Property<string>("Surname") b.Property<string>("Surname")
.HasColumnName("Surname") .HasMaxLength(64)
.HasColumnType("nvarchar(64)") .HasColumnType("nvarchar(64)")
.HasMaxLength(64); .HasColumnName("Surname");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<bool>("TwoFactorEnabled") b.Property<bool>("TwoFactorEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("TwoFactorEnabled")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("TwoFactorEnabled");
b.Property<string>("UserName") b.Property<string>("UserName")
.IsRequired() .IsRequired()
.HasColumnName("UserName") .HasMaxLength(256)
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
.HasMaxLength(256); .HasColumnName("UserName");
b.HasKey("Id"); b.HasKey("Id");
@ -406,16 +406,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ClaimType") b.Property<string>("ClaimType")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(256)") .HasMaxLength(256)
.HasMaxLength(256); .HasColumnType("nvarchar(256)");
b.Property<string>("ClaimValue") b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(1024)") .HasMaxLength(1024)
.HasMaxLength(1024); .HasColumnType("nvarchar(1024)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -433,21 +433,21 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("LoginProvider") b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderDisplayName") b.Property<string>("ProviderDisplayName")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(196)") .HasMaxLength(196)
.HasMaxLength(196); .HasColumnType("nvarchar(196)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("UserId", "LoginProvider"); b.HasKey("UserId", "LoginProvider");
@ -465,16 +465,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "UserId"); b.HasKey("OrganizationUnitId", "UserId");
@ -492,8 +492,8 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("UserId", "RoleId"); b.HasKey("UserId", "RoleId");
@ -508,16 +508,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("LoginProvider") b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("Name") b.Property<string>("Name")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.Property<string>("Value") b.Property<string>("Value")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -535,62 +535,62 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Code") b.Property<string>("Code")
.IsRequired() .IsRequired()
.HasColumnName("Code") .HasMaxLength(95)
.HasColumnType("nvarchar(95)") .HasColumnType("nvarchar(95)")
.HasMaxLength(95); .HasColumnName("Code");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId") b.Property<Guid?>("DeleterId")
.HasColumnName("DeleterId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime") b.Property<DateTime?>("DeletionTime")
.HasColumnName("DeletionTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("DeletionTime");
b.Property<string>("DisplayName") b.Property<string>("DisplayName")
.IsRequired() .IsRequired()
.HasColumnName("DisplayName") .HasMaxLength(128)
.HasColumnType("nvarchar(128)") .HasColumnType("nvarchar(128)")
.HasMaxLength(128); .HasColumnName("DisplayName");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnName("IsDeleted")
.HasColumnType("bit") .HasColumnType("bit")
.HasDefaultValue(false); .HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime") b.Property<DateTime?>("LastModificationTime")
.HasColumnName("LastModificationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId") b.Property<Guid?>("LastModifierId")
.HasColumnName("LastModifierId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("LastModifierId");
b.Property<Guid?>("ParentId") b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -610,16 +610,16 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnType("datetime2")
.HasColumnType("datetime2"); .HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId") b.Property<Guid?>("CreatorId")
.HasColumnName("CreatorId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("CreatorId");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "RoleId"); b.HasKey("OrganizationUnitId", "RoleId");
@ -636,22 +636,22 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderName") b.Property<string>("ProviderName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnName("TenantId") .HasColumnType("uniqueidentifier")
.HasColumnType("uniqueidentifier"); .HasColumnName("TenantId");
b.HasKey("Id"); b.HasKey("Id");
@ -668,21 +668,21 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey") b.Property<string>("ProviderKey")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("ProviderName") b.Property<string>("ProviderName")
.HasColumnType("nvarchar(64)") .HasMaxLength(64)
.HasMaxLength(64); .HasColumnType("nvarchar(64)");
b.Property<string>("Value") b.Property<string>("Value")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.HasKey("Id"); b.HasKey("Id");
@ -699,9 +699,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("Content") b.Property<string>("Content")
.IsRequired() .IsRequired()
@ -711,26 +711,26 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("EditLink") b.Property<string>("EditLink")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("FileName") b.Property<string>("FileName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("Format") b.Property<string>("Format")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("LanguageCode") b.Property<string>("LanguageCode")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<DateTime>("LastCachedTime") b.Property<DateTime>("LastCachedTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -742,29 +742,29 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("LocalDirectory") b.Property<string>("LocalDirectory")
.HasColumnType("nvarchar(512)") .HasMaxLength(512)
.HasMaxLength(512); .HasColumnType("nvarchar(512)");
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(255)") .HasMaxLength(255)
.HasMaxLength(255); .HasColumnType("nvarchar(255)");
b.Property<Guid>("ProjectId") b.Property<Guid>("ProjectId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("RawRootUrl") b.Property<string>("RawRootUrl")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("RootUrl") b.Property<string>("RootUrl")
.HasColumnType("nvarchar(2048)") .HasMaxLength(2048)
.HasMaxLength(2048); .HasColumnType("nvarchar(2048)");
b.Property<string>("Version") b.Property<string>("Version")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.HasKey("Id"); b.HasKey("Id");
@ -798,28 +798,28 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasMaxLength(40)
.HasColumnType("nvarchar(40)") .HasColumnType("nvarchar(40)")
.HasMaxLength(40); .HasColumnName("ConcurrencyStamp");
b.Property<string>("DefaultDocumentName") b.Property<string>("DefaultDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("DocumentStoreType") b.Property<string>("DocumentStoreType")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnType("nvarchar(max)")
.HasColumnType("nvarchar(max)"); .HasColumnName("ExtraProperties");
b.Property<string>("Format") b.Property<string>("Format")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("LatestVersionBranchName") b.Property<string>("LatestVersionBranchName")
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("MainWebsiteUrl") b.Property<string>("MainWebsiteUrl")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -829,23 +829,23 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("NavigationDocumentName") b.Property<string>("NavigationDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ParametersDocumentName") b.Property<string>("ParametersDocumentName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(128)") .HasMaxLength(128)
.HasMaxLength(128); .HasColumnType("nvarchar(128)");
b.Property<string>("ShortName") b.Property<string>("ShortName")
.IsRequired() .IsRequired()
.HasColumnType("nvarchar(32)") .HasMaxLength(32)
.HasMaxLength(32); .HasColumnType("nvarchar(32)");
b.HasKey("Id"); b.HasKey("Id");
@ -948,6 +948,34 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .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 #pragma warning restore 612, 618
} }
} }

1
modules/docs/app/VoloDocs.Web/Program.cs

@ -16,6 +16,7 @@ namespace VoloDocs.Web
.MinimumLevel.Override("Microsoft", LogEventLevel.Information) .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.File("Logs/logs.txt") .WriteTo.File("Logs/logs.txt")
.WriteTo.Console()
.CreateLogger(); .CreateLogger();
try try

6
modules/docs/app/VoloDocs.Web/Properties/launchSettings.json

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:55008/", "applicationUrl": "https://localhost:44333/",
"sslPort": 0 "sslPort": 0
} }
}, },
@ -21,7 +21,7 @@
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:55019/" "applicationUrl": "https://localhost:44333/"
} }
} }
} }

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

@ -87,7 +87,7 @@ namespace Volo.Docs.Admin.Documents
input.Version input.Version
); );
if (!JsonConvertExtensions.TryDeserializeObject<NavigationNode>(navigationDocument.Content, out var navigation)) if (!DocsJsonSerializerHelper.TryDeserialize<NavigationNode>(navigationDocument.Content, out var navigation))
{ {
throw new UserFriendlyException($"Cannot validate navigation file '{project.NavigationDocumentName}' for the project {project.Name}."); throw new UserFriendlyException($"Cannot validate navigation file '{project.NavigationDocumentName}' for the project {project.Name}.");
} }

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

@ -101,7 +101,7 @@ namespace Volo.Docs.Documents
input.Version input.Version
); );
if (!JsonConvertExtensions.TryDeserializeObject<NavigationNode>(navigationDocument.Content, if (!DocsJsonSerializerHelper.TryDeserialize<NavigationNode>(navigationDocument.Content,
out var navigationNode)) out var navigationNode))
{ {
throw new UserFriendlyException( throw new UserFriendlyException(
@ -213,7 +213,7 @@ namespace Volo.Docs.Documents
input.Version input.Version
); );
if (!JsonConvertExtensions.TryDeserializeObject<DocumentParametersDto>(document.Content,out var documentParameters)) if (!DocsJsonSerializerHelper.TryDeserialize<DocumentParametersDto>(document.Content,out var documentParameters))
{ {
throw new UserFriendlyException( throw new UserFriendlyException(
$"Cannot validate document parameters file '{project.ParametersDocumentName}' for the project {project.Name}."); $"Cannot validate document parameters file '{project.ParametersDocumentName}' for the project {project.Name}.");

10
modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs

@ -1,19 +1,19 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using System.Text.Json.Serialization;
namespace Volo.Docs.Documents namespace Volo.Docs.Documents
{ {
public class NavigationNode public class NavigationNode
{ {
[JsonProperty("text")] [JsonPropertyName("text")]
public string Text { get; set; } public string Text { get; set; }
[JsonProperty("path")] [JsonPropertyName("path")]
public string Path { get; set; } public string Path { get; set; }
[JsonProperty("items")] [JsonPropertyName("items")]
public List<NavigationNode> Items { get; set; } public List<NavigationNode> Items { get; set; }
public bool IsLeaf => !HasChildItems; public bool IsLeaf => !HasChildItems;
@ -76,4 +76,4 @@ namespace Volo.Docs.Documents
} }
} }
} }
} }

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

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Security; using System.Security;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Domain.Services; using Volo.Abp.Domain.Services;
using Volo.Abp.IO; using Volo.Abp.IO;
@ -60,7 +59,7 @@ namespace Volo.Docs.FileSystem.Documents
var path = Path.Combine(project.GetFileSystemPath(), DocsDomainConsts.LanguageConfigFileName); var path = Path.Combine(project.GetFileSystemPath(), DocsDomainConsts.LanguageConfigFileName);
var configJsonContent = await FileHelper.ReadAllTextAsync(path); var configJsonContent = await FileHelper.ReadAllTextAsync(path);
if (!JsonConvertExtensions.TryDeserializeObject<LanguageConfig>(configJsonContent, out var languageConfig)) if (!DocsJsonSerializerHelper.TryDeserialize<LanguageConfig>(configJsonContent, out var languageConfig))
{ {
throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name}."); throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name}.");
} }

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

@ -307,7 +307,7 @@ namespace Volo.Docs.GitHub.Documents
var configAsJson = await DownloadWebContentAsStringAsync(url, token, userAgent); var configAsJson = await DownloadWebContentAsStringAsync(url, token, userAgent);
if (!JsonConvertExtensions.TryDeserializeObject<LanguageConfig>(configAsJson, out var languageConfig)) if (!DocsJsonSerializerHelper.TryDeserialize<LanguageConfig>(configAsJson, out var languageConfig))
{ {
throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name} - v{version}."); throw new UserFriendlyException($"Cannot validate language config file '{DocsDomainConsts.LanguageConfigFileName}' for the project {project.Name} - v{version}.");
} }

27
modules/docs/src/Volo.Docs.Domain/Volo/Extensions/DocsJsonSerializerHelper.cs

@ -0,0 +1,27 @@
using System.Text.Json;
namespace Volo.Extensions
{
public static class DocsJsonSerializerHelper
{
public static bool TryDeserialize<T>(string jsonContent, out T result)
{
try
{
var options = new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true,
ReadCommentHandling = JsonCommentHandling.Skip,
AllowTrailingCommas = true
};
result = JsonSerializer.Deserialize<T>(jsonContent, options);
return true;
}
catch
{
result = default;
return false;
}
}
}
}

22
modules/docs/src/Volo.Docs.Domain/Volo/Extensions/NewtonsoftJsonExtensions.cs

@ -1,22 +0,0 @@
using System;
using Newtonsoft.Json;
namespace Volo.Extensions
{
public static class JsonConvertExtensions
{
public static bool TryDeserializeObject<T>(string jsonContent, out T result)
{
try
{
result = JsonConvert.DeserializeObject<T>(jsonContent);
return true;
}
catch
{
result = default;
return false;
}
}
}
}

7
modules/docs/src/Volo.Docs.Web/HtmlConverting/ScribanDocumentSectionRenderer.cs

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json;
using Scriban; using Scriban;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
@ -63,7 +62,7 @@ namespace Volo.Docs.HtmlConverting
var pureJson = insideJsonSection.Replace(DocsParam, "").Trim(); var pureJson = insideJsonSection.Replace(DocsParam, "").Trim();
if (!JsonConvertExtensions.TryDeserializeObject<Dictionary<string, List<string>>>(pureJson, out var availableParameters)) if (!DocsJsonSerializerHelper.TryDeserialize<Dictionary<string, List<string>>>(pureJson, out var availableParameters))
{ {
throw new UserFriendlyException("ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!"); throw new UserFriendlyException("ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!");
} }
@ -159,7 +158,7 @@ namespace Volo.Docs.HtmlConverting
var json = betweenJsonOpenerAndCloser.Substring(betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length); var json = betweenJsonOpenerAndCloser.Substring(betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length);
if (!JsonConvertExtensions.TryDeserializeObject<DocumentPartialTemplateWithValuesDto>(json, out var template)) if (!DocsJsonSerializerHelper.TryDeserialize<DocumentPartialTemplateWithValuesDto>(json, out var template))
{ {
throw new UserFriendlyException($"ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!"); throw new UserFriendlyException($"ERROR-20200327: Cannot validate JSON content for `AvailableParameters`!");
} }
@ -202,7 +201,7 @@ namespace Volo.Docs.HtmlConverting
betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length betweenJsonOpenerAndCloser.IndexOf(DocsTemplates, StringComparison.Ordinal) + DocsTemplates.Length
); );
if (JsonConvertExtensions.TryDeserializeObject<DocumentPartialTemplateWithValuesDto>(json, out var documentPartialTemplateWithValuesDto)) if (DocsJsonSerializerHelper.TryDeserialize<DocumentPartialTemplateWithValuesDto>(json, out var documentPartialTemplateWithValuesDto))
{ {
var template = templates.FirstOrDefault(t => t.Path == documentPartialTemplateWithValuesDto.Path); var template = templates.FirstOrDefault(t => t.Path == documentPartialTemplateWithValuesDto.Path);

Loading…
Cancel
Save