From f0083d5b6826df113cbf4e0a2148a3a2f08ce123 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Mon, 5 Jun 2023 07:53:22 +0800
Subject: [PATCH] init

---
 ARW.Model/PagerInfo.cs                     |  2 +-
 ARW.Repository/BaseRepository.cs           |  6 +++---
 ARW.Service/System/SysFileService.cs       | 20 +++++++++++++++++---
 ARW.WebApi/Controllers/CommonController.cs |  2 ++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ARW.Model/PagerInfo.cs b/ARW.Model/PagerInfo.cs
index b185410..26ca208 100644
--- a/ARW.Model/PagerInfo.cs
+++ b/ARW.Model/PagerInfo.cs
@@ -43,7 +43,7 @@ namespace ARW.Model
             PageSize = 10;
         }
 
-        public PagerInfo(int page = 1, int pageSize = 20)
+        public PagerInfo(int page = 1, int pageSize = 10)
         {
             PageNum = page;
             PageSize = pageSize;
diff --git a/ARW.Repository/BaseRepository.cs b/ARW.Repository/BaseRepository.cs
index 69fc9b7..c50b538 100644
--- a/ARW.Repository/BaseRepository.cs
+++ b/ARW.Repository/BaseRepository.cs
@@ -399,13 +399,13 @@ namespace ARW.Repository
         public static async Task<PagedInfo<T>> ToPageAsync<T>(this ISugarQueryable<T> source, PagerInfo parm)
         {
             var page = new PagedInfo<T>();
-            var total = 0;
+            RefAsync<int> totalNumberRef = 0;
             page.PageSize = parm.PageSize;
             page.PageIndex = parm.PageNum;
 
             page.Result = await source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}")
-                .ToPageListAsync(parm.PageNum, parm.PageSize);
-            page.TotalNum = total;
+                .ToPageListAsync(parm.PageNum, parm.PageSize, totalNumberRef);
+            page.TotalNum = totalNumberRef;
             return page;
         }
 
diff --git a/ARW.Service/System/SysFileService.cs b/ARW.Service/System/SysFileService.cs
index 0d46da6..2e510df 100644
--- a/ARW.Service/System/SysFileService.cs
+++ b/ARW.Service/System/SysFileService.cs
@@ -59,11 +59,19 @@ namespace ARW.Service.System
 
             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);
                 }
@@ -243,5 +251,11 @@ namespace ARW.Service.System
         }
         #endregion
 
+
+        private bool IsImageExtension(string extension)
+        {
+            return extension == ".jpg" || extension == ".jpeg" || extension == ".png" || extension == ".gif";
+        }
+
     }
 }
diff --git a/ARW.WebApi/Controllers/CommonController.cs b/ARW.WebApi/Controllers/CommonController.cs
index de958a9..925dbef 100644
--- a/ARW.WebApi/Controllers/CommonController.cs
+++ b/ARW.WebApi/Controllers/CommonController.cs
@@ -100,6 +100,8 @@ namespace ARW.Admin.WebApi.Controllers
             if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空");
             SysFile file = new();
             string fileExt = Path.GetExtension(formFile.FileName);//文件后缀
+            // 文件名称（不包括后缀）
+            //fileName = Path.GetFileNameWithoutExtension(formFile.FileName);
             double fileSize = Math.Round(formFile.Length / 1024.0, 2);//文件大小KB
             string[] NotAllowedFileExtensions = new string[] { ".bat", ".exe", ".jar", ".js" };
             int MaxContentLength = 15;