Browse Source

Use `EmptyHostingEnvironment` to create `WebContentFileProvider`.

pull/20803/head
maliming 2 years ago
parent
commit
61165fade6
  1. 2
      framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
  2. 6
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs

2
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@ -161,7 +161,7 @@ public static class AbpApplicationBuilderExtensions
ContentTypeProvider = app.ApplicationServices.GetRequiredService<AbpFileExtensionContentTypeProvider>(), ContentTypeProvider = app.ApplicationServices.GetRequiredService<AbpFileExtensionContentTypeProvider>(),
FileProvider = new WebContentFileProvider( FileProvider = new WebContentFileProvider(
app.ApplicationServices.GetRequiredService<IVirtualFileProvider>(), app.ApplicationServices.GetRequiredService<IVirtualFileProvider>(),
null, new EmptyHostingEnvironment(),
app.ApplicationServices.GetRequiredService<IOptions<AbpAspNetCoreContentOptions>>() app.ApplicationServices.GetRequiredService<IOptions<AbpAspNetCoreContentOptions>>()
) )
}); });

6
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs

@ -15,14 +15,14 @@ public class WebContentFileProvider : IWebContentFileProvider, ISingletonDepende
{ {
private readonly IVirtualFileProvider _virtualFileProvider; private readonly IVirtualFileProvider _virtualFileProvider;
private readonly IFileProvider _fileProvider; private readonly IFileProvider _fileProvider;
private readonly IWebHostEnvironment? _hostingEnvironment; private readonly IWebHostEnvironment _hostingEnvironment;
private string _rootPath = "/wwwroot"; private string _rootPath = "/wwwroot";
protected AbpAspNetCoreContentOptions Options { get; } protected AbpAspNetCoreContentOptions Options { get; }
public WebContentFileProvider( public WebContentFileProvider(
IVirtualFileProvider virtualFileProvider, IVirtualFileProvider virtualFileProvider,
IWebHostEnvironment? hostingEnvironment, IWebHostEnvironment hostingEnvironment,
IOptions<AbpAspNetCoreContentOptions> options) IOptions<AbpAspNetCoreContentOptions> options)
{ {
_virtualFileProvider = virtualFileProvider; _virtualFileProvider = virtualFileProvider;
@ -94,7 +94,7 @@ public class WebContentFileProvider : IWebContentFileProvider, ISingletonDepende
protected virtual IFileProvider CreateFileProvider() protected virtual IFileProvider CreateFileProvider()
{ {
var fileProviders = new List<IFileProvider>(); var fileProviders = new List<IFileProvider>();
if (_hostingEnvironment != null) if (!_hostingEnvironment.ContentRootPath.IsNullOrEmpty())
{ {
fileProviders.Add(new PhysicalFileProvider(_hostingEnvironment.ContentRootPath)); fileProviders.Add(new PhysicalFileProvider(_hostingEnvironment.ContentRootPath));
} }

Loading…
Cancel
Save