xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/abp' into digital-collectibles

Browse Source
This commit is contained in:
橙子
2024-12-11 19:49:46 +08:00
parent bb3b3702e1 8408b39fbb
commit 723ce1bd5d
6 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs
View File

@@ -37,7 +37,7 @@ namespace Yi.Framework.Rbac.Application.Services
{
var path = await GetReturnPathAsync(code, isThumbnail);
if (!File.Exists(path))
if (path is null||!File.Exists(path))
{
return new NotFoundResult();
// throw new UserFriendlyException("文件不存在",code:"404");
@@ -53,12 +53,13 @@ namespace Yi.Framework.Rbac.Application.Services
return new FileContentResult(steam, fileContentType ?? @"text/plain");
}
public async Task<string> GetReturnPathAsync(Guid code, bool? isThumbnail)
public async Task<string?> GetReturnPathAsync(Guid code, bool? isThumbnail)
{
var file = await _repository.GetAsync(x => x.Id == code);
if (file is null)
{
throw new UserFriendlyException("文件编号未匹配", "404");
return null;
// throw new UserFriendlyException("文件编号未匹配", "404");
}
var path = file.FilePath;
//如果为缩略图，需要修改路径