Merge pull request 'v2.1dev' (#457) from shiningrise/Admin.NET.Pro:v2.1dev into v2.1
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/457
This commit is contained in:
zuohuaijun
commit
755560ee41
@ -1,27 +1,27 @@
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core;
|
||||
|
||||
/// <summary>
|
||||
/// 系统文件内容表
|
||||
/// </summary>
|
||||
[SugarTable(null, "系统文件内容表")]
|
||||
[SysTable]
|
||||
public partial class SysFileContent : EntityBase
|
||||
{
|
||||
/// <summary>
|
||||
/// SysFile里的Id
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "SysFile里的Id")]
|
||||
public long SysFileId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 文件内容
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "文件内容", IsNullable = false)]
|
||||
public byte[] Content { get; set; }
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core;
|
||||
|
||||
/// <summary>
|
||||
/// 系统文件内容表
|
||||
/// </summary>
|
||||
[SugarTable(null, "系统文件内容表")]
|
||||
[SysTable]
|
||||
public partial class SysFileContent : EntityBase
|
||||
{
|
||||
/// <summary>
|
||||
/// SysFile里的Id
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "SysFile里的Id")]
|
||||
public long SysFileId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 文件内容
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "文件内容", IsNullable = false)]
|
||||
public byte[] Content { get; set; }
|
||||
}
|
||||
@ -1,132 +1,132 @@
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core;
|
||||
|
||||
/// <summary>
|
||||
/// 系统微信退款表
|
||||
/// </summary>
|
||||
[SugarTable(null, "系统微信退款表")]
|
||||
[SysTable]
|
||||
[SugarIndex("i_{table}_o", nameof(OrderId), OrderByType.Desc)]
|
||||
public class SysWechatRefund : EntityBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 微信支付订单号(原支付交易对应的微信订单号)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "微信支付订单号", Length = 32)]
|
||||
[Required]
|
||||
public string TransactionId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 商户订单号(原交易对应的商户付款单号)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "商户付款单号", Length = 32)]
|
||||
[Required]
|
||||
public string OutTradeNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "商户退款单号", Length = 64)]
|
||||
[Required]
|
||||
public string OutRefundNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 微信接口退款ID
|
||||
/// </summary>
|
||||
public string RefundId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款原因，示例：商品已售完
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款原因", Length = 80)]
|
||||
public string Reason { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款金额")]
|
||||
public int Refund { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原订单总金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "订单总金额")]
|
||||
public int Total { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款结果回调url
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款结果回调url", Length = 256)]
|
||||
public string? NotifyUrl { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款资金来源, 可不传，默认使用未结算资金退款（仅对老资金流商户适用）
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款资金来源", Length = 32)]
|
||||
public string? FundsAccount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户订单号
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)]
|
||||
public string? OrderId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)]
|
||||
public string? RefundStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 支完成时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "完成时间")]
|
||||
public DateTime? SuccessTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品编码
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品编码", Length = 32)]
|
||||
public string? MerchantGoodsId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品名称
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品名称", Length = 256)]
|
||||
public string? GoodsName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品单价
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品单价")]
|
||||
public int UnitPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品退款金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品退款金额")]
|
||||
public int RefundAmount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品退货数量
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品退货数量")]
|
||||
public int RefundQuantity { get; set; } = 1;
|
||||
|
||||
/// <summary>
|
||||
/// 附加数据
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "附加数据")]
|
||||
public string? Attachment { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "备注", ColumnDataType = StaticConfig.CodeFirst_BigString)]
|
||||
public string? Remark { get; set; }
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core;
|
||||
|
||||
/// <summary>
|
||||
/// 系统微信退款表
|
||||
/// </summary>
|
||||
[SugarTable(null, "系统微信退款表")]
|
||||
[SysTable]
|
||||
[SugarIndex("i_{table}_o", nameof(OrderId), OrderByType.Desc)]
|
||||
public class SysWechatRefund : EntityBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 微信支付订单号(原支付交易对应的微信订单号)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "微信支付订单号", Length = 32)]
|
||||
[Required]
|
||||
public string TransactionId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 商户订单号(原交易对应的商户付款单号)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "商户付款单号", Length = 32)]
|
||||
[Required]
|
||||
public string OutTradeNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "商户退款单号", Length = 64)]
|
||||
[Required]
|
||||
public string OutRefundNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 微信接口退款ID
|
||||
/// </summary>
|
||||
public string RefundId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款原因，示例：商品已售完
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款原因", Length = 80)]
|
||||
public string Reason { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款金额")]
|
||||
public int Refund { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 原订单总金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "订单总金额")]
|
||||
public int Total { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款结果回调url
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款结果回调url", Length = 256)]
|
||||
public string? NotifyUrl { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退款资金来源, 可不传，默认使用未结算资金退款（仅对老资金流商户适用）
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "退款资金来源", Length = 32)]
|
||||
public string? FundsAccount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户订单号
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)]
|
||||
public string? OrderId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)]
|
||||
public string? RefundStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 支完成时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "完成时间")]
|
||||
public DateTime? SuccessTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品编码
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品编码", Length = 32)]
|
||||
public string? MerchantGoodsId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品名称
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品名称", Length = 256)]
|
||||
public string? GoodsName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品单价
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品单价")]
|
||||
public int UnitPrice { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品退款金额
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品退款金额")]
|
||||
public int RefundAmount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 关联的商户商品退货数量
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "关联的商户商品退货数量")]
|
||||
public int RefundQuantity { get; set; } = 1;
|
||||
|
||||
/// <summary>
|
||||
/// 附加数据
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "附加数据")]
|
||||
public string? Attachment { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "备注", ColumnDataType = StaticConfig.CodeFirst_BigString)]
|
||||
public string? Remark { get; set; }
|
||||
}
|
||||
@ -32,11 +32,11 @@ public sealed class UploadOptions : IConfigurableOptions
|
||||
/// 启用文件MD5验证
|
||||
/// </summary>
|
||||
/// <remarks>防止重复上传</remarks>
|
||||
public bool EnableMd5 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 启用文件存储到数据库
|
||||
/// </summary>
|
||||
public bool EnableMd5 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 启用文件存储到数据库
|
||||
/// </summary>
|
||||
public bool EnableSaveDb { get; set; }
|
||||
}
|
||||
|
||||
|
||||
@ -20,6 +20,8 @@ public class SysAuthService : IDynamicApiController, ITransient
|
||||
private readonly SqlSugarRepository<SysUser> _sysUserRep;
|
||||
private readonly SysConfigService _sysConfigService;
|
||||
private readonly SysCacheService _sysCacheService;
|
||||
private readonly SysTenantService _sysTenantService;
|
||||
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly ICaptcha _captcha;
|
||||
private readonly IEventPublisher _eventPublisher;
|
||||
@ -28,6 +30,7 @@ public class SysAuthService : IDynamicApiController, ITransient
|
||||
SqlSugarRepository<SysUser> sysUserRep,
|
||||
SysConfigService sysConfigService,
|
||||
SysCacheService sysCacheService,
|
||||
SysTenantService sysTenantService,
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
ICaptcha captcha,
|
||||
IEventPublisher eventPublisher)
|
||||
@ -36,6 +39,7 @@ public class SysAuthService : IDynamicApiController, ITransient
|
||||
_sysUserRep = sysUserRep;
|
||||
_sysConfigService = sysConfigService;
|
||||
_sysCacheService = sysCacheService;
|
||||
_sysTenantService = sysTenantService;
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
_captcha = captcha;
|
||||
_eventPublisher = eventPublisher;
|
||||
@ -114,8 +118,8 @@ public class SysAuthService : IDynamicApiController, ITransient
|
||||
//}
|
||||
|
||||
// 判断账号是否存在
|
||||
var user = await _sysUserRep.AsQueryable().Includes(t => t.SysOrg).ClearFilter<ITenantIdFilter>()
|
||||
//.WhereIF(tenantId > 0, u => u.TenantId == tenantId)
|
||||
var user = await _sysUserRep.AsQueryable().Includes(t => t.SysOrg)
|
||||
.WhereIF(tenantId > 0, u => u.TenantId == tenantId)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(account), u => u.Account.Equals(account))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(phone), u => u.Phone.Equals(phone))
|
||||
.FirstAsync();
|
||||
@ -405,4 +409,20 @@ public class SysAuthService : IDynamicApiController, ITransient
|
||||
return 401;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据域名获取租户ID 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[SuppressMonitor]
|
||||
[DisplayName("根据域名获取租户ID")]
|
||||
[AllowAnonymous]
|
||||
public long GetTenantIdByHostname(string hostname)
|
||||
{
|
||||
var list = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant);
|
||||
var tenant = list.Find(p => p.Host.Contains(hostname));
|
||||
if(tenant != null)
|
||||
return tenant.Id;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
public class DbFileProvider : ICustomFileProvider, ITransient
|
||||
@ -22,54 +22,54 @@ public class DbFileProvider : ICustomFileProvider, ITransient
|
||||
}
|
||||
|
||||
public async Task<string> DownloadFileBase64Async(SysFile sysFile)
|
||||
{
|
||||
// 若先前配置成保存到本地文件
|
||||
if (string.IsNullOrEmpty(sysFile.Provider) || sysFile.Provider == "Local")
|
||||
{
|
||||
var provider = App.GetService<DefaultFileProvider>();
|
||||
return await provider.DownloadFileBase64Async(sysFile);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 从数据库获取文件内容
|
||||
{
|
||||
// 若先前配置成保存到本地文件
|
||||
if (string.IsNullOrEmpty(sysFile.Provider) || sysFile.Provider == "Local")
|
||||
{
|
||||
var provider = App.GetService<DefaultFileProvider>();
|
||||
return await provider.DownloadFileBase64Async(sysFile);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 从数据库获取文件内容
|
||||
var fileContent = await _sysFileContentRep.CopyNew().GetFirstAsync(u => u.SysFileId == sysFile.Id);
|
||||
if (fileContent == null || fileContent.Content == null)
|
||||
{
|
||||
Log.Error($"DbFileProvider.DownloadFileBase64:文件[{sysFile.Id},{sysFile.Url}]内容不存在");
|
||||
throw Oops.Oh($"文件[{sysFile.FilePath}]内容不存在");
|
||||
}
|
||||
return Convert.ToBase64String(fileContent.Content);
|
||||
return Convert.ToBase64String(fileContent.Content);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<FileStreamResult> GetFileStreamResultAsync(SysFile sysFile, string fileName)
|
||||
{
|
||||
// 若先前配置成保存到本地文件
|
||||
if (string.IsNullOrEmpty(sysFile.Provider) || sysFile.Provider == "Local")
|
||||
{
|
||||
var provider = App.GetService<DefaultFileProvider>();
|
||||
return await provider.GetFileStreamResultAsync(sysFile, fileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 从数据库获取文件内容
|
||||
var fileContent = await _sysFileContentRep.GetFirstAsync(u => u.SysFileId == sysFile.Id);
|
||||
// 若先前配置成保存到本地文件
|
||||
if (string.IsNullOrEmpty(sysFile.Provider) || sysFile.Provider == "Local")
|
||||
{
|
||||
var provider = App.GetService<DefaultFileProvider>();
|
||||
return await provider.GetFileStreamResultAsync(sysFile, fileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 从数据库获取文件内容
|
||||
var fileContent = await _sysFileContentRep.GetFirstAsync(u => u.SysFileId == sysFile.Id);
|
||||
if (fileContent == null || fileContent.Content == null)
|
||||
{
|
||||
Log.Error($"DbFileProvider.GetFileStreamResultAsync:文件[{sysFile.Id},{sysFile.Url}]内容不存在");
|
||||
throw Oops.Oh($"文件[{sysFile.FilePath}]内容不存在");
|
||||
}
|
||||
// 创建内存流
|
||||
var memoryStream = new MemoryStream(fileContent.Content);
|
||||
return new FileStreamResult(memoryStream, "application/octet-stream") { FileDownloadName = fileName + sysFile.Suffix };
|
||||
}
|
||||
// 创建内存流
|
||||
var memoryStream = new MemoryStream(fileContent.Content);
|
||||
return new FileStreamResult(memoryStream, "application/octet-stream") { FileDownloadName = fileName + sysFile.Suffix };
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<SysFile> UploadFileAsync(IFormFile file, SysFile newFile, string path, string finalName)
|
||||
{
|
||||
newFile.Provider = "Database"; // 数据库存储 Provider 显示为Database
|
||||
|
||||
// 读取文件内容到字节数组
|
||||
newFile.Provider = "Database"; // 数据库存储 Provider 显示为Database
|
||||
|
||||
// 读取文件内容到字节数组
|
||||
byte[] fileContent;
|
||||
using (var memoryStream = new MemoryStream())
|
||||
{
|
||||
|
||||
@ -1,464 +1,464 @@
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
using Furion.AspNetCore;
|
||||
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
/// <summary>
|
||||
/// 系统文件服务 🧩
|
||||
/// </summary>
|
||||
[ApiDescriptionSettings(Order = 410, Description = "系统文件")]
|
||||
public class SysFileService : IDynamicApiController, ITransient
|
||||
{
|
||||
private readonly UserManager _userManager;
|
||||
private readonly SqlSugarRepository<SysFile> _sysFileRep;
|
||||
private readonly OSSProviderOptions _OSSProviderOptions;
|
||||
private readonly UploadOptions _uploadOptions;
|
||||
private readonly INamedServiceProvider<ICustomFileProvider> _namedServiceProvider;
|
||||
private readonly ICustomFileProvider _customFileProvider;
|
||||
private readonly string _imageType = ".jpeg.jpg.png.bmp.gif.tif.svg";
|
||||
|
||||
public SysFileService(UserManager userManager,
|
||||
SqlSugarRepository<SysFile> sysFileRep,
|
||||
IOptions<OSSProviderOptions> oSSProviderOptions,
|
||||
IOptions<UploadOptions> uploadOptions,
|
||||
INamedServiceProvider<ICustomFileProvider> namedServiceProvider)
|
||||
{
|
||||
_namedServiceProvider = namedServiceProvider;
|
||||
_userManager = userManager;
|
||||
_sysFileRep = sysFileRep;
|
||||
_OSSProviderOptions = oSSProviderOptions.Value;
|
||||
_uploadOptions = uploadOptions.Value;
|
||||
if (_OSSProviderOptions.Enabled)
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(OSSFileProvider));
|
||||
}
|
||||
else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(SSHFileProvider));
|
||||
}
|
||||
else if (_uploadOptions.EnableSaveDb)
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DbFileProvider));
|
||||
}
|
||||
else
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DefaultFileProvider));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件分页列表 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件分页列表")]
|
||||
public async Task<SqlSugarPagedList<SysFile>> Page(PageFileInput input)
|
||||
{
|
||||
// 获取所有公开文件
|
||||
var publicList = _sysFileRep.AsQueryable().ClearFilter<ITenantIdFilter>().Where(u => u.IsPublic == true);
|
||||
// 获取私有文件
|
||||
var privateList = _sysFileRep.AsQueryable().Where(u => u.IsPublic == false);
|
||||
// 合并公开和私有并分页
|
||||
return await _sysFileRep.Context.UnionAll(publicList, privateList)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
|
||||
u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
|
||||
.OrderBy(u => u.CreateTime, OrderByType.Desc)
|
||||
.ToPagedListAsync(input.Page, input.PageSize);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传文件Base64 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传文件Base64")]
|
||||
public async Task<SysFile> UploadFileFromBase64(UploadFileFromBase64Input input)
|
||||
{
|
||||
var pattern = @"data:(?<type>.+?);base64,(?<data>[^""]+)";
|
||||
var regex = new Regex(pattern, RegexOptions.Compiled);
|
||||
var match = regex.Match(input.FileDataBase64);
|
||||
|
||||
byte[] fileData = Convert.FromBase64String(match.Groups["data"].Value);
|
||||
var contentType = match.Groups["type"].Value;
|
||||
if (string.IsNullOrEmpty(input.FileName))
|
||||
input.FileName = $"{YitIdHelper.NextId()}.{contentType.AsSpan(contentType.LastIndexOf('/') + 1)}";
|
||||
|
||||
var ms = new MemoryStream();
|
||||
ms.Write(fileData);
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
IFormFile formFile = new FormFile(ms, 0, fileData.Length, "file", input.FileName)
|
||||
{
|
||||
Headers = new HeaderDictionary(),
|
||||
ContentType = contentType
|
||||
};
|
||||
var uploadFileInput = input.Adapt<UploadFileInput>();
|
||||
uploadFileInput.File = formFile;
|
||||
return await UploadFile(uploadFileInput);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传多文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="files"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传多文件")]
|
||||
public List<SysFile> UploadFiles([Required] List<IFormFile> files)
|
||||
{
|
||||
var fileList = new List<SysFile>();
|
||||
files.ForEach(file => fileList.Add(UploadFile(new UploadFileInput { File = file }).Result));
|
||||
return fileList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id或Url下载 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("根据文件Id或Url下载")]
|
||||
public async Task<IActionResult> DownloadFile(SysFile input)
|
||||
{
|
||||
var file = input.Id > 0 ? await GetFile(input.Id) : await _sysFileRep.CopyNew().GetFirstAsync(u => u.Url == input.Url);
|
||||
var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id和MD5下载（与db存储模式路径对应） 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="fileMd5"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("/upload/downloadfile")]
|
||||
[DisplayName("根据文件Id和MD5下载")]
|
||||
[AllowAnonymous]
|
||||
public async Task<IActionResult> DownloadFile2([FromQuery] long id, [FromQuery] string fileMd5)
|
||||
{
|
||||
var file = await GetFile(id);
|
||||
if (file.FileMd5 != null && file.FileMd5 != fileMd5) throw Oops.Oh("文件校验信息不符");
|
||||
|
||||
var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 文件预览 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("文件预览")]
|
||||
public async Task<IActionResult> GetPreview([FromRoute] long id)
|
||||
{
|
||||
var file = await GetFile(id);
|
||||
//var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, file.Id + "");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件流
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <param name="fileName"></param>
|
||||
/// <returns></returns>
|
||||
private async Task<IActionResult> GetFileStreamResult(SysFile file, string fileName)
|
||||
{
|
||||
return await _customFileProvider.GetFileStreamResultAsync(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 下载指定文件Base64格式 🔖
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("下载指定文件Base64格式")]
|
||||
public async Task<string> DownloadFileBase64([FromBody] string url)
|
||||
{
|
||||
var sysFile = await _sysFileRep.AsQueryable().ClearFilter<ITenantIdFilter>().FirstAsync(u => u.Url == url) ?? throw Oops.Oh($"文件不存在");
|
||||
return await _customFileProvider.DownloadFileBase64Async(sysFile);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[ApiDescriptionSettings(Name = "Delete"), HttpPost]
|
||||
[DisplayName("删除文件")]
|
||||
public async Task DeleteFile(BaseIdInput input)
|
||||
{
|
||||
var file = await _sysFileRep.GetByIdAsync(input.Id) ?? throw Oops.Oh($"文件不存在");
|
||||
await _sysFileRep.DeleteAsync(file);
|
||||
await _customFileProvider.DeleteFileAsync(file);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[ApiDescriptionSettings(Name = "Update"), HttpPost]
|
||||
[DisplayName("更新文件")]
|
||||
public async Task UpdateFile(SysFile input)
|
||||
{
|
||||
var isExist = await _sysFileRep.IsAnyAsync(u => u.Id == input.Id);
|
||||
if (!isExist) throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
|
||||
await _sysFileRep.AsUpdateable(input).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="isClearFilter"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件")]
|
||||
public async Task<SysFile> GetFile([FromQuery] long id, [FromQuery] bool isClearFilter = false)
|
||||
{
|
||||
var file = isClearFilter
|
||||
? await _sysFileRep.CopyNew().AsQueryable().ClearFilter<ITenantIdFilter>().FirstAsync(u => u.Id == id)
|
||||
: await _sysFileRep.CopyNew().GetByIdAsync(id);
|
||||
return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id集合获取文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="ids"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("根据文件Id集合获取文件")]
|
||||
public async Task<List<SysFile>> GetFileByIds([FromQuery][FlexibleArray<long>] List<long> ids)
|
||||
{
|
||||
return await _sysFileRep.AsQueryable().Where(u => ids.Contains(u.Id)).ToListAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件路径 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件路径")]
|
||||
public async Task<List<TreeNode>> GetFolder()
|
||||
{
|
||||
var files = await _sysFileRep.AsQueryable().ToListAsync();
|
||||
var folders = files.GroupBy(u => u.FilePath).Select(u => u.First().FilePath).ToList();
|
||||
|
||||
var pathTreeBuilder = new PathTreeBuilder();
|
||||
var tree = pathTreeBuilder.BuildTree(folders);
|
||||
return tree.Children;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <param name="targetPath">存储目标路径</param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传文件")]
|
||||
public async Task<SysFile> UploadFile([FromForm] UploadFileInput input, [BindNever] string targetPath = "")
|
||||
{
|
||||
if (input.File == null || input.File.Length <= 0) throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
|
||||
if (input.File.FileName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0) throw Oops.Oh(ErrorCodeEnum.D8005);
|
||||
|
||||
// 判断是否重复上传的文件
|
||||
var sizeKb = input.File.Length / 1024; // 大小KB
|
||||
var fileMd5 = string.Empty;
|
||||
// 计算文件MD5（长度为32的固定字符串）
|
||||
await using (var fileStream = input.File.OpenReadStream())
|
||||
{
|
||||
byte[] bsFile = new byte[fileStream.Length];
|
||||
_ = fileStream.Read(bsFile, 0, bsFile.Length);
|
||||
fileMd5 = MD5Encryption.Encrypt(bsFile);
|
||||
}
|
||||
if (_uploadOptions.EnableMd5)
|
||||
{
|
||||
// Mysql8 中如果使用了 utf8mb4_general_ci 之外的编码会出错，尽量避免在条件里使用.ToString()
|
||||
// 因为 Squsugar 并不是把变量转换为字符串来构造SQL语句，而是构造了CAST(123 AS CHAR)这样的语句，这样这个返回值是utf8mb4_general_ci，所以容易出错。
|
||||
var sysFile = await _sysFileRep.GetFirstAsync(u => u.FileMd5 == fileMd5 && u.SizeKb == sizeKb);
|
||||
if (sysFile != null) return sysFile;
|
||||
}
|
||||
|
||||
// 验证文件类型
|
||||
if (!_uploadOptions.ContentType.Contains(input.File.ContentType)) throw Oops.Oh(ErrorCodeEnum.D8001, input.File.ContentType);
|
||||
|
||||
// 验证文件大小
|
||||
if (sizeKb > _uploadOptions.MaxSize) throw Oops.Oh($"{ErrorCodeEnum.D8002}，允许最大：{_uploadOptions.MaxSize}KB");
|
||||
|
||||
// 获取文件后缀
|
||||
var suffix = Path.GetExtension(input.File.FileName).ToLower();
|
||||
if (string.IsNullOrWhiteSpace(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
//suffix = string.Concat(".", input.File.ContentType.AsSpan(input.File.ContentType.LastIndexOf('/') + 1));
|
||||
if (!string.IsNullOrWhiteSpace(suffix))
|
||||
{
|
||||
//var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
|
||||
//suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key;
|
||||
// 修改 image/jpeg 类型返回的 .jpeg、jpe 后缀
|
||||
if (suffix == ".jpeg" || suffix == ".jpe")
|
||||
suffix = ".jpg";
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
|
||||
// 防止客户端伪造文件类型
|
||||
if (!string.IsNullOrWhiteSpace(input.AllowSuffix) && !input.AllowSuffix.Contains(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
//if (!VerifyFileExtensionName.IsSameType(file.OpenReadStream(), suffix)) throw Oops.Oh(ErrorCodeEnum.D8001);
|
||||
|
||||
// 文件存储位置
|
||||
var path = string.IsNullOrWhiteSpace(targetPath) ? _uploadOptions.Path : targetPath;
|
||||
path = path.ParseToDateTimeForRep();
|
||||
|
||||
var newFile = input.Adapt<SysFile>();
|
||||
newFile.Id = YitIdHelper.NextId();
|
||||
newFile.BucketName = _OSSProviderOptions.Enabled ? _OSSProviderOptions.Bucket : "Local"; // 阿里云对bucket名称有要求，1.只能包括小写字母，数字，短横线（-）2.必须以小写字母或者数字开头 3.长度必须在3-63字节之间
|
||||
newFile.FileName = Path.GetFileNameWithoutExtension(input.File.FileName);
|
||||
newFile.Suffix = suffix;
|
||||
newFile.ContentType = input.File.ContentType;
|
||||
newFile.SizeKb = sizeKb;
|
||||
newFile.FilePath = path;
|
||||
newFile.FileMd5 = fileMd5;
|
||||
|
||||
var finalName = newFile.Id + suffix; // 文件最终名称
|
||||
|
||||
newFile = await _customFileProvider.UploadFileAsync(input.File, newFile, path, finalName);
|
||||
await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
|
||||
return newFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传头像 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传头像")]
|
||||
public async Task<SysFile> UploadAvatar([Required] IFormFile file)
|
||||
{
|
||||
var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType }, "upload/avatar");
|
||||
|
||||
var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
|
||||
var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
|
||||
await sysUserRep.UpdateAsync(u => new SysUser() { Avatar = sysFile.Url }, u => u.Id == user.Id);
|
||||
// 删除已有头像文件
|
||||
if (!string.IsNullOrWhiteSpace(user.Avatar))
|
||||
{
|
||||
var fileId = Path.GetFileNameWithoutExtension(user.Avatar);
|
||||
await DeleteFile(new BaseIdInput { Id = long.Parse(fileId) });
|
||||
}
|
||||
return sysFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传电子签名 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传电子签名")]
|
||||
public async Task<SysFile> UploadSignature([Required] IFormFile file)
|
||||
{
|
||||
var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType }, "upload/signature");
|
||||
|
||||
var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
|
||||
var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
|
||||
await sysUserRep.UpdateAsync(u => new SysUser() { Signature = sysFile.Url }, u => u.Id == user.Id);
|
||||
// 删除已有电子签名文件
|
||||
if (!string.IsNullOrWhiteSpace(user.Signature) && user.Signature.EndsWith(".png"))
|
||||
{
|
||||
var fileId = Path.GetFileNameWithoutExtension(user.Signature);
|
||||
await DeleteFile(new BaseIdInput { Id = long.Parse(fileId) });
|
||||
}
|
||||
return sysFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传Logo 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <param name="tenantId"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传Logo")]
|
||||
public async Task<SysFile> UploadLogo([Required] IFormFile file, [Required] long tenantId)
|
||||
{
|
||||
// 先清空
|
||||
var sysFile = await _sysFileRep.GetFirstAsync(u => u.FileType == "Logo" && u.DataId == tenantId);
|
||||
if (sysFile != null)
|
||||
await DeleteFile(new BaseIdInput { Id = sysFile.Id });
|
||||
|
||||
return await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, FileType = "Logo", DataId = tenantId }, $"upload/system/{tenantId}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传轮播图 🔖
|
||||
/// </summary>
|
||||
/// <param name="files"></param>
|
||||
/// <param name="tenantId"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传轮播图")]
|
||||
public async Task<List<SysFile>> UploadCarousel([Required] List<IFormFile> files, [Required] long tenantId)
|
||||
{
|
||||
var sysFileList = new List<SysFile>();
|
||||
foreach (var file in files)
|
||||
{
|
||||
var tFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, FileType = "Carousel", DataId = tenantId }, $"upload/system/{tenantId}");
|
||||
sysFileList.Add(tFile);
|
||||
}
|
||||
return sysFileList;
|
||||
}
|
||||
|
||||
#region 统一实体与文件关联时，业务应用实体只需要定义一个SysFile集合导航属性，业务增加和更新、删除分别调用即可
|
||||
|
||||
/// <summary>
|
||||
/// 更新文件的业务数据Id
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <param name="sysFiles"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task UpdateFileByDataId(long dataId, List<SysFile> sysFiles)
|
||||
{
|
||||
var newFileIds = sysFiles.Select(u => u.Id).ToList();
|
||||
|
||||
// 求文件Id差集并删除（无效文件）
|
||||
var tmpFiles = await _sysFileRep.GetListAsync(u => u.DataId == dataId);
|
||||
var tmpFileIds = tmpFiles.Select(u => u.Id).ToList();
|
||||
var deleteFileIds = tmpFileIds.Except(newFileIds);
|
||||
foreach (var fileId in deleteFileIds)
|
||||
await DeleteFile(new BaseIdInput() { Id = fileId });
|
||||
|
||||
await _sysFileRep.UpdateAsync(u => new SysFile() { DataId = dataId }, u => newFileIds.Contains(u.Id));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除业务数据对应的文件
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task DeteleFileByDataId(long dataId)
|
||||
{
|
||||
// 删除冗余无效的物理文件
|
||||
var tmpFiles = await _sysFileRep.GetListAsync(u => u.DataId == dataId);
|
||||
foreach (var file in tmpFiles)
|
||||
await _customFileProvider.DeleteFileAsync(file);
|
||||
await _sysFileRep.AsDeleteable().Where(u => u.DataId == dataId).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据业务数据Id获取文件列表
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <param name="isClearFilter"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task<List<SysFile>> GetFileListByDataId([FromQuery] long dataId, [FromQuery] bool isClearFilter = false)
|
||||
{
|
||||
return isClearFilter
|
||||
? await _sysFileRep.CopyNew().AsQueryable().ClearFilter<ITenantIdFilter>().Where(u => u.DataId == dataId).ToListAsync()
|
||||
: await _sysFileRep.CopyNew().GetListAsync(u => u.DataId == dataId);
|
||||
}
|
||||
|
||||
#endregion 统一实体与文件关联时，业务应用实体只需要定义一个SysFile集合导航属性，业务增加和更新、删除分别调用即可
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
using Furion.AspNetCore;
|
||||
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
/// <summary>
|
||||
/// 系统文件服务 🧩
|
||||
/// </summary>
|
||||
[ApiDescriptionSettings(Order = 410, Description = "系统文件")]
|
||||
public class SysFileService : IDynamicApiController, ITransient
|
||||
{
|
||||
private readonly UserManager _userManager;
|
||||
private readonly SqlSugarRepository<SysFile> _sysFileRep;
|
||||
private readonly OSSProviderOptions _OSSProviderOptions;
|
||||
private readonly UploadOptions _uploadOptions;
|
||||
private readonly INamedServiceProvider<ICustomFileProvider> _namedServiceProvider;
|
||||
private readonly ICustomFileProvider _customFileProvider;
|
||||
private readonly string _imageType = ".jpeg.jpg.png.bmp.gif.tif.svg";
|
||||
|
||||
public SysFileService(UserManager userManager,
|
||||
SqlSugarRepository<SysFile> sysFileRep,
|
||||
IOptions<OSSProviderOptions> oSSProviderOptions,
|
||||
IOptions<UploadOptions> uploadOptions,
|
||||
INamedServiceProvider<ICustomFileProvider> namedServiceProvider)
|
||||
{
|
||||
_namedServiceProvider = namedServiceProvider;
|
||||
_userManager = userManager;
|
||||
_sysFileRep = sysFileRep;
|
||||
_OSSProviderOptions = oSSProviderOptions.Value;
|
||||
_uploadOptions = uploadOptions.Value;
|
||||
if (_OSSProviderOptions.Enabled)
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(OSSFileProvider));
|
||||
}
|
||||
else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(SSHFileProvider));
|
||||
}
|
||||
else if (_uploadOptions.EnableSaveDb)
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DbFileProvider));
|
||||
}
|
||||
else
|
||||
{
|
||||
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DefaultFileProvider));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件分页列表 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件分页列表")]
|
||||
public async Task<SqlSugarPagedList<SysFile>> Page(PageFileInput input)
|
||||
{
|
||||
// 获取所有公开文件
|
||||
var publicList = _sysFileRep.AsQueryable().ClearFilter<ITenantIdFilter>().Where(u => u.IsPublic == true);
|
||||
// 获取私有文件
|
||||
var privateList = _sysFileRep.AsQueryable().Where(u => u.IsPublic == false);
|
||||
// 合并公开和私有并分页
|
||||
return await _sysFileRep.Context.UnionAll(publicList, privateList)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
|
||||
u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
|
||||
.OrderBy(u => u.CreateTime, OrderByType.Desc)
|
||||
.ToPagedListAsync(input.Page, input.PageSize);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传文件Base64 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传文件Base64")]
|
||||
public async Task<SysFile> UploadFileFromBase64(UploadFileFromBase64Input input)
|
||||
{
|
||||
var pattern = @"data:(?<type>.+?);base64,(?<data>[^""]+)";
|
||||
var regex = new Regex(pattern, RegexOptions.Compiled);
|
||||
var match = regex.Match(input.FileDataBase64);
|
||||
|
||||
byte[] fileData = Convert.FromBase64String(match.Groups["data"].Value);
|
||||
var contentType = match.Groups["type"].Value;
|
||||
if (string.IsNullOrEmpty(input.FileName))
|
||||
input.FileName = $"{YitIdHelper.NextId()}.{contentType.AsSpan(contentType.LastIndexOf('/') + 1)}";
|
||||
|
||||
var ms = new MemoryStream();
|
||||
ms.Write(fileData);
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
IFormFile formFile = new FormFile(ms, 0, fileData.Length, "file", input.FileName)
|
||||
{
|
||||
Headers = new HeaderDictionary(),
|
||||
ContentType = contentType
|
||||
};
|
||||
var uploadFileInput = input.Adapt<UploadFileInput>();
|
||||
uploadFileInput.File = formFile;
|
||||
return await UploadFile(uploadFileInput);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传多文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="files"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传多文件")]
|
||||
public List<SysFile> UploadFiles([Required] List<IFormFile> files)
|
||||
{
|
||||
var fileList = new List<SysFile>();
|
||||
files.ForEach(file => fileList.Add(UploadFile(new UploadFileInput { File = file }).Result));
|
||||
return fileList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id或Url下载 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("根据文件Id或Url下载")]
|
||||
public async Task<IActionResult> DownloadFile(SysFile input)
|
||||
{
|
||||
var file = input.Id > 0 ? await GetFile(input.Id) : await _sysFileRep.CopyNew().GetFirstAsync(u => u.Url == input.Url);
|
||||
var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id和MD5下载（与db存储模式路径对应） 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="fileMd5"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("/upload/downloadfile")]
|
||||
[DisplayName("根据文件Id和MD5下载")]
|
||||
[AllowAnonymous]
|
||||
public async Task<IActionResult> DownloadFile2([FromQuery] long id, [FromQuery] string fileMd5)
|
||||
{
|
||||
var file = await GetFile(id);
|
||||
if (file.FileMd5 != null && file.FileMd5 != fileMd5) throw Oops.Oh("文件校验信息不符");
|
||||
|
||||
var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 文件预览 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("文件预览")]
|
||||
public async Task<IActionResult> GetPreview([FromRoute] long id)
|
||||
{
|
||||
var file = await GetFile(id);
|
||||
//var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
|
||||
return await GetFileStreamResult(file, file.Id + "");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件流
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <param name="fileName"></param>
|
||||
/// <returns></returns>
|
||||
private async Task<IActionResult> GetFileStreamResult(SysFile file, string fileName)
|
||||
{
|
||||
return await _customFileProvider.GetFileStreamResultAsync(file, fileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 下载指定文件Base64格式 🔖
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("下载指定文件Base64格式")]
|
||||
public async Task<string> DownloadFileBase64([FromBody] string url)
|
||||
{
|
||||
var sysFile = await _sysFileRep.AsQueryable().ClearFilter<ITenantIdFilter>().FirstAsync(u => u.Url == url) ?? throw Oops.Oh($"文件不存在");
|
||||
return await _customFileProvider.DownloadFileBase64Async(sysFile);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[ApiDescriptionSettings(Name = "Delete"), HttpPost]
|
||||
[DisplayName("删除文件")]
|
||||
public async Task DeleteFile(BaseIdInput input)
|
||||
{
|
||||
var file = await _sysFileRep.GetByIdAsync(input.Id) ?? throw Oops.Oh($"文件不存在");
|
||||
await _sysFileRep.DeleteAsync(file);
|
||||
await _customFileProvider.DeleteFileAsync(file);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[ApiDescriptionSettings(Name = "Update"), HttpPost]
|
||||
[DisplayName("更新文件")]
|
||||
public async Task UpdateFile(SysFile input)
|
||||
{
|
||||
var isExist = await _sysFileRep.IsAnyAsync(u => u.Id == input.Id);
|
||||
if (!isExist) throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
|
||||
await _sysFileRep.AsUpdateable(input).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="isClearFilter"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件")]
|
||||
public async Task<SysFile> GetFile([FromQuery] long id, [FromQuery] bool isClearFilter = false)
|
||||
{
|
||||
var file = isClearFilter
|
||||
? await _sysFileRep.CopyNew().AsQueryable().ClearFilter<ITenantIdFilter>().FirstAsync(u => u.Id == id)
|
||||
: await _sysFileRep.CopyNew().GetByIdAsync(id);
|
||||
return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据文件Id集合获取文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="ids"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("根据文件Id集合获取文件")]
|
||||
public async Task<List<SysFile>> GetFileByIds([FromQuery][FlexibleArray<long>] List<long> ids)
|
||||
{
|
||||
return await _sysFileRep.AsQueryable().Where(u => ids.Contains(u.Id)).ToListAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件路径 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[DisplayName("获取文件路径")]
|
||||
public async Task<List<TreeNode>> GetFolder()
|
||||
{
|
||||
var files = await _sysFileRep.AsQueryable().ToListAsync();
|
||||
var folders = files.GroupBy(u => u.FilePath).Select(u => u.First().FilePath).ToList();
|
||||
|
||||
var pathTreeBuilder = new PathTreeBuilder();
|
||||
var tree = pathTreeBuilder.BuildTree(folders);
|
||||
return tree.Children;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传文件 🔖
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <param name="targetPath">存储目标路径</param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传文件")]
|
||||
public async Task<SysFile> UploadFile([FromForm] UploadFileInput input, [BindNever] string targetPath = "")
|
||||
{
|
||||
if (input.File == null || input.File.Length <= 0) throw Oops.Oh(ErrorCodeEnum.D8000);
|
||||
|
||||
if (input.File.FileName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0) throw Oops.Oh(ErrorCodeEnum.D8005);
|
||||
|
||||
// 判断是否重复上传的文件
|
||||
var sizeKb = input.File.Length / 1024; // 大小KB
|
||||
var fileMd5 = string.Empty;
|
||||
// 计算文件MD5（长度为32的固定字符串）
|
||||
await using (var fileStream = input.File.OpenReadStream())
|
||||
{
|
||||
byte[] bsFile = new byte[fileStream.Length];
|
||||
_ = fileStream.Read(bsFile, 0, bsFile.Length);
|
||||
fileMd5 = MD5Encryption.Encrypt(bsFile);
|
||||
}
|
||||
if (_uploadOptions.EnableMd5)
|
||||
{
|
||||
// Mysql8 中如果使用了 utf8mb4_general_ci 之外的编码会出错，尽量避免在条件里使用.ToString()
|
||||
// 因为 Squsugar 并不是把变量转换为字符串来构造SQL语句，而是构造了CAST(123 AS CHAR)这样的语句，这样这个返回值是utf8mb4_general_ci，所以容易出错。
|
||||
var sysFile = await _sysFileRep.GetFirstAsync(u => u.FileMd5 == fileMd5 && u.SizeKb == sizeKb);
|
||||
if (sysFile != null) return sysFile;
|
||||
}
|
||||
|
||||
// 验证文件类型
|
||||
if (!_uploadOptions.ContentType.Contains(input.File.ContentType)) throw Oops.Oh(ErrorCodeEnum.D8001, input.File.ContentType);
|
||||
|
||||
// 验证文件大小
|
||||
if (sizeKb > _uploadOptions.MaxSize) throw Oops.Oh($"{ErrorCodeEnum.D8002}，允许最大：{_uploadOptions.MaxSize}KB");
|
||||
|
||||
// 获取文件后缀
|
||||
var suffix = Path.GetExtension(input.File.FileName).ToLower();
|
||||
if (string.IsNullOrWhiteSpace(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
//suffix = string.Concat(".", input.File.ContentType.AsSpan(input.File.ContentType.LastIndexOf('/') + 1));
|
||||
if (!string.IsNullOrWhiteSpace(suffix))
|
||||
{
|
||||
//var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
|
||||
//suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key;
|
||||
// 修改 image/jpeg 类型返回的 .jpeg、jpe 后缀
|
||||
if (suffix == ".jpeg" || suffix == ".jpe")
|
||||
suffix = ".jpg";
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
|
||||
// 防止客户端伪造文件类型
|
||||
if (!string.IsNullOrWhiteSpace(input.AllowSuffix) && !input.AllowSuffix.Contains(suffix)) throw Oops.Oh(ErrorCodeEnum.D8003);
|
||||
//if (!VerifyFileExtensionName.IsSameType(file.OpenReadStream(), suffix)) throw Oops.Oh(ErrorCodeEnum.D8001);
|
||||
|
||||
// 文件存储位置
|
||||
var path = string.IsNullOrWhiteSpace(targetPath) ? _uploadOptions.Path : targetPath;
|
||||
path = path.ParseToDateTimeForRep();
|
||||
|
||||
var newFile = input.Adapt<SysFile>();
|
||||
newFile.Id = YitIdHelper.NextId();
|
||||
newFile.BucketName = _OSSProviderOptions.Enabled ? _OSSProviderOptions.Bucket : "Local"; // 阿里云对bucket名称有要求，1.只能包括小写字母，数字，短横线（-）2.必须以小写字母或者数字开头 3.长度必须在3-63字节之间
|
||||
newFile.FileName = Path.GetFileNameWithoutExtension(input.File.FileName);
|
||||
newFile.Suffix = suffix;
|
||||
newFile.ContentType = input.File.ContentType;
|
||||
newFile.SizeKb = sizeKb;
|
||||
newFile.FilePath = path;
|
||||
newFile.FileMd5 = fileMd5;
|
||||
|
||||
var finalName = newFile.Id + suffix; // 文件最终名称
|
||||
|
||||
newFile = await _customFileProvider.UploadFileAsync(input.File, newFile, path, finalName);
|
||||
await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
|
||||
return newFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传头像 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传头像")]
|
||||
public async Task<SysFile> UploadAvatar([Required] IFormFile file)
|
||||
{
|
||||
var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType }, "upload/avatar");
|
||||
|
||||
var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
|
||||
var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
|
||||
await sysUserRep.UpdateAsync(u => new SysUser() { Avatar = sysFile.Url }, u => u.Id == user.Id);
|
||||
// 删除已有头像文件
|
||||
if (!string.IsNullOrWhiteSpace(user.Avatar))
|
||||
{
|
||||
var fileId = Path.GetFileNameWithoutExtension(user.Avatar);
|
||||
await DeleteFile(new BaseIdInput { Id = long.Parse(fileId) });
|
||||
}
|
||||
return sysFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传电子签名 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传电子签名")]
|
||||
public async Task<SysFile> UploadSignature([Required] IFormFile file)
|
||||
{
|
||||
var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType }, "upload/signature");
|
||||
|
||||
var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
|
||||
var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
|
||||
await sysUserRep.UpdateAsync(u => new SysUser() { Signature = sysFile.Url }, u => u.Id == user.Id);
|
||||
// 删除已有电子签名文件
|
||||
if (!string.IsNullOrWhiteSpace(user.Signature) && user.Signature.EndsWith(".png"))
|
||||
{
|
||||
var fileId = Path.GetFileNameWithoutExtension(user.Signature);
|
||||
await DeleteFile(new BaseIdInput { Id = long.Parse(fileId) });
|
||||
}
|
||||
return sysFile;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传Logo 🔖
|
||||
/// </summary>
|
||||
/// <param name="file"></param>
|
||||
/// <param name="tenantId"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传Logo")]
|
||||
public async Task<SysFile> UploadLogo([Required] IFormFile file, [Required] long tenantId)
|
||||
{
|
||||
// 先清空
|
||||
var sysFile = await _sysFileRep.GetFirstAsync(u => u.FileType == "Logo" && u.DataId == tenantId);
|
||||
if (sysFile != null)
|
||||
await DeleteFile(new BaseIdInput { Id = sysFile.Id });
|
||||
|
||||
return await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, FileType = "Logo", DataId = tenantId }, $"upload/system/{tenantId}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传轮播图 🔖
|
||||
/// </summary>
|
||||
/// <param name="files"></param>
|
||||
/// <param name="tenantId"></param>
|
||||
/// <returns></returns>
|
||||
[DisplayName("上传轮播图")]
|
||||
public async Task<List<SysFile>> UploadCarousel([Required] List<IFormFile> files, [Required] long tenantId)
|
||||
{
|
||||
var sysFileList = new List<SysFile>();
|
||||
foreach (var file in files)
|
||||
{
|
||||
var tFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, FileType = "Carousel", DataId = tenantId }, $"upload/system/{tenantId}");
|
||||
sysFileList.Add(tFile);
|
||||
}
|
||||
return sysFileList;
|
||||
}
|
||||
|
||||
#region 统一实体与文件关联时，业务应用实体只需要定义一个SysFile集合导航属性，业务增加和更新、删除分别调用即可
|
||||
|
||||
/// <summary>
|
||||
/// 更新文件的业务数据Id
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <param name="sysFiles"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task UpdateFileByDataId(long dataId, List<SysFile> sysFiles)
|
||||
{
|
||||
var newFileIds = sysFiles.Select(u => u.Id).ToList();
|
||||
|
||||
// 求文件Id差集并删除（无效文件）
|
||||
var tmpFiles = await _sysFileRep.GetListAsync(u => u.DataId == dataId);
|
||||
var tmpFileIds = tmpFiles.Select(u => u.Id).ToList();
|
||||
var deleteFileIds = tmpFileIds.Except(newFileIds);
|
||||
foreach (var fileId in deleteFileIds)
|
||||
await DeleteFile(new BaseIdInput() { Id = fileId });
|
||||
|
||||
await _sysFileRep.UpdateAsync(u => new SysFile() { DataId = dataId }, u => newFileIds.Contains(u.Id));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除业务数据对应的文件
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task DeteleFileByDataId(long dataId)
|
||||
{
|
||||
// 删除冗余无效的物理文件
|
||||
var tmpFiles = await _sysFileRep.GetListAsync(u => u.DataId == dataId);
|
||||
foreach (var file in tmpFiles)
|
||||
await _customFileProvider.DeleteFileAsync(file);
|
||||
await _sysFileRep.AsDeleteable().Where(u => u.DataId == dataId).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据业务数据Id获取文件列表
|
||||
/// </summary>
|
||||
/// <param name="dataId"></param>
|
||||
/// <param name="isClearFilter"></param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public async Task<List<SysFile>> GetFileListByDataId([FromQuery] long dataId, [FromQuery] bool isClearFilter = false)
|
||||
{
|
||||
return isClearFilter
|
||||
? await _sysFileRep.CopyNew().AsQueryable().ClearFilter<ITenantIdFilter>().Where(u => u.DataId == dataId).ToListAsync()
|
||||
: await _sysFileRep.CopyNew().GetListAsync(u => u.DataId == dataId);
|
||||
}
|
||||
|
||||
#endregion 统一实体与文件关联时，业务应用实体只需要定义一个SysFile集合导航属性，业务增加和更新、删除分别调用即可
|
||||
}
|
||||
@ -1,59 +1,59 @@
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
/// <summary>
|
||||
/// 系统差异日志服务 🧩
|
||||
/// </summary>
|
||||
[ApiDescriptionSettings(Order = 330, Description = "差异日志")]
|
||||
public class SysLogDiffService : IDynamicApiController, ITransient
|
||||
{
|
||||
private readonly SqlSugarRepository<SysLogDiff> _sysLogDiffRep;
|
||||
|
||||
public SysLogDiffService(SqlSugarRepository<SysLogDiff> sysLogDiffRep)
|
||||
{
|
||||
_sysLogDiffRep = sysLogDiffRep;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取差异日志分页列表 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[SuppressMonitor]
|
||||
[DisplayName("获取差异日志分页列表")]
|
||||
public async Task<SqlSugarPagedList<SysLogDiff>> Page(PageLogInput input)
|
||||
{
|
||||
return await _sysLogDiffRep.AsQueryable()
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
|
||||
.IgnoreColumns(u => new { u.BeforeData, u.AfterData })
|
||||
.OrderBy(u => u.CreateTime, OrderByType.Desc)
|
||||
.ToPagedListAsync(input.Page, input.PageSize);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取差异日志详情 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[SuppressMonitor]
|
||||
[DisplayName("获取差异日志详情")]
|
||||
public async Task<SysLogDiff> GetDetail(long id)
|
||||
{
|
||||
return await _sysLogDiffRep.GetByIdAsync(id);
|
||||
}
|
||||
|
||||
///// <summary>
|
||||
///// 清空差异日志 🔖
|
||||
///// </summary>
|
||||
///// <returns></returns>
|
||||
//[ApiDescriptionSettings(Name = "Clear"), HttpPost]
|
||||
//[DisplayName("清空差异日志")]
|
||||
//public void Clear()
|
||||
//{
|
||||
// _sysLogDiffRep.AsSugarClient().DbMaintenance.TruncateTable<SysLogDiff>();
|
||||
//}
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
/// <summary>
|
||||
/// 系统差异日志服务 🧩
|
||||
/// </summary>
|
||||
[ApiDescriptionSettings(Order = 330, Description = "差异日志")]
|
||||
public class SysLogDiffService : IDynamicApiController, ITransient
|
||||
{
|
||||
private readonly SqlSugarRepository<SysLogDiff> _sysLogDiffRep;
|
||||
|
||||
public SysLogDiffService(SqlSugarRepository<SysLogDiff> sysLogDiffRep)
|
||||
{
|
||||
_sysLogDiffRep = sysLogDiffRep;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取差异日志分页列表 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[SuppressMonitor]
|
||||
[DisplayName("获取差异日志分页列表")]
|
||||
public async Task<SqlSugarPagedList<SysLogDiff>> Page(PageLogInput input)
|
||||
{
|
||||
return await _sysLogDiffRep.AsQueryable()
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
|
||||
.IgnoreColumns(u => new { u.BeforeData, u.AfterData })
|
||||
.OrderBy(u => u.CreateTime, OrderByType.Desc)
|
||||
.ToPagedListAsync(input.Page, input.PageSize);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取差异日志详情 🔖
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[SuppressMonitor]
|
||||
[DisplayName("获取差异日志详情")]
|
||||
public async Task<SysLogDiff> GetDetail(long id)
|
||||
{
|
||||
return await _sysLogDiffRep.GetByIdAsync(id);
|
||||
}
|
||||
|
||||
///// <summary>
|
||||
///// 清空差异日志 🔖
|
||||
///// </summary>
|
||||
///// <returns></returns>
|
||||
//[ApiDescriptionSettings(Name = "Clear"), HttpPost]
|
||||
//[DisplayName("清空差异日志")]
|
||||
//public void Clear()
|
||||
//{
|
||||
// _sysLogDiffRep.AsSugarClient().DbMaintenance.TruncateTable<SysLogDiff>();
|
||||
//}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -45,13 +45,13 @@ public class AddUserInput : SysUser
|
||||
/// <summary>
|
||||
/// 账号
|
||||
/// </summary>
|
||||
[Required(ErrorMessage = "账号不能为空")]
|
||||
[Required(ErrorMessage = "账号不能为空")]
|
||||
public override string Account { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 真实姓名
|
||||
/// </summary>
|
||||
[Required(ErrorMessage = "真实姓名不能为空")]
|
||||
[Required(ErrorMessage = "真实姓名不能为空")]
|
||||
public override string RealName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -92,10 +92,10 @@ public class DeleteUserInput : BaseIdInput
|
||||
/// 重置用户密码输入参数
|
||||
/// </summary>
|
||||
public class ResetPwdUserInput : BaseIdInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 新密码（若空则用默认密码）
|
||||
/// </summary>
|
||||
{
|
||||
/// <summary>
|
||||
/// 新密码（若空则用默认密码）
|
||||
/// </summary>
|
||||
public string NewPassword { get; set; }
|
||||
}
|
||||
|
||||
@ -107,12 +107,12 @@ public class ChangePwdInput
|
||||
/// <summary>
|
||||
/// 当前密码
|
||||
/// </summary>
|
||||
[Required(ErrorMessage = "当前密码不能为空")]
|
||||
[Required(ErrorMessage = "当前密码不能为空")]
|
||||
public string PasswordOld { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 新密码
|
||||
/// </summary>
|
||||
[Required(ErrorMessage = "新密码不能为空"), MinLength(5, ErrorMessage = "密码需要大于5个字符")]
|
||||
[Required(ErrorMessage = "新密码不能为空"), MinLength(5, ErrorMessage = "密码需要大于5个字符")]
|
||||
public string PasswordNew { get; set; }
|
||||
}
|
||||
@ -109,7 +109,7 @@ public class SysUserService : IDynamicApiController, ITransient
|
||||
// 是否有权操作此账号
|
||||
if (!_userManager.SuperAdmin && input.AccountType is AccountTypeEnum.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D1033);
|
||||
|
||||
var query = _sysUserRep.AsQueryable().ClearFilter<ITenantIdFilter>();
|
||||
var query = _sysUserRep.AsQueryable();
|
||||
if (await query.AnyAsync(u => u.Account == input.Account)) throw Oops.Oh(ErrorCodeEnum.D1003);
|
||||
if (!string.IsNullOrWhiteSpace(input.Phone) && await query.AnyAsync(u => u.Phone == input.Phone)) throw Oops.Oh(ErrorCodeEnum.D1032);
|
||||
|
||||
@ -142,7 +142,7 @@ public class SysUserService : IDynamicApiController, ITransient
|
||||
[DisplayName("更新用户")]
|
||||
public virtual async Task UpdateUser(UpdateUserInput input)
|
||||
{
|
||||
var query = _sysUserRep.AsQueryable().ClearFilter<ITenantIdFilter>().Where(u => u.Id != input.Id);
|
||||
var query = _sysUserRep.AsQueryable().Where(u => u.Id != input.Id);
|
||||
if (await query.AnyAsync(u => u.Account == input.Account)) throw Oops.Oh(ErrorCodeEnum.D1003);
|
||||
if (!string.IsNullOrWhiteSpace(input.Phone) && await query.AnyAsync(u => u.Phone == input.Phone)) throw Oops.Oh(ErrorCodeEnum.D1032);
|
||||
|
||||
|
||||
@ -154,5 +154,8 @@
|
||||
"element-plus",
|
||||
"vue-next-admin",
|
||||
"next-admin"
|
||||
]
|
||||
],
|
||||
"volta": {
|
||||
"node": "22.19.0"
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
import request from '/@/utils/request';
|
||||
|
||||
enum Api {
|
||||
GetTenantIdByHostname = '/api/sysAuth/tenantIdByHostname',
|
||||
}
|
||||
/**
|
||||
* （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
|
||||
*
|
||||
@ -25,3 +27,9 @@ export function useLoginApi() {
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export const getTenantIdByHostname = (hostname: string) =>
|
||||
request({
|
||||
url: `${Api.GetTenantIdByHostname}/${hostname}`,
|
||||
method: 'get',
|
||||
});
|
||||
|
||||
@ -229,7 +229,8 @@ const onSignIn = async () => {
|
||||
const publicKey = window.__env__.VITE_SM_PUBLIC_KEY;
|
||||
const password = sm2.doEncrypt(state.ruleForm.password, publicKey, 1);
|
||||
|
||||
const tenantid = route.query.tid ?? 0;
|
||||
//const tenantid = route.query.tid ?? 0;
|
||||
const tenantid = Local.get('tid') ?? 0;
|
||||
const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthLoginPost({ ...state.ruleForm, password: password, tenantId: Number(tenantid) }));
|
||||
if (err) {
|
||||
getCaptcha(); // 重新获取验证码
|
||||
|
||||
@ -102,7 +102,7 @@ import { Local } from '/@/utils/storage';
|
||||
// 引入多语言
|
||||
import { languageList, getCountryCode } from '/@/i18n';
|
||||
import '/node_modules/flag-icons/css/flag-icons.min.css';
|
||||
|
||||
import { getTenantIdByHostname } from '/@/api/login/index';
|
||||
// 引入组件
|
||||
const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue'));
|
||||
const Mobile = defineAsyncComponent(() => import('/@/views/login/component/mobile.vue'));
|
||||
@ -129,7 +129,13 @@ onMounted(async () => {
|
||||
if (!route.query.tid) Local.remove('tid');
|
||||
var tenantid = Number(route.query.tid);
|
||||
if (isNaN(tenantid)) {
|
||||
tenantid = 0;
|
||||
// 确保hostname不包含端口号
|
||||
const hostnameWithoutPort = window.location.hostname;
|
||||
const data = await getTenantIdByHostname(hostnameWithoutPort);
|
||||
console.log('tenantid', data.data.result);
|
||||
tenantid = data.data.result;
|
||||
if (tenantid > 99999)
|
||||
Local.set('tid', tenantid);
|
||||
} else if (tenantid > 99999) {
|
||||
Local.set('tid', tenantid);
|
||||
}
|
||||
|
||||
@ -101,6 +101,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
|
||||
port: env.VITE_PORT as unknown as number,
|
||||
open: JSON.parse(env.VITE_OPEN),
|
||||
hmr: true,
|
||||
allowedHosts:true,
|
||||
proxy: {
|
||||
'^/[Uu]pload': {
|
||||
target: env.VITE_API_URL,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user