Merge pull request #5573 from abpframework/liangshiwei/blog-module

Use blob storing system to store files

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppDbContext.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.PermissionManagement.EntityFrameworkCore;
@@ -23,6 +24,7 @@ namespace Volo.BloggingTestApp.EntityFrameworkCore
             modelBuilder.ConfigureSettingManagement();
             modelBuilder.ConfigureIdentity();
             modelBuilder.ConfigureBlogging();
+            modelBuilder.ConfigureBlobStoring();
         }
     }
 }

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppEntityFrameworkCoreModule.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.Modularity;
@@ -13,9 +14,9 @@ namespace Volo.BloggingTestApp.EntityFrameworkCore
         typeof(AbpIdentityEntityFrameworkCoreModule),
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
-        typeof(AbpEntityFrameworkCoreSqlServerModule))]
+        typeof(AbpEntityFrameworkCoreSqlServerModule),
+        typeof(BlobStoringDatabaseEntityFrameworkCoreModule))]
     public class BloggingTestAppEntityFrameworkCoreModule : AbpModule
     {
-
     }
 }

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Migrations/20200922115311_Added_BlobStoing.cs

@@ -0,0 +1,73 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.BloggingTestApp.EntityFrameworkCore.Migrations
+{
+    public partial class Added_BlobStoing : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AbpBlobContainers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(nullable: false),
+                    ExtraProperties = table.Column<string>(nullable: true),
+                    ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true),
+                    TenantId = table.Column<Guid>(nullable: true),
+                    Name = table.Column<string>(maxLength: 128, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobContainers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpBlobs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(nullable: false),
+                    ExtraProperties = table.Column<string>(nullable: true),
+                    ConcurrencyStamp = table.Column<string>(maxLength: 40, nullable: true),
+                    ContainerId = table.Column<Guid>(nullable: false),
+                    TenantId = table.Column<Guid>(nullable: true),
+                    Name = table.Column<string>(maxLength: 256, nullable: false),
+                    Content = table.Column<byte[]>(maxLength: 2147483647, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpBlobs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpBlobs_AbpBlobContainers_ContainerId",
+                        column: x => x.ContainerId,
+                        principalTable: "AbpBlobContainers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobContainers_TenantId_Name",
+                table: "AbpBlobContainers",
+                columns: new[] { "TenantId", "Name" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_ContainerId",
+                table: "AbpBlobs",
+                column: "ContainerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpBlobs_TenantId_ContainerId_Name",
+                table: "AbpBlobs",
+                columns: new[] { "TenantId", "ContainerId", "Name" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AbpBlobs");
+
+            migrationBuilder.DropTable(
+                name: "AbpBlobContainers");
+        }
+    }
+}

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Migrations/BloggingTestAppDbContextModelSnapshot.cs

@@ -21,6 +21,79 @@ namespace Volo.BloggingTestApp.EntityFrameworkCore.Migrations
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<Guid>("ContainerId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<byte[]>("Content")
+                        .HasColumnType("varbinary(max)")
+                        .HasMaxLength(2147483647);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("TenantId", "ContainerId", "Name");
+
+                    b.ToTable("AbpBlobs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name");
+
+                    b.ToTable("AbpBlobContainers");
+                });
+
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
@@ -1046,6 +1119,15 @@ namespace Volo.BloggingTestApp.EntityFrameworkCore.Migrations
                     b.ToTable("BlgUsers");
                 });
 
