😎1、优化文件上传流程 2、修复通知公告逻辑错误 3、升级依赖

Admin.NET/Admin.NET.Application/Configuration/Upload.json

@@ -8,7 +8,7 @@
     "EnableMd5": false // 启用文件MDF5验证-防止重复上传
   },
   "OSSProvider": {
-    "IsEnable": false,
+    "Enabled": false,
     "Provider": "Minio", // OSS提供者 Invalid/Minio/Aliyun/QCloud/Qiniu/HuaweiCloud
     "Endpoint": "xxx.xxx.xxx.xxx:8090", // 节点/API地址（在腾讯云OSS中表示AppId）
     "Region": "xxx.xxx.xxx.xxx", // 地域
@@ -16,10 +16,11 @@
     "SecretKey": "",
     "IsEnableHttps": false, // 是否启用HTTPS
     "IsEnableCache": true, // 是否启用缓存
-    "Bucket": "admin.net"
+    "Bucket": "admin.net",
+    "CustomHost": "" // 自定义Host：拼接外链的Host，若空则使用Endpoint拼接
   },
   "SSHProvider": {
-    "IsEnable": false,
+    "Enabled": false,
     "Host": "127.0.0.1",
     "Port": 8222,
     "Username": "sshuser",

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -36,12 +36,12 @@
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.8.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1115" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1117" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Core/Option/UploadOptions.cs

@@ -43,11 +43,18 @@ public sealed class OSSProviderOptions : OSSOptions, IConfigurableOptions
     /// <summary>
     /// 是否启用OSS存储
     /// </summary>
-    public bool IsEnable { get; set; }
+    public bool Enabled { get; set; }
 
     /// <summary>
     /// 自定义桶名称 不能直接使用Provider来替代桶名称
     /// 例：阿里云 1.只能包括小写字母，数字，短横线（-）2.必须以小写字母或者数字开头 3.长度必须在3-63字节之间
     /// </summary>
     public string Bucket { get; set; }
+
+    /// <summary>
+    /// 自定义Host
+    /// 拼接外链的Host，若空则使用Endpoint拼接
+    /// </summary>
+    /// <remarks></remarks>
+    public string CustomHost { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs

@@ -6,7 +6,10 @@
 
 namespace Admin.NET.Core.Service;
 
-public class FileInput : BaseIdInput
+/// <summary>
+/// 文件分页查询
+/// </summary>
+public class PageFileInput : BasePageInput
 {
     /// <summary>
     /// 文件名称
@@ -14,43 +17,9 @@ public class FileInput : BaseIdInput
     public string FileName { get; set; }
 
     /// <summary>
-    /// 文件类型
-    /// </summary>
-    public string FileType { get; set; }
-
-    /// <summary>
-    /// 是否公开
-    /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看
-    /// </summary>
-    public bool IsPublic { get; set; }
-
-    /// <summary>
-    /// 文件Url
-    /// </summary>
-    public string? Url { get; set; }
-
-    /// <summary>
-    /// 所属实体ID
-    /// </summary>
-    public long BelongId { get; set; }
-
-    /// <summary>
-    /// 关联对象Id
-    /// </summary>
-    public long RelationId { get; set; }
-
-    /// <summary>
-    /// 关联对象名称
+    /// 文件后缀
     /// </summary>
-    public string RelationName { get; set; }
-}
-
-public class PageFileInput : BasePageInput
-{
-    /// <summary>
-    /// 文件名称
-    /// </summary>
-    public string FileName { get; set; }
+    public string? Suffix { get; set; }
 
     /// <summary>
     /// 开始时间
@@ -63,63 +32,18 @@ public class PageFileInput : BasePageInput
     public DateTime? EndTime { get; set; }
 }
 
-public class DeleteFileInput : BaseIdInput
+public class FileInput : BaseIdInput
 {
 }
 
-public class UploadFileFromBase64Input
+public class DeleteFileInput : BaseIdInput
 {
-    /// <summary>
-    /// 文件内容
-    /// </summary>
-    public string FileDataBase64 { get; set; }
-
-    /// <summary>
-    /// 文件类型( "image/jpeg",)
-    /// </summary>
-    public string ContentType { get; set; }
-
-    /// <summary>
-    /// 文件名称
-    /// </summary>
-    public string FileName { get; set; }
-
-    /// <summary>
-    /// 保存路径
-    /// </summary>
-    public string Path { get; set; }
-
-    /// <summary>
-    /// 文件类型
-    /// </summary>
-    public string FileType { get; set; }
-
-    /// <summary>
-    /// 是否公开
-    /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看
-    /// </summary>
-    public bool IsPublic { get; set; }
-
-    /// <summary>
-    /// 所属实体ID
-    /// </summary>
-    public long BelongId { get; set; }
-
-    /// <summary>
-    /// 关联对象Id
-    /// </summary>
-    public long RelationId { get; set; }
-
-    /// <summary>
-    /// 关联对象名称
-    /// </summary>
-    public string RelationName { get; set; }
 }
 
 /// <summary>
 /// 上传文件
 /// </summary>
-public class FileUploadInput
+public class UploadFileInput : SysFile
 {
     /// <summary>
     /// 文件
@@ -128,35 +52,40 @@ public class FileUploadInput
     public IFormFile File { get; set; }
 
     /// <summary>
-    /// 文件类型
+    /// 文件路径
     /// </summary>
-    public string FileType { get; set; }
+    public string Path { get; set; }
 
     /// <summary>
-    /// 是否公开
-    /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看
+    /// 文件保存路径
     /// </summary>
-    public bool IsPublic { get; set; }
+    public string SavePath { get; set; }
 
     /// <summary>
-    /// 文件路径
+    /// 允许格式：.jpeg.jpg.png.bmp.gif.tif
     /// </summary>
-    public string Path { get; set; }
+    public string AllowSuffix { get; set; }
+}
 
+/// <summary>
+/// 上传文件Base64
+/// </summary>
+public class UploadFileFromBase64Input : SysFile
+{
     /// <summary>
-    /// 所属实体ID
+    /// 文件内容
     /// </summary>
-    public long BelongId { get; set; }
+    public string FileDataBase64 { get; set; }
 
     /// <summary>
-    /// 关联对象Id
+    /// 文件类型( "image/jpeg",)
     /// </summary>
-    public long RelationId { get; set; }
+    public string ContentType { get; set; }
 
     /// <summary>
-    /// 关联对象名称
+    /// 保存路径
     /// </summary>
-    public string RelationName { get; set; }
+    public string Path { get; set; }
 }
 
 /// <summary>
@@ -175,7 +104,7 @@ public class RelationQueryInput
     public long? RelationId { get; set; }
 
     /// <summary>
-    /// 文件，多个以","分割
+    /// 文件类型：多个以","分割
     /// </summary>
     public string FileTypes { get; set; }
 
@@ -185,80 +114,11 @@ public class RelationQueryInput
     public long? BelongId { get; set; }
 
     /// <summary>
-    ///
+    /// 文件类型分割
     /// </summary>
     /// <returns></returns>
     public string[] GetFileTypeBS()
     {
         return FileTypes.Split(',');
     }
-}
-
-public class FileOutput
-{
-    /// <summary>
-    /// Id
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// URL
-    /// </summary>
-    public string Url { get; set; }
-
-    /// <summary>
-    /// 大小
-    /// </summary>
-    public long SizeKb { get; set; }
-
-    /// <summary>
-    /// 后缀
-    /// </summary>
-    public string Suffix { get; set; }
-
-    /// <summary>
-    /// 路径
-    /// </summary>
-    public string FilePath { get; set; }
-
-    /// <summary>
-    /// 文件类别
-    /// </summary>
-    public string FileType { get; set; }
-
-    /// <summary>
-    /// 是否公开
-    /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看
-    /// </summary>
-    public bool IsPublic { get; set; }
-
-    /// <summary>
-    /// 上传人
-    /// </summary>
-    public string CreateUserName { get; set; }
-
-    /// <summary>
-    /// 上传时间
-    /// </summary>
-    public DateTime? CreateTime { get; set; }
-
-    /// <summary>
-    /// 关联对象名称
-    /// </summary>
-    public string RelationName { get; set; }
-
-    /// <summary>
-    /// 关联对象Id
-    /// </summary>
-    public long? RelationId { get; set; }
-
-    /// <summary>
-    /// 所属Id
-    /// </summary>
-    public long? BelongId { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -12,7 +12,7 @@ namespace Admin.NET.Core.Service;
 /// <summary>
 /// 系统文件服务 🧩
 /// </summary>
-[ApiDescriptionSettings(Order = 410)]
+[ApiDescriptionSettings(Order = 410, Description = "系统文件")]
 public class SysFileService : IDynamicApiController, ITransient
 {
     private readonly UserManager _userManager;
@@ -32,7 +32,7 @@ public class SysFileService : IDynamicApiController, ITransient
         _sysFileRep = sysFileRep;
         _OSSProviderOptions = oSSProviderOptions.Value;
         _uploadOptions = uploadOptions.Value;
-        if (_OSSProviderOptions.IsEnable)
+        if (_OSSProviderOptions.Enabled)
             _OSSService = ossServiceFactory.Create(Enum.GetName(_OSSProviderOptions.Provider));
     }
 
@@ -44,27 +44,17 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("获取文件分页列表")]
     public async Task<SqlSugarPagedList<SysFile>> Page(PageFileInput input)
     {
-        //获取所有公开附件
+        // 获取所有公开附件
         var publicList = _sysFileRep.AsQueryable().ClearFilter().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>
-    /// 上传文件 🔖
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("上传文件")]
-    public async Task<SysFile> UploadFile([FromForm] FileUploadInput input)
-    {
-        return await HandleUploadFile(input.File, input.Path, fileType: input.FileType, isPublic: input.IsPublic, belongId: input.BelongId, relationId: input.RelationId, relationName: input.RelationName);
+        // 合并公开和私有附件并分页
+        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>
@@ -75,20 +65,26 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("上传文件Base64")]
     public async Task<SysFile> UploadFileFromBase64(UploadFileFromBase64Input input)
     {
-        byte[] fileData = Convert.FromBase64String(input.FileDataBase64);
+        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);
-        if (string.IsNullOrEmpty(input.FileName))
-            input.FileName = $"{YitIdHelper.NextId()}.jpg";
-        if (string.IsNullOrEmpty(input.ContentType))
-            input.ContentType = "image/jpg";
         IFormFile formFile = new FormFile(ms, 0, fileData.Length, "file", input.FileName)
         {
             Headers = new HeaderDictionary(),
-            ContentType = input.ContentType
+            ContentType = contentType
         };
-        return await UploadFile(new FileUploadInput { File = formFile, Path = input.Path, FileType = input.FileType, IsPublic = input.IsPublic });
+        var uploadFileInput = input.Adapt<UploadFileInput>();
+        uploadFileInput.File = formFile;
+        return await UploadFile(uploadFileInput);
     }
 
     /// <summary>
@@ -102,7 +98,7 @@ public class SysFileService : IDynamicApiController, ITransient
         var filelist = new List<SysFile>();
         foreach (var file in files)
         {
-            filelist.Add(await UploadFile(new FileUploadInput { File = file }));
+            filelist.Add(await UploadFile(new UploadFileInput { File = file }));
         }
         return filelist;
     }
