feat: 新增文件缓存功能
- 在 Yi.Framework.Rbac.Application.Services.FileService 中注入 IMemoryCache,用于缓存文件元数据,减少对仓储的重复读取。
- 在 Get 方法中通过 key "File:{code}" 缓存 FileCacheItem,设置绝对过期时间为 1 天。
- 缓存项使用 Mapster 适配为 FileCacheItem,再适配回 FileAggregateRoot(保留现有逻辑判断和路径获取)。
- 新增缓存模型 Yi.Framework.Rbac.Domain.Shared.Caches.FileCacheItem(包含 Id、FileSize、FileName、FilePath、创建/修改信息等)。
- 增加并调整相关 using 引用(Microsoft.Extensions.Caching.Memory、Volo.Abp.Caching、Domain.Shared.Caches)。
- 同时修复了保存多文件时的缩进/空格格式(不影响功能)。
This commit is contained in:
@@ -6,8 +6,10 @@ using System.Threading.Tasks;
|
|||||||
using Mapster;
|
using Mapster;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
using Volo.Abp;
|
using Volo.Abp;
|
||||||
using Volo.Abp.Application.Services;
|
using Volo.Abp.Application.Services;
|
||||||
|
using Volo.Abp.Caching;
|
||||||
using Volo.Abp.Domain.Repositories;
|
using Volo.Abp.Domain.Repositories;
|
||||||
using Volo.Abp.Guids;
|
using Volo.Abp.Guids;
|
||||||
using Yi.Framework.Core.Enums;
|
using Yi.Framework.Core.Enums;
|
||||||
@@ -16,6 +18,7 @@ using Yi.Framework.Rbac.Application.Contracts.Dtos.FileManager;
|
|||||||
using Yi.Framework.Rbac.Application.Contracts.IServices;
|
using Yi.Framework.Rbac.Application.Contracts.IServices;
|
||||||
using Yi.Framework.Rbac.Domain.Entities;
|
using Yi.Framework.Rbac.Domain.Entities;
|
||||||
using Yi.Framework.Rbac.Domain.Managers;
|
using Yi.Framework.Rbac.Domain.Managers;
|
||||||
|
using Yi.Framework.Rbac.Domain.Shared.Caches;
|
||||||
|
|
||||||
namespace Yi.Framework.Rbac.Application.Services
|
namespace Yi.Framework.Rbac.Application.Services
|
||||||
{
|
{
|
||||||
@@ -23,11 +26,13 @@ namespace Yi.Framework.Rbac.Application.Services
|
|||||||
{
|
{
|
||||||
private readonly IRepository<FileAggregateRoot> _repository;
|
private readonly IRepository<FileAggregateRoot> _repository;
|
||||||
private readonly FileManager _fileManager;
|
private readonly FileManager _fileManager;
|
||||||
|
private readonly IMemoryCache _memoryCache;
|
||||||
|
|
||||||
public FileService(IRepository<FileAggregateRoot> repository, FileManager fileManager)
|
public FileService(IRepository<FileAggregateRoot> repository, FileManager fileManager, IMemoryCache memoryCache)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
_fileManager = fileManager;
|
_fileManager = fileManager;
|
||||||
|
_memoryCache = memoryCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -37,7 +42,14 @@ namespace Yi.Framework.Rbac.Application.Services
|
|||||||
[Route("file/{code}/{isThumbnail?}")]
|
[Route("file/{code}/{isThumbnail?}")]
|
||||||
public async Task<IActionResult> Get([FromRoute] Guid code, [FromRoute] bool? isThumbnail)
|
public async Task<IActionResult> Get([FromRoute] Guid code, [FromRoute] bool? isThumbnail)
|
||||||
{
|
{
|
||||||
var file = await _repository.GetAsync(x => x.Id == code);
|
var fileCache = await _memoryCache.GetOrCreateAsync($"File:{code}", async (options) =>
|
||||||
|
{
|
||||||
|
options.AbsoluteExpiration = DateTime.Now.AddDays(1);
|
||||||
|
var file = await _repository.GetAsync(x => x.Id == code);
|
||||||
|
if (file == null!) return null;
|
||||||
|
return file.Adapt<FileCacheItem>();
|
||||||
|
});
|
||||||
|
var file = fileCache?.Adapt<FileAggregateRoot>();
|
||||||
var path = file?.GetQueryFileSavePath(isThumbnail);
|
var path = file?.GetQueryFileSavePath(isThumbnail);
|
||||||
if (path is null || !File.Exists(path))
|
if (path is null || !File.Exists(path))
|
||||||
{
|
{
|
||||||
@@ -58,12 +70,13 @@ namespace Yi.Framework.Rbac.Application.Services
|
|||||||
|
|
||||||
for (int i = 0; i < file.Count; i++)
|
for (int i = 0; i < file.Count; i++)
|
||||||
{
|
{
|
||||||
var entity= entities[i];
|
var entity = entities[i];
|
||||||
using (var steam = file[i].OpenReadStream())
|
using (var steam = file[i].OpenReadStream())
|
||||||
{
|
{
|
||||||
await _fileManager.SaveFileAsync(entity,steam);
|
await _fileManager.SaveFileAsync(entity, steam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return entities.Adapt<List<FileGetListOutputDto>>();
|
return entities.Adapt<List<FileGetListOutputDto>>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
namespace Yi.Framework.Rbac.Domain.Shared.Caches;
|
||||||
|
|
||||||
|
public class FileCacheItem
|
||||||
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件大小
|
||||||
|
///</summary>
|
||||||
|
public decimal FileSize { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件名
|
||||||
|
///</summary>
|
||||||
|
public string FileName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件路径
|
||||||
|
///</summary>
|
||||||
|
public string FilePath { get; set; }
|
||||||
|
|
||||||
|
public DateTime CreationTime { get; set; }
|
||||||
|
|
||||||
|
public Guid? CreatorId { get; set; }
|
||||||
|
|
||||||
|
public Guid? LastModifierId { get; set; }
|
||||||
|
|
||||||
|
public DateTime? LastModificationTime { get; set; }
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user