+            modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
+                {
+                    b.HasOne("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", null)
+                        .WithMany()
+                        .HasForeignKey("ContainerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
                 {
                     b.HasOne("Volo.Abp.Identity.IdentityRole", null)

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.csproj

@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.EntityFrameworkCore\Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\blob-storing-database\src\Volo.Abp.BlobStoring.Database.EntityFrameworkCore\Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>

modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.csproj

@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.MongoDB\Volo.Abp.PermissionManagement.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.MongoDB\Volo.Abp.SettingManagement.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.MongoDB\Volo.Abp.Identity.MongoDB.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\blob-storing-database\src\Volo.Abp.BlobStoring.Database.MongoDB\Volo.Abp.BlobStoring.Database.MongoDB.csproj" />
   </ItemGroup>
 
 </Project>

modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo/BloggingTestApp/MongoDB/BloggingTestAppMongoDbModule.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Volo.Abp.BlobStoring.Database.MongoDB;
 using Volo.Abp.Identity.MongoDB;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.MongoDB;
@@ -13,7 +11,8 @@ namespace Volo.BloggingTestApp.MongoDB
         typeof(AbpIdentityMongoDbModule),
         typeof(BloggingMongoDbModule),
         typeof(AbpSettingManagementMongoDbModule),
-        typeof(AbpPermissionManagementMongoDbModule)
+        typeof(AbpPermissionManagementMongoDbModule),
+        typeof(BlobStoringDatabaseMongoDbModule)
     )]
     public class BloggingTestAppMongoDbModule : AbpModule
     {

modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs

@@ -23,6 +23,8 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theming;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Autofac;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.BlobStoring.Database;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Identity;
@@ -37,7 +39,6 @@ using Volo.Blogging;
 using Volo.Blogging.Admin;
 using Volo.Blogging.Files;
 using Volo.BloggingTestApp.EntityFrameworkCore;
-using Volo.BloggingTestApp.MongoDB;
 
 namespace Volo.BloggingTestApp
 {
@@ -57,6 +58,7 @@ namespace Volo.BloggingTestApp
         typeof(AbpIdentityApplicationModule),
         typeof(AbpPermissionManagementDomainIdentityModule),
         typeof(AbpPermissionManagementApplicationModule),
+        typeof(BlobStoringDatabaseDomainModule),
         typeof(AbpAutofacModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule)
     )]
@@ -130,9 +132,12 @@ namespace Volo.BloggingTestApp
                 options.DefaultThemeName = BasicTheme.Name;
             });
 
-            Configure<BlogFileOptions>(options =>
+            Configure<AbpBlobStoringOptions>(options =>
             {
-                options.FileUploadLocalFolder = Path.Combine(hostingEnvironment.WebRootPath, "files");
+                options.Containers.ConfigureDefault(container =>
+                {
+                    container.UseDatabase();
+                });
             });
         }
 

modules/blogging/app/Volo.BloggingTestApp/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:50013/",
+      "applicationUrl": "https://localhost:40013/",
       "sslPort": 0
     }
   },
@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:50017/"
+      "applicationUrl": "https://localhost:40017/"
     }
   }
-}
+}

modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj

@@ -34,7 +34,7 @@
     <ProjectReference Include="..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj" />
     <ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Application\Volo.Abp.Account.Application.csproj" />
-    <ProjectReference Include="..\Volo.BloggingTestApp.MongoDB\Volo.BloggingTestApp.MongoDB.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\blob-storing-database\src\Volo.Abp.BlobStoring.Database.Domain\Volo.Abp.BlobStoring.Database.Domain.csproj" />
   </ItemGroup>
 
 </Project>

modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj

@@ -16,6 +16,7 @@
     <ProjectReference Include="..\Volo.Blogging.Domain\Volo.Blogging.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BlobStoring\Volo.Abp.BlobStoring.csproj" />
   </ItemGroup>
 
 </Project>

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.BlobStoring;
 using Volo.Abp.Caching;
 using Volo.Abp.Modularity;
 using Volo.Blogging.Comments;
@@ -12,7 +13,8 @@ namespace Volo.Blogging
         typeof(BloggingDomainModule),
         typeof(BloggingApplicationContractsModule),
         typeof(AbpCachingModule),
-        typeof(AbpAutoMapperModule))]
+        typeof(AbpAutoMapperModule),
+        typeof(AbpBlobStoringModule))]
     public class BloggingApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingFileContainer.cs

