This commit is contained in:
lwh 2023-06-05 07:53:22 +08:00
parent 527083363a
commit f0083d5b68
4 changed files with 23 additions and 7 deletions

View File

@ -43,7 +43,7 @@ namespace ARW.Model
PageSize = 10; PageSize = 10;
} }
public PagerInfo(int page = 1, int pageSize = 20) public PagerInfo(int page = 1, int pageSize = 10)
{ {
PageNum = page; PageNum = page;
PageSize = pageSize; PageSize = pageSize;

View File

@ -399,13 +399,13 @@ namespace ARW.Repository
public static async Task<PagedInfo<T>> ToPageAsync<T>(this ISugarQueryable<T> source, PagerInfo parm) public static async Task<PagedInfo<T>> ToPageAsync<T>(this ISugarQueryable<T> source, PagerInfo parm)
{ {
var page = new PagedInfo<T>(); var page = new PagedInfo<T>();
var total = 0; RefAsync<int> totalNumberRef = 0;
page.PageSize = parm.PageSize; page.PageSize = parm.PageSize;
page.PageIndex = parm.PageNum; page.PageIndex = parm.PageNum;
page.Result = await source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") page.Result = await source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}")
.ToPageListAsync(parm.PageNum, parm.PageSize); .ToPageListAsync(parm.PageNum, parm.PageSize, totalNumberRef);
page.TotalNum = total; page.TotalNum = totalNumberRef;
return page; return page;
} }

View File

@ -59,11 +59,19 @@ namespace ARW.Service.System
using (var stream = new FileStream(finalFilePath, FileMode.Create)) using (var stream = new FileStream(finalFilePath, FileMode.Create))
{ {
if (fileSize > 100) // 图片压缩
if (IsImageExtension(fileExt))
{ {
GetPicThumbnail(formFile, 0, 0, 90, stream); if (fileSize > 100)
{
GetPicThumbnail(formFile, 0, 0, 90, stream);
}
else
{
await formFile.CopyToAsync(stream);
}
} }
else else //视频压缩
{ {
await formFile.CopyToAsync(stream); await formFile.CopyToAsync(stream);
} }
@ -243,5 +251,11 @@ namespace ARW.Service.System
} }
#endregion #endregion
private bool IsImageExtension(string extension)
{
return extension == ".jpg" || extension == ".jpeg" || extension == ".png" || extension == ".gif";
}
} }
} }

View File

@ -100,6 +100,8 @@ namespace ARW.Admin.WebApi.Controllers
if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空"); if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空");
SysFile file = new(); SysFile file = new();
string fileExt = Path.GetExtension(formFile.FileName);//文件后缀 string fileExt = Path.GetExtension(formFile.FileName);//文件后缀
// 文件名称(不包括后缀)
//fileName = Path.GetFileNameWithoutExtension(formFile.FileName);
double fileSize = Math.Round(formFile.Length / 1024.0, 2);//文件大小KB double fileSize = Math.Round(formFile.Length / 1024.0, 2);//文件大小KB
string[] NotAllowedFileExtensions = new string[] { ".bat", ".exe", ".jar", ".js" }; string[] NotAllowedFileExtensions = new string[] { ".bat", ".exe", ".jar", ".js" };
int MaxContentLength = 15; int MaxContentLength = 15;