Merge branch 'next-upstream' into 代码生成有BUG

# Conflicts:
#	Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -166,10 +166,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     [DisplayName("获取登录账号")]
     public async Task<LoginUserOutput> GetUserInfo()
     {
-        var user = await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId);
-        if (user == null)
-            throw Oops.Oh(ErrorCodeEnum.D1011).StatusCode(401);
-
+        var user = await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId) ?? throw Oops.Oh(ErrorCodeEnum.D1011).StatusCode(401);
         // 获取机构
         var org = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysOrg>>().GetFirstAsync(u => u.Id == user.OrgId);
         // 获取职位

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

@@ -1,328 +1,330 @@
-// 麻省理工学院许可证
-//
-// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
-//
-// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-//
-// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
-// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
-
-using Aliyun.OSS.Util;
-using Furion.VirtualFileServer;
-using OnceMi.AspNetCore.OSS;
-
-namespace Admin.NET.Core.Service;
-
-/// <summary>
-/// 系统文件服务
-/// </summary>
-[ApiDescriptionSettings(Order = 410)]
-public class SysFileService : IDynamicApiController, ITransient
-{
-    private readonly UserManager _userManager;
-    private readonly SqlSugarRepository<SysFile> _sysFileRep;
-    private readonly OSSProviderOptions _OSSProviderOptions;
-    private readonly UploadOptions _uploadOptions;
-    private readonly IOSSService _OSSService;
-
-    public SysFileService(UserManager userManager,
-        SqlSugarRepository<SysFile> sysFileRep,
-        IOptions<OSSProviderOptions> oSSProviderOptions,
-        IOptions<UploadOptions> uploadOptions,
-        IOSSServiceFactory ossServiceFactory)
-    {
-        _userManager = userManager;
-        _sysFileRep = sysFileRep;
-        _OSSProviderOptions = oSSProviderOptions.Value;
-        _uploadOptions = uploadOptions.Value;
-        if (_OSSProviderOptions.IsEnable)
-            _OSSService = ossServiceFactory.Create(Enum.GetName(_OSSProviderOptions.Provider));
-    }
-
-    /// <summary>
-    /// 获取文件分页列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取文件分页列表")]
-    public async Task<SqlSugarPagedList<SysFile>> Page(PageFileInput input)
-    {
-        return await _sysFileRep.AsQueryable()
-            .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="file"></param>
-    /// <param name="path"></param>
-    /// <returns></returns>
-    [DisplayName("上传文件")]
-    public async Task<FileOutput> UploadFile([Required] IFormFile file, [FromQuery] string? path)
-    {
-        var sysFile = await HandleUploadFile(file, path);
-        return new FileOutput
-        {
-            Id = sysFile.Id,
-            Url = sysFile.Url,  // string.IsNullOrWhiteSpace(sysFile.Url) ? _commonService.GetFileUrl(sysFile) : sysFile.Url,
-            SizeKb = sysFile.SizeKb,
-            Suffix = sysFile.Suffix,
-            FilePath = sysFile.FilePath,
-            FileName = sysFile.FileName
-        };
-    }
-
-    /// <summary>
-    /// 上传多文件
-    /// </summary>
-    /// <param name="files"></param>
-    /// <returns></returns>
-    [DisplayName("上传多文件")]
-    public async Task<List<FileOutput>> UploadFiles([Required] List<IFormFile> files)
-    {
-        var filelist = new List<FileOutput>();
-        foreach (var file in files)
-        {
-            filelist.Add(await UploadFile(file, ""));
-        }
-        return filelist;
-    }
-
-    /// <summary>
-    /// 下载文件(文件流)
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("下载文件(文件流)")]
-    public async Task<IActionResult> DownloadFile(FileInput input)
-    {
-        var file = await GetFile(input);
-        var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
-        if (_OSSProviderOptions.IsEnable)
-        {
-            var filePath = string.Concat(file.FilePath, "/", input.Id.ToString() + file.Suffix);
-            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
-        {
-            var filePath = Path.Combine(file.FilePath, input.Id.ToString() + file.Suffix);
-            var path = Path.Combine(App.WebHostEnvironment.WebRootPath, filePath);
-            return new FileStreamResult(new FileStream(path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName + file.Suffix };
-        }
-    }
-
-    /// <summary>
-    /// 删除文件
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
-    [DisplayName("删除文件")]
-    public async Task DeleteFile(DeleteFileInput input)
-    {
-        var file = await _sysFileRep.GetFirstAsync(u => u.Id == input.Id);
-        if (file != null)
-        {
-            await _sysFileRep.DeleteAsync(file);
-
-            if (_OSSProviderOptions.IsEnable)
-            {
-                await _OSSService.RemoveObjectAsync(file.BucketName.ToString(), string.Concat(file.FilePath, "/", $"{input.Id}{file.Suffix}"));
-            }
-            else
-            {
-                var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, file.FilePath, input.Id.ToString() + file.Suffix);
-                if (File.Exists(filePath))
-                    File.Delete(filePath);
-            }
-        }
-    }
-
-    /// <summary>
-    /// 获取文件
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    private async Task<SysFile> GetFile([FromQuery] FileInput input)
-    {
-        var file = await _sysFileRep.GetFirstAsync(u => u.Id == input.Id);
-        return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
-    }
-
-    /// <summary>
-    /// 上传文件
-    /// </summary>
-    /// <param name="file">文件</param>
-    /// <param name="savePath">路径</param>
-    /// <returns></returns>
-    private async Task<SysFile> HandleUploadFile(IFormFile file, string savePath)
-    {
-        if (file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
-
-        // 判断是否重复上传的文件
-        var fileMd5 = string.Empty;
-        if (_uploadOptions.EnableMd5)
-        {
-            using var fileStream = file.OpenReadStream();
-            fileMd5 = OssUtils.ComputeContentMd5(fileStream, fileStream.Length);
-            var sysFile = await _sysFileRep.GetFirstAsync(q => q.FileMd5 == fileMd5);
-            if (sysFile != null) return sysFile;
-        }
-
-        var path = savePath;
-        if (string.IsNullOrWhiteSpace(savePath))
-        {
-            path = _uploadOptions.Path;
-            var reg = new Regex(@"(\{.+?})");
-            var match = reg.Matches(path);
-            match.ToList().ForEach(a =>
-            {
-                var str = DateTime.Now.ToString(a.ToString().Substring(1, a.Length - 2)); // 每天一个目录
-                path = path.Replace(a.ToString(), str);
-            });
-        }
-
-        if (!_uploadOptions.ContentType.Contains(file.ContentType))
-            throw Oops.Oh(ErrorCodeEnum.D8001);
-
-        var sizeKb = (long)(file.Length / 1024.0); // 大小KB
-        if (sizeKb > _uploadOptions.MaxSize)
-            throw Oops.Oh(ErrorCodeEnum.D8002);
-
-        var suffix = Path.GetExtension(file.FileName).ToLower(); // 后缀
-        if (string.IsNullOrWhiteSpace(suffix))
-        {
-            var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
-            suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key;
-            // 修改 image/jpeg 类型返回的 .jpe 后缀
-            if (suffix == ".jpe")
-                suffix = ".jpg";
-        }
-        if (string.IsNullOrWhiteSpace(suffix))
-            throw Oops.Oh(ErrorCodeEnum.D8003);
-
-        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.ToString(),
-            FilePath = path,
-            FileMd5 = fileMd5,
-        };
-
-        var finalName = newFile.Id + suffix; // 文件最终名称
-        if (_OSSProviderOptions.IsEnable)
-        {
-            newFile.Provider = Enum.GetName(_OSSProviderOptions.Provider);
-            var filePath = string.Concat(path, "/", finalName);
-            await _OSSService.PutObjectAsync(newFile.BucketName, filePath, file.OpenReadStream());
-            //  http://<你的bucket名字>.oss.aliyuncs.com/<你的object名字>
-            //  生成外链地址 方便前端预览
-            switch (_OSSProviderOptions.Provider)
-            {
-                case OSSProvider.Aliyun:
-                    newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{newFile.BucketName}.{_OSSProviderOptions.Endpoint}/{filePath}";
-                    break;
-
-                case OSSProvider.Minio:
-                    // 获取Minio文件的下载或者预览地址
-                    newFile.Url = await GetMinioPreviewFileUrl(newFile.BucketName, filePath); ;
-                    break;
-            }
-        }
-        else
-        {
-            newFile.Provider = ""; // 本地存储 Provider 显示为空
-            var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, path);
-            if (!Directory.Exists(filePath))
-                Directory.CreateDirectory(filePath);
-
-            var realFile = Path.Combine(filePath, finalName);
-            //IDetector detector;
-            using (var stream = File.Create(realFile))
-            {
-                await file.CopyToAsync(stream);
-                //detector = stream.DetectFiletype();
-            }
-            //var realExt = detector.Extension; // 真实扩展名
-            //// 二次校验扩展名
-            //if (!string.Equals(realExt, suffix.Replace(".", ""), StringComparison.OrdinalIgnoreCase))
-            //{
-            //    var delFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, realFile);
-            //    if (File.Exists(delFilePath))
-            //        File.Delete(delFilePath);
-            //    throw Oops.Oh(ErrorCodeEnum.D8001);
-            //}
-
-            // 生成外链
-            newFile.Url = $"{CommonUtil.GetLocalhost()}/{newFile.FilePath}/{newFile.Id + newFile.Suffix}";
-        }
-        await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
-        return newFile;
-    }
-
-    /// <summary>
-    /// 获取Minio文件的下载或者预览地址
-    /// </summary>
-    /// <param name="bucketName">桶名</param>
-    /// <param name="fileName">文件名</param>
-    /// <returns></returns>
-    private async Task<string> GetMinioPreviewFileUrl(string bucketName, string fileName)
-    {
-        return await _OSSService.PresignedGetObjectAsync(bucketName, fileName, 7);
-    }
-
-    /// <summary>
-    /// 上传头像
-    /// </summary>
-    /// <param name="file"></param>
-    /// <returns></returns>
-    [DisplayName("上传头像")]
-    public async Task<FileOutput> UploadAvatar([Required] IFormFile file)
-    {
-        var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
-        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
-        // 删除当前用户已有头像
-        if (!string.IsNullOrWhiteSpace(user.Avatar))
-        {
-            var fileId = Path.GetFileNameWithoutExtension(user.Avatar);
-            await DeleteFile(new DeleteFileInput { Id = long.Parse(fileId) });
-        }
-
-        var res = await UploadFile(file, "Upload/Avatar");
-        await sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Avatar = $"{res.FilePath}/{res.Name}" }, u => u.Id == user.Id);
-        return res;
-    }
-
-    /// <summary>
-    /// 上传电子签名
-    /// </summary>
-    /// <param name="file"></param>
-    /// <returns></returns>
-    [DisplayName("上传电子签名")]
-    public async Task<FileOutput> UploadSignature([Required] IFormFile file)
-    {
-        var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
-        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
-        // 删除当前用户已有电子签名
-        if (!string.IsNullOrWhiteSpace(user.Signature) && user.Signature.EndsWith(".png"))
-        {
-            var fileId = Path.GetFileNameWithoutExtension(user.Signature);
-            await DeleteFile(new DeleteFileInput { Id = long.Parse(fileId) });
-        }
-
-        var res = await UploadFile(file, "Upload/Signature");
-        await sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Signature = $"{res.FilePath}/{res.Name}" }, u => u.Id == user.Id);
-        return res;
-    }
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
+
+using Aliyun.OSS.Util;
+using Furion.VirtualFileServer;
+using OnceMi.AspNetCore.OSS;
+
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统文件服务
+/// </summary>
+[ApiDescriptionSettings(Order = 410)]
+public class SysFileService : IDynamicApiController, ITransient
+{
+    private readonly UserManager _userManager;
+    private readonly SqlSugarRepository<SysFile> _sysFileRep;
+    private readonly OSSProviderOptions _OSSProviderOptions;
+    private readonly UploadOptions _uploadOptions;
+    private readonly IOSSService _OSSService;
+
+    public SysFileService(UserManager userManager,
+        SqlSugarRepository<SysFile> sysFileRep,
+        IOptions<OSSProviderOptions> oSSProviderOptions,
+        IOptions<UploadOptions> uploadOptions,
+        IOSSServiceFactory ossServiceFactory)
+    {
+        _userManager = userManager;
+        _sysFileRep = sysFileRep;
+        _OSSProviderOptions = oSSProviderOptions.Value;
+        _uploadOptions = uploadOptions.Value;
+        if (_OSSProviderOptions.IsEnable)
+            _OSSService = ossServiceFactory.Create(Enum.GetName(_OSSProviderOptions.Provider));
+    }
+
+    /// <summary>
+    /// 获取文件分页列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("获取文件分页列表")]
+    public async Task<SqlSugarPagedList<SysFile>> Page(PageFileInput input)
+    {
+        return await _sysFileRep.AsQueryable()
+            .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="file"></param>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    [DisplayName("上传文件")]
+    public async Task<FileOutput> UploadFile([Required] IFormFile file, [FromQuery] string? path)
+    {
+        var sysFile = await HandleUploadFile(file, path);
+        return new FileOutput
+        {
+            Id = sysFile.Id,
+            Url = sysFile.Url,  // string.IsNullOrWhiteSpace(sysFile.Url) ? _commonService.GetFileUrl(sysFile) : sysFile.Url,
+            SizeKb = sysFile.SizeKb,
+            Suffix = sysFile.Suffix,
+            FilePath = sysFile.FilePath,
+            FileName = sysFile.FileName
+        };
+    }
+
+    /// <summary>
+    /// 上传多文件
+    /// </summary>
+    /// <param name="files"></param>
+    /// <returns></returns>
+    [DisplayName("上传多文件")]
+    public async Task<List<FileOutput>> UploadFiles([Required] List<IFormFile> files)
+    {
+        var filelist = new List<FileOutput>();
+        foreach (var file in files)
+        {
+            filelist.Add(await UploadFile(file, ""));
+        }
+        return filelist;
+    }
+
+    /// <summary>
+    /// 下载文件(文件流)
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("下载文件(文件流)")]
+    public async Task<IActionResult> DownloadFile(FileInput input)
+    {
+        var file = await GetFile(input);
+        var fileName = HttpUtility.UrlEncode(file.FileName, Encoding.GetEncoding("UTF-8"));
+        if (_OSSProviderOptions.IsEnable)
+        {
+            var filePath = string.Concat(file.FilePath, "/", input.Id.ToString() + file.Suffix);
+            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
+        {
+            var filePath = Path.Combine(file.FilePath, input.Id.ToString() + file.Suffix);
+            var path = Path.Combine(App.WebHostEnvironment.WebRootPath, filePath);
+            return new FileStreamResult(new FileStream(path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName + file.Suffix };
+        }
+    }
+
+    /// <summary>
+    /// 删除文件
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
+    [DisplayName("删除文件")]
+    public async Task DeleteFile(DeleteFileInput input)
+    {
+        var file = await _sysFileRep.GetFirstAsync(u => u.Id == input.Id);
+        if (file != null)
+        {
+            await _sysFileRep.DeleteAsync(file);
+
+            if (_OSSProviderOptions.IsEnable)
+            {
+                await _OSSService.RemoveObjectAsync(file.BucketName.ToString(), string.Concat(file.FilePath, "/", $"{input.Id}{file.Suffix}"));
+            }
+            else
+            {
+                var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, file.FilePath, input.Id.ToString() + file.Suffix);
+                if (File.Exists(filePath))
+                    File.Delete(filePath);
+            }
+        }
+    }
+
+    /// <summary>
+    /// 获取文件
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private async Task<SysFile> GetFile([FromQuery] FileInput input)
+    {
+        var file = await _sysFileRep.GetFirstAsync(u => u.Id == input.Id);
+        return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
+    }
+
+    /// <summary>
+    /// 上传文件
+    /// </summary>
+    /// <param name="file">文件</param>
+    /// <param name="savePath">路径</param>
+    /// <returns></returns>
+    private async Task<SysFile> HandleUploadFile(IFormFile file, string savePath)
+    {
+        if (file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
+
+        // 判断是否重复上传的文件
+        var sizeKb = (long)(file.Length / 1024.0); // 大小KB
+        var fileMd5 = string.Empty;
+        if (_uploadOptions.EnableMd5)
+        {
+            using var fileStream = file.OpenReadStream();
+            fileMd5 = OssUtils.ComputeContentMd5(fileStream, fileStream.Length);
+            var sysFile = await _sysFileRep.GetFirstAsync(q => q.FileMd5 == fileMd5 && (q.SizeKb == null || q.SizeKb == sizeKb.ToString()));
+            if (sysFile != null) return sysFile;
+        }
+
+        var path = savePath;
+        if (string.IsNullOrWhiteSpace(savePath))
+        {
+            path = _uploadOptions.Path;
+            var reg = new Regex(@"(\{.+?})");
+            var match = reg.Matches(path);
+            match.ToList().ForEach(a =>
+            {
+                var str = DateTime.Now.ToString(a.ToString().Substring(1, a.Length - 2)); // 每天一个目录
+                path = path.Replace(a.ToString(), str);
+            });
+        }
+
+        if (!_uploadOptions.ContentType.Contains(file.ContentType))
+            throw Oops.Oh(ErrorCodeEnum.D8001);
+
+        if (sizeKb > _uploadOptions.MaxSize)
+            throw Oops.Oh(ErrorCodeEnum.D8002);
+
+        var suffix = Path.GetExtension(file.FileName).ToLower(); // 后缀
+        if (string.IsNullOrWhiteSpace(suffix))
+        {
+            var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
+            suffix = contentTypeProvider.Mappings.FirstOrDefault(u => u.Value == file.ContentType).Key;
+            // 修改 image/jpeg 类型返回的 .jpe 后缀
+            if (suffix == ".jpe")
+                suffix = ".jpg";
+        }
+        if (string.IsNullOrWhiteSpace(suffix))
+            throw Oops.Oh(ErrorCodeEnum.D8003);
+
+        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.ToString(),
+            FilePath = path,
+            FileMd5 = fileMd5,
+        };
+
+        var finalName = newFile.Id + suffix; // 文件最终名称
+        if (_OSSProviderOptions.IsEnable)
+        {
+            newFile.Provider = Enum.GetName(_OSSProviderOptions.Provider);
+            var filePath = string.Concat(path, "/", finalName);
+            await _OSSService.PutObjectAsync(newFile.BucketName, filePath, file.OpenReadStream());
+            //  http://<你的bucket名字>.oss.aliyuncs.com/<你的object名字>
+            //  生成外链地址 方便前端预览
+            switch (_OSSProviderOptions.Provider)
+            {
+                case OSSProvider.Aliyun:
+                    newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{newFile.BucketName}.{_OSSProviderOptions.Endpoint}/{filePath}";
+                    break;
+
+                case OSSProvider.Minio:
+                    // 获取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}";
+                    break;
+            }
+        }
+        else
+        {
+            newFile.Provider = ""; // 本地存储 Provider 显示为空
+            var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, path);
+            if (!Directory.Exists(filePath))
+                Directory.CreateDirectory(filePath);
+
+            var realFile = Path.Combine(filePath, finalName);
+            //IDetector detector;
+            using (var stream = File.Create(realFile))
+            {
+                await file.CopyToAsync(stream);
+                //detector = stream.DetectFiletype();
+            }
+            //var realExt = detector.Extension; // 真实扩展名
+            //// 二次校验扩展名
+            //if (!string.Equals(realExt, suffix.Replace(".", ""), StringComparison.OrdinalIgnoreCase))
+            //{
+            //    var delFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, realFile);
+            //    if (File.Exists(delFilePath))
+            //        File.Delete(delFilePath);
+            //    throw Oops.Oh(ErrorCodeEnum.D8001);
+            //}
+
+            // 生成外链
+            newFile.Url = $"{CommonUtil.GetLocalhost()}/{newFile.FilePath}/{newFile.Id + newFile.Suffix}";
+        }
+        await _sysFileRep.AsInsertable(newFile).ExecuteCommandAsync();
+        return newFile;
+    }
+
+    /// <summary>
+    /// 获取Minio文件的下载或者预览地址
+    /// </summary>
+    /// <param name="bucketName">桶名</param>
+    /// <param name="fileName">文件名</param>
+    /// <returns></returns>
+    private async Task<string> GetMinioPreviewFileUrl(string bucketName, string fileName)
+    {
+        return await _OSSService.PresignedGetObjectAsync(bucketName, fileName, 7);
+    }
+
+    /// <summary>
+    /// 上传头像
+    /// </summary>
+    /// <param name="file"></param>
+    /// <returns></returns>
+    [DisplayName("上传头像")]
+    public async Task<FileOutput> UploadAvatar([Required] IFormFile file)
+    {
+        var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
+        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
+        // 删除当前用户已有头像
+        if (!string.IsNullOrWhiteSpace(user.Avatar))
+        {
+            var fileId = Path.GetFileNameWithoutExtension(user.Avatar);
+            await DeleteFile(new DeleteFileInput { Id = long.Parse(fileId) });
+        }
+
+        var res = await UploadFile(file, "Upload/Avatar");
+        await sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Avatar = $"{res.FilePath}/{res.Name}" }, u => u.Id == user.Id);
+        return res;
+    }
+
+    /// <summary>
+    /// 上传电子签名
+    /// </summary>
+    /// <param name="file"></param>
+    /// <returns></returns>
+    [DisplayName("上传电子签名")]
+    public async Task<FileOutput> UploadSignature([Required] IFormFile file)
+    {
+        var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
+        var user = sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
+        // 删除当前用户已有电子签名
+        if (!string.IsNullOrWhiteSpace(user.Signature) && user.Signature.EndsWith(".png"))
+        {
+            var fileId = Path.GetFileNameWithoutExtension(user.Signature);
+            await DeleteFile(new DeleteFileInput { Id = long.Parse(fileId) });
+        }
+
+        var res = await UploadFile(file, "Upload/Signature");
+        await sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Signature = $"{res.FilePath}/{res.Name}" }, u => u.Id == user.Id);
+        return res;
+    }
 }

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -136,9 +136,7 @@ public class SysUserService : IDynamicApiController, ITransient
     [DisplayName("删除用户")]
     public async Task DeleteUser(DeleteUserInput input)
     {
-        var user = await _sysUserRep.GetFirstAsync(u => u.Id == input.Id);
-        if (user == null)
-            throw Oops.Oh(ErrorCodeEnum.D1002);
+        var user = await _sysUserRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
         if (user.AccountType == AccountTypeEnum.SuperAdmin)
             throw Oops.Oh(ErrorCodeEnum.D1014);
         if (user.Id == _userManager.UserId)

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -81,7 +81,7 @@
 					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						@:<el-form-item label="@column.ColumnComment" prop="@(@column.LowerColumnName)">
 							@:<el-select clearable v-model="ruleForm.@(@column.LowerColumnName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-option v-for="(item,index) in @LowerFirstLetter(@column.DictTypeCode)DropdownList" :key="index" :label="item.name" :value="item.code">{{ item.name }}</el-option>
+								@:<el-option v-for="(item,index) in getConstType('@column.DictTypeCode')" :key="index" :label="item.name" :value="item.code">{{ item.name }}</el-option>
 								@:
 							</el-select>
 							@:
@@ -146,7 +146,7 @@
 	import { ElMessage } from "element-plus";
 	import type { FormRules } from "element-plus";
 @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
-	@:import { getConstSelectorList } from "/@@/utils/constHelper";
+	@:import { getConstType } from "/@@/utils/constHelper";
 	}
 @if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
     @:import { Plus } from "@@element-plus/icons-vue";

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="@(@Model.LowerClassName)-container">
     <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
       @if(Model.QueryWhetherList.Count > 0){
@@ -22,7 +22,7 @@
         }else if(@column.EffectType == "fk"){
         @:<el-form-item label="@column.ColumnComment">
           @:<el-select clearable="" filterable="" v-model="queryParams.@(@column.LowerColumnName)" placeholder="请选择@(@column.ColumnComment)">
-            @:<el-option v-for="(item,index) in @LowerFirstLetter(@column.FkEntityName)DropdownList" :key="index" :value="item.value" :label="item.label" />
+            @:<el-option v-for="(item,index) in  @LowerFirstLetter(@column.FkEntityName)@(@column.ColumnName)DropdownList" :key="index" :value="item.value" :label="item.label" />
             @:
           </el-select>
           @:
@@ -138,6 +138,9 @@
   import { ref } from "vue";
   import { ElMessageBox, ElMessage } from "element-plus";
   import { auth } from '/@@/utils/authFunction';
+  @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
+  @:import { codeToName, getConstType } from "/@@/utils/constHelper";
+  } 
   //import { formatDate } from '/@@/utils/formatTime';
 
   import editDialog from '/@@/views/main/@(@Model.LowerClassName)/component/editDialog.vue'