@@ -0,0 +1,10 @@
+using Volo.Abp.BlobStoring;
+
+namespace Volo.Blogging
+{
+    [BlobContainerName("blogging-files")]
+    public class BloggingFileContainer
+    {
+
+    }
+}

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/BlogFileOptions.cs

@@ -1,4 +1,6 @@
-namespace Volo.Blogging.Files
+using System;
+
+namespace Volo.Blogging.Files
 {
     /* TODO:
      * - It is not to have different options for all different modules. We should find a more generic way.
@@ -6,6 +8,7 @@
      */
     public class BlogFileOptions
     {
+        [Obsolete("Now store using blob storing system, will be deleted in a next version")]
         public string FileUploadLocalFolder { get; set; }
     }
 }

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/FileAppService.cs

@@ -2,9 +2,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp;
+using Volo.Abp.BlobStoring;
 using Volo.Abp.Validation;
 using Volo.Blogging.Areas.Blog.Helpers;
 
@@ -12,42 +12,25 @@ namespace Volo.Blogging.Files
 {
     public class FileAppService : BloggingAppServiceBase, IFileAppService
     {
-        public BlogFileOptions Options { get; }
-        private readonly ILogger<FileAppService> _logger;
+        protected IBlobContainer<BloggingFileContainer> BlobContainer { get; }
 
-        public FileAppService(IOptions<BlogFileOptions> options, ILogger<FileAppService> logger)
+        public FileAppService(
+            IBlobContainer<BloggingFileContainer> blobContainer)
         {
-            _logger = logger;
-            Options = options.Value;
+            BlobContainer = blobContainer;
         }
 
-        public virtual Task<RawFileDto> GetAsync(string name)
+        public virtual async Task<RawFileDto> GetAsync(string name)
         {
             Check.NotNullOrWhiteSpace(name, nameof(name));
 
-            if (!Directory.Exists(Options.FileUploadLocalFolder))
+            return new RawFileDto
             {
-                Directory.CreateDirectory(Options.FileUploadLocalFolder);
-                return Task.FromResult(
-                    new RawFileDto
-                    {
-                        Bytes = new byte[0]
-                    }
-                );
-            }
-
-            var filePath = Path.Combine(Options.FileUploadLocalFolder, name);
-
-            if (File.Exists(filePath))
-            {
-                return Task.FromResult(new RawFileDto {Bytes = File.ReadAllBytes(filePath)});
-            }
-
-            _logger.LogError($"Cannot find the file {filePath}");
-            return Task.FromResult(RawFileDto.EmptyResult());
+                Bytes = await BlobContainer.GetAllBytesAsync(name)
+            };
         }
 
-        public virtual Task<FileUploadOutputDto> CreateAsync(FileUploadInputDto input)
+        public virtual async Task<FileUploadOutputDto> CreateAsync(FileUploadInputDto input)
         {
             if (input.Bytes.IsNullOrEmpty())
             {
@@ -65,20 +48,14 @@ namespace Volo.Blogging.Files
             }
 
             var uniqueFileName = GenerateUniqueFileName(Path.GetExtension(input.Name));
-            var filePath = Path.Combine(Options.FileUploadLocalFolder, uniqueFileName);
 
-            if (!Directory.Exists(Options.FileUploadLocalFolder))
-            {
-                Directory.CreateDirectory(Options.FileUploadLocalFolder);
-            }
-            
-            File.WriteAllBytes(filePath, input.Bytes); //TODO: Previously was using WriteAllBytesAsync, but it's only in .netcore.
+            await BlobContainer.SaveAsync(uniqueFileName, input.Bytes);
 
-            return Task.FromResult(new FileUploadOutputDto
+            return new FileUploadOutputDto
             {
                 Name = uniqueFileName,
                 WebUrl = "/api/blogging/files/www/" + uniqueFileName
-            });
+            };
         }
 
         private static void ThrowValidationException(string message, string memberName)