test/BootstrapBlazor3
1
0
Fork 0
mirror of https://gitee.com/LongbowEnterprise/BootstrapBlazor.git synced 2024-12-03 12:39:40 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

!863 docs(#I2CL4V): Upload demo can run on WebAssembly mode

Browse Source 
* docs: 兼容 wasm 模式
* refactor: 精简后台任务代码
* refactor: 后台任务对 WebRootPath 赋值
* refactor: 移除 IHttpClientFactory 注入
* refactor: Uploads 示例获取保存路径使用 WebSiteOptions
* chore: 移除对 AspNetCore.App 依赖
This commit is contained in:
Argo 2021-01-09 12:22:42 +08:00
parent 7eb8fd4e87
commit d6372f382e
6 changed files with 97 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/BootstrapBlazor.Docs/wwwroot/docs/upload/upload.2.html
View File

@ -11,6 +11,14 @@
</div>
@code {
[Inject]
[NotNull]
private ToastService? ToastService { get; set; }
[Inject]
[NotNull]
private WebsiteOptions? SiteOptions { get; set; }
private async Task OnClickToUpload(IEnumerable<UploadFile> files)
{
// 示例代码，模拟 80% 几率保存成功
@ -29,24 +37,33 @@
private CancellationTokenSource? ReadToken { get; set; }
private async Task<bool> SaveToFile(UploadFile file)
{
// Server Side 使用
// Web Assembly 模式下必须使用 webapi 方式去保存文件到服务器或者数据库中
// 生成写入文件名称
var uploaderFolder = Path.Combine(WebHost.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}";
var fileName = Path.Combine(uploaderFolder, file.FileName);
ReadCardToken ??= new CancellationTokenSource();
var ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadCardToken.Token);
if (ret)
var ret = false;
if (!string.IsNullOrEmpty(SiteOptions.WebRootPath))
{
// 保存成功
file.PrevUrl = $"images/uploader/{file.FileName}";
var uploaderFolder = Path.Combine(SiteOptions.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}";
var fileName = Path.Combine(uploaderFolder, file.FileName);
ReadToken ??= new CancellationTokenSource();
ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadToken.Token);
if (ret)
{
// 保存成功
file.PrevUrl = $"images/uploader/{file.FileName}";
}
else
{
await ToastService.Error("上传文件", $"保存文件失败 {file.OriginFileName}");
}
}
else
{
await ToastService.Error("上传文件", $"保存文件失败 {file.OriginFileName}");
await ToastService.Information("保存文件", "当前模式为 WebAssembly 模式，请调用 Webapi 模式保存文件到服务器端或数据库中");
}
return ret;
}
}

34
src/BootstrapBlazor.Docs/wwwroot/docs/upload/upload.6.html
View File

@ -12,20 +12,39 @@
</div>
@code {
private CancellationTokenSource? ReadCardToken { get; set; }
[Inject]
[NotNull]
private ToastService? ToastService { get; set; }
[Inject]
[NotNull]
private WebsiteOptions? SiteOptions { get; set; }
private CancellationTokenSource? ReadToken { get; set; }
private async Task OnCardUpload(IEnumerable<UploadFile> files)
{
// 示例代码，使用 IWebHostEnviroment 注入获取硬盘文件夹 示例
var file = files.FirstOrDefault();
if (file != null && file.File != null)
{
// 生成写入文件名称
var uploaderFolder = Path.Combine(WebHost.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
await SaveToFile(file);
}
}
private async Task<bool> SaveToFile(UploadFile file)
{
// Server Side 使用
// Web Assembly 模式下必须使用 webapi 方式去保存文件到服务器或者数据库中
// 生成写入文件名称
var ret = false;
if (!string.IsNullOrEmpty(SiteOptions.WebRootPath))
{
var uploaderFolder = Path.Combine(SiteOptions.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}";
var fileName = Path.Combine(uploaderFolder, file.FileName);
ReadCardToken ??= new CancellationTokenSource();
var ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadCardToken.Token);
ReadToken ??= new CancellationTokenSource();
ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadToken.Token);
if (ret)
{
@ -37,5 +56,10 @@
await ToastService.Error("上传文件", $"保存文件失败 {file.OriginFileName}");
}
}
else
{
await ToastService.Information("保存文件", "当前模式为 WebAssembly 模式，请调用 Webapi 模式保存文件到服务器端或数据库中");
}
return ret;
}
}

15
src/BootstrapBlazor.Server/Extensions/TasksExtensions.cs
View File