Web/src/router/backEnd.ts

@@ -40,6 +40,7 @@ export async function initBackEndControlRoutes() {
 	// 触发初始化用户信息 pinia
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
 	await useUserInfo().setUserInfos();
+	await useUserInfo().setConstList();
 	// 获取路由菜单数据
 	const res = await getBackEndControlRoutes();
 	// 无登录权限时，添加判断

Web/src/stores/userInfo.ts

@@ -17,12 +17,12 @@ export const useUserInfo = defineStore('userInfo', {
 		constList: [] as any,
 	}),
 	getters: {
-		// 获取系统常量列表
-		async getSysConstList(): Promise<any[]> {
-			var res = await getAPI(SysConstApi).apiSysConstListGet();
-			this.constList = res.data.result ?? [];
-			return this.constList;
-		},
+		// // 获取系统常量列表
+		// async getSysConstList(): Promise<any[]> {
+		// 	var res = await getAPI(SysConstApi).apiSysConstListGet();
+		// 	this.constList = res.data.result ?? [];
+		// 	return this.constList;
+		// },
 	},
 	actions: {
 		async setUserInfos() {
@@ -34,6 +34,16 @@ export const useUserInfo = defineStore('userInfo', {
 				this.userInfos = userInfos;
 			}
 		},
+        async setConstList() {
+			// 存储用户信息到浏览器缓存
+			if (Session.get('constList')) {
+				this.constList = Session.get('constList');
+			} else {
+				const constList = <any[]>await this.getSysConstList();
+				Session.set('constList', constList);
+				this.constList = constList;
+			}
+		},
 		// 获取当前用户信息
 		getApiUserInfo() {
 			return new Promise((resolve) => {
@@ -76,5 +86,14 @@ export const useUserInfo = defineStore('userInfo', {
 					});
 			});
 		},
+		getSysConstList() {
+			return new Promise((resolve) => {
+				getAPI(SysConstApi)
+					.apiSysConstListGet()
+					.then(async (res: any) => {
+						resolve(res.data.result ?? []);
+					});
+			});
+		},
 	},
 });