@@ -113,18 +109,18 @@ public class SysFileService : IDynamicApiController, ITransient
     /// <param name="input"></param>
     /// <returns></returns>
     [DisplayName("根据文件Id或Url下载")]
-    public async Task<IActionResult> DownloadFile(FileInput input)
+    public async Task<IActionResult> DownloadFile(SysFile input)
     {
-        var file = input.Id > 0 ? await GetFile(input) : await _sysFileRep.CopyNew().GetFirstAsync(u => u.Url == input.Url);
+        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"));
         var filePath = Path.Combine(file.FilePath, file.Id.ToString() + file.Suffix);
 
-        if (_OSSProviderOptions.IsEnable)
+        if (_OSSProviderOptions.Enabled)
         {
             var stream = await (await _OSSService.PresignedGetObjectAsync(file.BucketName.ToString(), filePath, 5)).GetAsStreamAsync();
             return new FileStreamResult(stream.Stream, "application/octet-stream") { FileDownloadName = fileName + file.Suffix };
         }
-        else if (App.Configuration["SSHProvider:IsEnable"].ToBoolean())
+        else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
         {
             using (SSHHelper helper = new SSHHelper(App.Configuration["SSHProvider:Host"],
                App.Configuration["SSHProvider:Port"].ToInt(), App.Configuration["SSHProvider:Username"], App.Configuration["SSHProvider:Password"]))
@@ -142,21 +138,21 @@ public class SysFileService : IDynamicApiController, ITransient
     /// <summary>
     /// 文件预览 🔖
     /// </summary>
-    /// <param name="Id"></param>
+    /// <param name="id"></param>
     /// <returns></returns>
     [DisplayName("文件预览")]
-    public async Task<IActionResult> GetPreview([FromRoute] long Id)
+    public async Task<IActionResult> GetPreview([FromRoute] long id)
     {
-        var file = await GetFile(new FileInput { Id = Id });
+        var file = await GetFile(id);
         //var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
         var filePath = Path.Combine(file.FilePath, file.Id.ToString() + file.Suffix);
 
-        if (_OSSProviderOptions.IsEnable)
+        if (_OSSProviderOptions.Enabled)
         {
             var stream = await (await _OSSService.PresignedGetObjectAsync(file.BucketName.ToString(), filePath, 5)).GetAsStreamAsync();
             return new FileStreamResult(stream.Stream, "application/octet-stream");
         }
-        else if (App.Configuration["SSHProvider:IsEnable"].ToBoolean())
+        else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
         {
             using (SSHHelper helper = new SSHHelper(App.Configuration["SSHProvider:Host"],
                App.Configuration["SSHProvider:Port"].ToInt(), App.Configuration["SSHProvider:Username"], App.Configuration["SSHProvider:Password"]))
@@ -179,7 +175,7 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("下载指定文件Base64格式")]
     public async Task<string> DownloadFileBase64([FromBody] string url)
     {
-        if (_OSSProviderOptions.IsEnable)
+        if (_OSSProviderOptions.Enabled)
         {
             using var httpClient = new HttpClient();
             HttpResponseMessage response = await httpClient.GetAsync(url);
@@ -194,7 +190,7 @@ public class SysFileService : IDynamicApiController, ITransient
                 throw new HttpRequestException($"Request failed with status code: {response.StatusCode}");
             }
         }
-        else if (App.Configuration["SSHProvider:IsEnable"].ToBoolean())
+        else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
         {
             var sysFile = await _sysFileRep.CopyNew().GetFirstAsync(u => u.Url == url) ?? throw Oops.Oh($"文件不存在");
             using (SSHHelper helper = new SSHHelper(App.Configuration["SSHProvider:Host"],
@@ -230,16 +226,16 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("删除文件")]
     public async Task DeleteFile(DeleteFileInput input)
     {
-        var file = await _sysFileRep.GetFirstAsync(u => u.Id == input.Id);
+        var file = await _sysFileRep.GetByIdAsync(input.Id);
         if (file != null)
         {
             await _sysFileRep.DeleteAsync(file);
 
-            if (_OSSProviderOptions.IsEnable)
+            if (_OSSProviderOptions.Enabled)
             {
                 await _OSSService.RemoveObjectAsync(file.BucketName.ToString(), string.Concat(file.FilePath, "/", $"{input.Id}{file.Suffix}"));
             }
-            else if (App.Configuration["SSHProvider:IsEnable"].ToBoolean())
+            else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
             {
                 var fullPath = string.Concat(file.FilePath, "/", file.Id + file.Suffix);
                 using (SSHHelper helper = new SSHHelper(App.Configuration["SSHProvider:Host"],
@@ -264,71 +260,63 @@ public class SysFileService : IDynamicApiController, ITransient
     /// <returns></returns>
     [ApiDescriptionSettings(Name = "Update"), HttpPost]
     [DisplayName("更新文件")]
-    public async Task UpdateFile(FileInput input)
+    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.UpdateAsync(u => new SysFile() { FileName = input.FileName, FileType = input.FileType, IsPublic = input.IsPublic }, u => u.Id == input.Id);
+        await _sysFileRep.UpdateAsync(u => input.Adapt<SysFile>(), u => u.Id == input.Id);
     }
 
     /// <summary>
     /// 获取文件 🔖
     /// </summary>
-    /// <param name="input"></param>
+    /// <param name="id"></param>
     /// <returns></returns>
     [DisplayName("获取文件")]
-    public async Task<SysFile> GetFile([FromQuery] FileInput input)
+    public async Task<SysFile> GetFile([FromQuery] long id)
     {
-        var file = await _sysFileRep.CopyNew().GetFirstAsync(u => u.Id == input.Id);
+        var file = await _sysFileRep.CopyNew().GetByIdAsync(id);
         return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
     }
 
     /// <summary>
-    /// 上传文件
+    /// 上传文件 🔖
     /// </summary>
-    /// <param name="file">文件</param>
-    /// <param name="savePath">路径</param>
-    /// <param name="allowSuffix">允许格式：.jpg.png.gif.tif.bmp</param>
-    /// <param name="fileType">类型</param>
-    /// <param name="isPublic">是否公开</param>
-    /// <param name="belongId">所属实体的ID</param>
-    /// <param name="relationName"></param>
-    /// <param name="relationId"></param>
+    /// <param name="input"></param>
     /// <returns></returns>
-    private async Task<SysFile> HandleUploadFile(IFormFile file, string savePath, string allowSuffix = "", string fileType = "", bool isPublic = false, long belongId = 0, string relationName = "", long relationId = 0)
+    [DisplayName("上传文件")]
+    public async Task<SysFile> UploadFile([FromForm] UploadFileInput input)
     {
-        if (file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
+        if (input.File == null) throw Oops.Oh(ErrorCodeEnum.D8000);
 
         // 判断是否重复上传的文件
-        var sizeKb = file.Length / 1024; // 大小KB
+        var sizeKb = input.File.Length / 1024; // 大小KB
         var fileMd5 = string.Empty;
         if (_uploadOptions.EnableMd5)
         {
-            using (var fileStream = file.OpenReadStream())
+            using (var fileStream = input.File.OpenReadStream())
             {
                 fileMd5 = OssUtils.ComputeContentMd5(fileStream, fileStream.Length);
             }
-            /*
-             * Mysql8 中如果使用了 utf8mb4_general_ci 之外的编码会出错，尽量避免在条件里使用.ToString()
-             * 因为 Squsugar 并不是把变量转换为字符串来构造SQL语句，而是构造了CAST(123 AS CHAR)这样的语句，这样这个返回值是utf8mb4_general_ci，所以容易出错。
-             */
+            // 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(file.ContentType))
-            throw Oops.Oh($"{ErrorCodeEnum.D8001}:{file.ContentType}");
+        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(file.FileName).ToLower(); // 后缀
+        var suffix = Path.GetExtension(input.File.FileName).ToLower(); // 后缀
         if (string.IsNullOrWhiteSpace(suffix))
-            suffix = string.Concat(".", file.ContentType.AsSpan(file.ContentType.LastIndexOf('/') + 1));
+            suffix = string.Concat(".", input.File.ContentType.AsSpan(input.File.ContentType.LastIndexOf('/') + 1));
         if (!string.IsNullOrWhiteSpace(suffix))
         {
             //var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
@@ -341,38 +329,30 @@ public class SysFileService : IDynamicApiController, ITransient
             throw Oops.Oh(ErrorCodeEnum.D8003);
 
         // 防止客户端伪造文件类型
-        if (!string.IsNullOrWhiteSpace(allowSuffix) && !allowSuffix.Contains(suffix))
+        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(savePath) ? _uploadOptions.Path : savePath;
+        // 文件存储位置
+        var path = string.IsNullOrWhiteSpace(input.SavePath) ? _uploadOptions.Path : input.SavePath;
         path = path.ParseToDateTimeForRep();
-        var newFile = new SysFile
-        {
-            Id = YitIdHelper.NextId(),
-            // BucketName = _OSSProviderOptions.IsEnable ? _OSSProviderOptions.Provider.ToString() : "Local",
-            // 阿里云对bucket名称有要求，1.只能包括小写字母，数字，短横线（-）2.必须以小写字母或者数字开头  3.长度必须在3-63字节之间
-            // 无法使用Provider
-            BucketName = _OSSProviderOptions.IsEnable ? _OSSProviderOptions.Bucket : "Local",
-            FileName = Path.GetFileNameWithoutExtension(file.FileName),
-            Suffix = suffix,
-            SizeKb = sizeKb,
-            FilePath = path,
-            FileMd5 = fileMd5,
-            FileType = fileType,
-            IsPublic = isPublic,
-            BelongId = belongId,
-            RelationId = relationId,
-            RelationName = relationName,
-        };
+
+        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.SizeKb = sizeKb;
+        newFile.FilePath = path;
+        newFile.FileMd5 = fileMd5;
 
         var finalName = newFile.Id + suffix; // 文件最终名称
-        if (_OSSProviderOptions.IsEnable)
+        if (_OSSProviderOptions.Enabled)
         {
             newFile.Provider = Enum.GetName(_OSSProviderOptions.Provider);
             var filePath = string.Concat(path, "/", finalName);
-            await _OSSService.PutObjectAsync(newFile.BucketName, filePath, file.OpenReadStream());
+            await _OSSService.PutObjectAsync(newFile.BucketName, filePath, input.File.OpenReadStream());
             //  http://<你的bucket名字>.oss.aliyuncs.com/<你的object名字>
             //  生成外链地址 方便前端预览
             switch (_OSSProviderOptions.Provider)
@@ -389,17 +369,20 @@ public class SysFileService : IDynamicApiController, ITransient
                     // 获取Minio文件的下载或者预览地址
                     // newFile.Url = await GetMinioPreviewFileUrl(newFile.BucketName, filePath);// 这种方法生成的Url是有7天有效期的，不能这样使用
                     // 需要在MinIO中的Buckets开通对 Anonymous 的readonly权限
-                    newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{_OSSProviderOptions.Endpoint}/{newFile.BucketName}/{filePath}";
+                    var customHost = _OSSProviderOptions.CustomHost;
+                    if (string.IsNullOrWhiteSpace(customHost))
+                        customHost = _OSSProviderOptions.Endpoint;
+                    newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{customHost}/{newFile.BucketName}/{filePath}";
                     break;
             }
         }
-        else if (App.Configuration["SSHProvider:IsEnable"].ToBoolean())
+        else if (App.Configuration["SSHProvider:Enabled"].ToBoolean())
         {
             var fullPath = string.Concat(path.StartsWith('/') ? path : "/" + path, "/", finalName);
             using (SSHHelper helper = new SSHHelper(App.Configuration["SSHProvider:Host"],
                App.Configuration["SSHProvider:Port"].ToInt(), App.Configuration["SSHProvider:Username"], App.Configuration["SSHProvider:Password"]))
             {
-                helper.UploadFile(file.OpenReadStream(), fullPath);
+                helper.UploadFile(input.File.OpenReadStream(), fullPath);
             }
         }
         else
@@ -412,14 +395,10 @@ public class SysFileService : IDynamicApiController, ITransient
             var realFile = Path.Combine(filePath, finalName);
             using (var stream = File.Create(realFile))
             {
-                await file.CopyToAsync(stream);
+                await input.File.CopyToAsync(stream);
             }
 
-            // 生成外链
-            var host = CommonUtil.GetLocalhost();
-            if (!host.EndsWith('/'))
-                host += "/";
-            newFile.Url = $"{host}{newFile.FilePath}/{newFile.Id + newFile.Suffix}";
+            newFile.Url = $"{newFile.FilePath}/{newFile.Id + newFile.Suffix}";
         }
         await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
         return newFile;
@@ -433,10 +412,10 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("上传头像")]
     public async Task<SysFile> UploadAvatar([Required] IFormFile file)
     {
-        var sysFile = await HandleUploadFile(file, "upload/avatar", _imageType);
+        var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, SavePath = "upload/avatar" });
 
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
-        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
+        var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
         // 删除已有头像文件
         if (!string.IsNullOrWhiteSpace(user.Avatar))
         {
@@ -455,10 +434,10 @@ public class SysFileService : IDynamicApiController, ITransient
     [DisplayName("上传电子签名")]
     public async Task<SysFile> UploadSignature([Required] IFormFile file)
     {
-        var sysFile = await HandleUploadFile(file, "upload/signature", _imageType);
+        var sysFile = await UploadFile(new UploadFileInput { File = file, AllowSuffix = _imageType, SavePath = "upload/signature" });
 
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
-        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
+        var user = await sysUserRep.GetByIdAsync(_userManager.UserId);
         // 删除已有电子签名文件
         if (!string.IsNullOrWhiteSpace(user.Signature) && user.Signature.EndsWith(".png"))
         {
@@ -483,10 +462,10 @@ public class SysFileService : IDynamicApiController, ITransient
         if (ids == null || ids.Count == 0)
             return 0;
         return await _sysFileRep.AsUpdateable()
-            .SetColumns(m => m.RelationName == relationName)
-            .SetColumns(m => m.RelationId == relationId)
-            .SetColumns(m => m.BelongId == belongId)
-            .Where(m => ids.Contains(m.Id))
+            .SetColumns(u => u.RelationName == relationName)
+            .SetColumns(u => u.RelationId == relationId)
+            .SetColumns(u => u.BelongId == belongId)
+            .Where(u => ids.Contains(u.Id))
             .ExecuteCommandAsync();
     }
 
@@ -497,29 +476,17 @@ public class SysFileService : IDynamicApiController, ITransient
     /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     [DisplayName("根据关联查询附件")]
-    public async Task<List<FileOutput>> GetRelationFiles([FromQuery] RelationQueryInput input)
+    public async Task<List<SysFile>> GetRelationFiles([FromQuery] RelationQueryInput input)
     {
         return await _sysFileRep.AsQueryable()
-            .Where(m => !m.IsDelete)
-            .WhereIF(input.RelationId.HasValue && input.RelationId > 0, m => m.RelationId == input.RelationId)
-            .WhereIF(input.BelongId.HasValue && input.BelongId > 0, m => m.BelongId == input.BelongId.Value)
-            .WhereIF(!string.IsNullOrWhiteSpace(input.RelationName), m => m.RelationName == input.RelationName)
-            .WhereIF(!string.IsNullOrWhiteSpace(input.FileTypes), m => input.GetFileTypeBS().Contains(m.FileType))
-            .Select(m => new FileOutput
+            .WhereIF(input.RelationId.HasValue && input.RelationId > 0, u => u.RelationId == input.RelationId)
+            .WhereIF(input.BelongId.HasValue && input.BelongId > 0, u => u.BelongId == input.BelongId.Value)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.RelationName), u => u.RelationName == input.RelationName)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.FileTypes), u => input.GetFileTypeBS().Contains(u.FileType))
+            .Select(u => new SysFile
             {
-                Id = m.Id,
-                FileType = m.FileType,
-                Name = m.FileName,
-                RelationId = m.RelationId,
-                BelongId = m.BelongId,
-                FilePath = m.FilePath,
-                SizeKb = m.SizeKb,
-                Suffix = m.Suffix,
-                RelationName = m.RelationName,
-                Url = SqlFunc.MergeString("/api/sysFile/Preview/", m.Id.ToString()),
-                CreateUserName = m.CreateUserName,
-                CreateTime = m.CreateTime,
-            })
+                Url = SqlFunc.MergeString("/api/sysFile/Preview/", u.Id.ToString()),
+            }, true)
            .ToListAsync();
     }
 }

Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs

@@ -9,7 +9,7 @@ namespace Admin.NET.Core.Service;
 /// <summary>
 /// 系统通知公告服务 🧩
 /// </summary>
-[ApiDescriptionSettings(Order = 380)]
+[ApiDescriptionSettings(Order = 380, Description = "通知公告")]
 public class SysNoticeService : IDynamicApiController, ITransient
 {
     private readonly UserManager _userManager;
@@ -72,6 +72,9 @@ public class SysNoticeService : IDynamicApiController, ITransient
     [DisplayName("更新通知公告")]
     public async Task UpdateNotice(UpdateNoticeInput input)
     {
+        if (input.CreateUserId != _userManager.UserId)
+            throw Oops.Oh(ErrorCodeEnum.D7003);
+
         var notice = input.Adapt<SysNotice>();
         InitNoticeInfo(notice);
         await _sysNoticeRep.UpdateAsync(notice);
@@ -87,6 +90,12 @@ public class SysNoticeService : IDynamicApiController, ITransient
     [DisplayName("删除通知公告")]
     public async Task DeleteNotice(DeleteNoticeInput input)
     {
+        var sysNotice = await _sysNoticeRep.GetByIdAsync(input.Id);
+        if (sysNotice.CreateUserId != _userManager.UserId)
+            throw Oops.Oh(ErrorCodeEnum.D7003);
+        if (sysNotice.Status == NoticeStatusEnum.PUBLIC)
+            throw Oops.Oh(ErrorCodeEnum.D7001);
+
         await _sysNoticeRep.DeleteAsync(u => u.Id == input.Id);
 
         await _sysNoticeUserRep.DeleteAsync(u => u.NoticeId == input.Id);
@@ -100,10 +109,13 @@ public class SysNoticeService : IDynamicApiController, ITransient
     [DisplayName("发布通知公告")]
     public async Task Public(NoticeInput input)
     {
+        if (!(await _sysNoticeRep.IsAnyAsync(u => u.Id == input.Id && u.CreateUserId == _userManager.UserId)))
+            throw Oops.Oh(ErrorCodeEnum.D7003);
+
         // 更新发布状态和时间
         await _sysNoticeRep.UpdateAsync(u => new SysNotice() { Status = NoticeStatusEnum.PUBLIC, PublicTime = DateTime.Now }, u => u.Id == input.Id);
 
-        var notice = await _sysNoticeRep.GetFirstAsync(u => u.Id == input.Id);
+        var notice = await _sysNoticeRep.GetByIdAsync(input.Id);
 
         // 通知到的人(所有账号)
         var userIdList = await _sysUserRep.AsQueryable().Select(u => u.Id).ToListAsync();
@@ -141,7 +153,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// <param name="input"></param>
     /// <returns></returns>
     [DisplayName("获取接收的通知公告")]
-    public async Task<SqlSugarPagedList<SysNoticeUser>> GetPageReceived([FromQuery] PageNoticeInput input)
+    public async Task<SqlSugarPagedList<SysNoticeUser>> PageReceived(PageNoticeInput input)
     {
         return await _sysNoticeUserRep.AsQueryable().Includes(u => u.SysNotice)
             .Where(u => u.UserId == _userManager.UserId)

Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs

@@ -147,7 +147,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient
         if (wxUser == null)
             throw Oops.Oh("未找到用户上传失败");
 
-        var res = await _sysFileService.UploadFile(new FileUploadInput { File = input.File, FileType = input.FileType, Path = input.Path });
+        var res = await _sysFileService.UploadFile(new UploadFileInput { File = input.File, FileType = input.FileType, Path = input.Path });
         wxUser.Avatar = res.Url;
         await _sysWechatUserRep.AsUpdateable(wxUser).IgnoreColumns(true).ExecuteCommandAsync();