@ -29,11 +29,6 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddSingleton<WeatherForecastService>();
services.AddTaskServices();
services.AddHttpClient();
services.AddTransient(sp =>
{
var factory = sp.GetRequiredService<IHttpClientFactory>();
return factory.CreateClient();
});
services.AddVersionManager();
services.AddExampleService();
services.AddSingleton<WebsiteOptions>();
@ -53,9 +48,11 @@ namespace Microsoft.Extensions.DependencyInjection
///
/// </summary>
/// <param name="env"></param>
public BlazorBackgroundServices(IWebHostEnvironment env)
/// <param name="websiteOption"></param>
public BlazorBackgroundServices(IWebHostEnvironment env, WebsiteOptions websiteOption)
{
_env = env;
websiteOption.WebRootPath = env.WebRootPath;
}
/// <summary>
@ -63,7 +60,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// </summary>
/// <param name="stoppingToken"></param>
/// <returns></returns>
protected override Task ExecuteAsync(CancellationToken stoppingToken) => Task.Run(() =>
protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
TaskServicesManager.GetOrAdd("Clear Upload Files", token =>
{
@ -87,6 +84,8 @@ namespace Microsoft.Extensions.DependencyInjection
}
return Task.CompletedTask;
}, TriggerBuilder.Build(Cron.Minutely(10)));
});
return Task.CompletedTask;
}
}
}

4
src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj
View File

@ -22,10 +22,6 @@
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BootstrapBlazor.Docs\BootstrapBlazor.Docs.csproj" />
<ProjectReference Include="..\BootstrapBlazor\BootstrapBlazor.csproj" />

8
src/BootstrapBlazor.Shared/Extensions/WebsiteOptions.cs
View File

@ -2,6 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Website: https://www.blazor.zone or https://argozhang.github.io/
using System.Diagnostics.CodeAnalysis;
namespace BootstrapBlazor.Shared
{
/// <summary>
@ -28,5 +30,11 @@ namespace BootstrapBlazor.Shared
///
/// </summary>
public string ImageLibUrl { get; set; } = "https://imgs.blazor.zone";
/// <summary>
/// 获得/设置 系统 wwwroot 文件夹路径 Server Side 模式下 Upload 使用
/// </summary>
[NotNull]
public string? WebRootPath { get; set; }
}
}

39
src/BootstrapBlazor.Shared/Pages/Uploads.razor.cs
View File

@ -6,7 +6,7 @@ using BootstrapBlazor.Components;
using BootstrapBlazor.Shared.Common;
using BootstrapBlazor.Shared.Pages.Components;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
@ -26,11 +26,11 @@ namespace BootstrapBlazor.Shared.Pages
[Inject]
[NotNull]
private IWebHostEnvironment? WebHost { get; set; }
private ToastService? ToastService { get; set; }
[Inject]
[NotNull]
private ToastService? ToastService { get; set; }
private WebsiteOptions? SiteOptions { get; set; }
private Logger? Trace { get; set; }
@ -111,24 +111,33 @@ namespace BootstrapBlazor.Shared.Pages
private async Task<bool> SaveToFile(UploadFile file)
{
// Server Side 使用
// Web Assembly 模式下必须使用 webapi 方式去保存文件到服务器或者数据库中
// 生成写入文件名称
var uploaderFolder = Path.Combine(WebHost.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}";
var fileName = Path.Combine(uploaderFolder, file.FileName);
ReadToken ??= new CancellationTokenSource();
var ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadToken.Token);
if (ret)
var ret = false;
if (!string.IsNullOrEmpty(SiteOptions.WebRootPath))
{
// 保存成功
file.PrevUrl = $"images/uploader/{file.FileName}";
var uploaderFolder = Path.Combine(SiteOptions.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader");
file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}";
var fileName = Path.Combine(uploaderFolder, file.FileName);
ReadToken ??= new CancellationTokenSource();
ret = await file.SaveToFile(fileName, 20 * 1024 * 1024, ReadToken.Token);
if (ret)
{
// 保存成功
file.PrevUrl = $"images/uploader/{file.FileName}";
}
else
{
await ToastService.Error("上传文件", $"保存文件失败 {file.OriginFileName}");
}
}
else
{
await ToastService.Error("上传文件", $"保存文件失败 {file.OriginFileName}");
await ToastService.Information("保存文件", "当前模式为 WebAssembly 模式，请调用 Webapi 模式保存文件到服务器端或数据库中");
}
return ret;
}