😎代码格式化

This commit is contained in:
zuohuaijun 2025-02-09 22:44:19 +08:00
parent 213a9a5555
commit 55a1082c2e
5 changed files with 18 additions and 13 deletions

View File

@ -4,8 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Core.Service; namespace Admin.NET.Core.Service;
public class DefaultFileProvider : ICustomFileProvider, ITransient public class DefaultFileProvider : ICustomFileProvider, ITransient
@ -56,4 +54,4 @@ public class DefaultFileProvider : ICustomFileProvider, ITransient
newFile.Url = $"{newFile.FilePath}/{newFile.Id + newFile.Suffix}"; newFile.Url = $"{newFile.FilePath}/{newFile.Id + newFile.Suffix}";
return newFile; return newFile;
} }
} }

View File

@ -18,18 +18,21 @@ public interface ICustomFileProvider
/// <param name="fileName"></param> /// <param name="fileName"></param>
/// <returns></returns> /// <returns></returns>
public Task<FileStreamResult> GetFileStreamResultAsync(SysFile sysFile, string fileName); public Task<FileStreamResult> GetFileStreamResultAsync(SysFile sysFile, string fileName);
/// <summary> /// <summary>
/// 下载指定文件Base64格式 /// 下载指定文件Base64格式
/// </summary> /// </summary>
/// <param name="sysFile"></param> /// <param name="sysFile"></param>
/// <returns></returns> /// <returns></returns>
public Task<string> DownloadFileBase64Async(SysFile sysFile); public Task<string> DownloadFileBase64Async(SysFile sysFile);
/// <summary> /// <summary>
/// 删除文件 /// 删除文件
/// </summary> /// </summary>
/// <param name="sysFile"></param> /// <param name="sysFile"></param>
/// <returns></returns> /// <returns></returns>
public Task DeleteFileAsync(SysFile sysFile); public Task DeleteFileAsync(SysFile sysFile);
/// <summary> /// <summary>
/// 上传文件 /// 上传文件
/// </summary> /// </summary>
@ -39,4 +42,4 @@ public interface ICustomFileProvider
/// <param name="finalName">文件最终名称</param> /// <param name="finalName">文件最终名称</param>
/// <returns></returns> /// <returns></returns>
public Task<SysFile> UploadFileAsync(IFormFile file, SysFile sysFile, string path, string finalName); public Task<SysFile> UploadFileAsync(IFormFile file, SysFile sysFile, string path, string finalName);
} }

View File