Web/src/utils/constHelper.ts

@@ -1,6 +1,5 @@
 import type { App } from 'vue';
 import { useUserInfo } from '/@/stores/userInfo';
-import request from '/@/utils/request';
 
 export function setupConstFilter(app: App) {
 	// 全局过滤器  在vue文件中调用  $filters.codeToName(code,type)
@@ -15,12 +14,8 @@ export function setupConstFilter(app: App) {
 export function codeToName(code: any, type: any) {
 	const userStore = useUserInfo();
 	try {
-		const name = userStore.constList
-			.filter((x: any) => x.code === type)
-			.map((x: any) => x.data)
-			.map((x: any) => x.filter((y: any) => y.code === code))
-			.map((x: any) => x[0].name);
-		return name[0];
+		const name = userStore.constList.find((x: any) => x.code === type).data.result.find((x: any) => x.code === code)?.name;
+		return name;
 	} catch (error) {
 		return code;
 	}
@@ -28,13 +23,6 @@ export function codeToName(code: any, type: any) {
 
 export function getConstType(type: any) {
 	const userStore = useUserInfo();
-	const constType = userStore.constList.filter((x: any) => x.code === type)[0].data;
+	const constType = userStore.constList.filter((x: any) => x.code === type)[0].data.result;
 	return constType;
-}
-
-export function getConstSelectorList(typeName: string) {
-	return request({
-		url: `/api/sysConst/data/${typeName}`,
-		method: 'get',
-	});
-}
+}