@ -8,15 +8,18 @@ using OnceMi.AspNetCore.OSS;
namespace Admin.NET.Core.Service; namespace Admin.NET.Core.Service;
public class OSSFileProvider : ICustomFileProvider,ITransient public class OSSFileProvider : ICustomFileProvider, ITransient
{ {
private readonly IOSSService _OSSService; private readonly IOSSService _OSSService;
private readonly OSSProviderOptions _OSSProviderOptions; private readonly OSSProviderOptions _OSSProviderOptions;
public OSSFileProvider(IOptions<OSSProviderOptions> oSSProviderOptions, IOSSServiceFactory ossServiceFactory) {
public OSSFileProvider(IOptions<OSSProviderOptions> oSSProviderOptions, IOSSServiceFactory ossServiceFactory)
{
_OSSProviderOptions = oSSProviderOptions.Value; _OSSProviderOptions = oSSProviderOptions.Value;
if (_OSSProviderOptions.Enabled) if (_OSSProviderOptions.Enabled)
_OSSService = ossServiceFactory.Create(Enum.GetName(_OSSProviderOptions.Provider)); _OSSService = ossServiceFactory.Create(Enum.GetName(_OSSProviderOptions.Provider));
} }
public async Task DeleteFileAsync(SysFile file) public async Task DeleteFileAsync(SysFile file)
{ {
await _OSSService.RemoveObjectAsync(file.BucketName, string.Concat(file.FilePath, "/", $"{file.Id}{file.Suffix}")); await _OSSService.RemoveObjectAsync(file.BucketName, string.Concat(file.FilePath, "/", $"{file.Id}{file.Suffix}"));
@ -43,7 +46,7 @@ public class OSSFileProvider : ICustomFileProvider,ITransient
return new FileStreamResult(stream, "application/octet-stream") { FileDownloadName = fileName + file.Suffix }; return new FileStreamResult(stream, "application/octet-stream") { FileDownloadName = fileName + file.Suffix };
} }
public async Task<SysFile> UploadFileAsync(IFormFile file,SysFile sysFile,string path,string finalName) public async Task<SysFile> UploadFileAsync(IFormFile file, SysFile sysFile, string path, string finalName)
{ {
sysFile.Provider = Enum.GetName(_OSSProviderOptions.Provider); sysFile.Provider = Enum.GetName(_OSSProviderOptions.Provider);
var filePath = string.Concat(path, "/", finalName); var filePath = string.Concat(path, "/", finalName);
@ -75,4 +78,4 @@ public class OSSFileProvider : ICustomFileProvider,ITransient
} }
return sysFile; return sysFile;
} }
} }

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Core.Service; namespace Admin.NET.Core.Service;
public class SSHFileProvider : ICustomFileProvider, ITransient public class SSHFileProvider : ICustomFileProvider, ITransient
@ -30,7 +29,7 @@ public class SSHFileProvider : ICustomFileProvider, ITransient
var filePath = Path.Combine(sysFile.FilePath ?? "", sysFile.Id + sysFile.Suffix); var filePath = Path.Combine(sysFile.FilePath ?? "", sysFile.Id + sysFile.Suffix);
using SSHHelper helper = new(App.Configuration["SSHProvider:Host"], using SSHHelper helper = new(App.Configuration["SSHProvider:Host"],
App.Configuration["SSHProvider:Port"].ToInt(), App.Configuration["SSHProvider:Username"], App.Configuration["SSHProvider:Password"]); App.Configuration["SSHProvider:Port"].ToInt(), App.Configuration["SSHProvider:Username"], App.Configuration["SSHProvider:Password"]);
return Task.FromResult( new FileStreamResult(helper.OpenRead(filePath), "application/octet-stream") { FileDownloadName = fileName + sysFile.Suffix }); return Task.FromResult(new FileStreamResult(helper.OpenRead(filePath), "application/octet-stream") { FileDownloadName = fileName + sysFile.Suffix });
} }
public Task<SysFile> UploadFileAsync(IFormFile file, SysFile sysFile, string path, string finalName) public Task<SysFile> UploadFileAsync(IFormFile file, SysFile sysFile, string path, string finalName)

View File

@ -25,7 +25,8 @@ public class SysFileService : IDynamicApiController, ITransient
public SysFileService(UserManager userManager, public SysFileService(UserManager userManager,
SqlSugarRepository<SysFile> sysFileRep, SqlSugarRepository<SysFile> sysFileRep,
IOptions<OSSProviderOptions> oSSProviderOptions, IOptions<OSSProviderOptions> oSSProviderOptions,
IOptions<UploadOptions> uploadOptions, INamedServiceProvider<ICustomFileProvider> namedServiceProvider) IOptions<UploadOptions> uploadOptions,
INamedServiceProvider<ICustomFileProvider> namedServiceProvider)
{ {
_namedServiceProvider = namedServiceProvider; _namedServiceProvider = namedServiceProvider;
_userManager = userManager; _userManager = userManager;
@ -40,7 +41,8 @@ public class SysFileService : IDynamicApiController, ITransient
{ {
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(SSHFileProvider)); _customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(SSHFileProvider));
} }
else { else
{
_customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DefaultFileProvider)); _customFileProvider = _namedServiceProvider.GetService<ITransient>(nameof(DefaultFileProvider));
} }
} }
@ -290,7 +292,7 @@ public class SysFileService : IDynamicApiController, ITransient
var finalName = newFile.Id + suffix; // 文件最终名称 var finalName = newFile.Id + suffix; // 文件最终名称
newFile = await _customFileProvider.UploadFileAsync(input.File, newFile, path,finalName); newFile = await _customFileProvider.UploadFileAsync(input.File, newFile, path, finalName);
await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync(); await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
return newFile; return newFile;
} }