Просмотр исходного кода

😎修复文件上传接口错误

zuohuaijun 2 лет назад
Родитель
Сommit
5c335f8321

+ 9 - 9
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -261,16 +261,16 @@ public static partial class ObjectExtension
     public static string ParseToDateTimeForRep(this string str)
     {
         if (string.IsNullOrWhiteSpace(str))
+            str = $"{DateTime.Now.Year}/{DateTime.Now.Month}/{DateTime.Now.Day}";
+
+        var date = DateTime.Now;
+        var reg = new Regex(@"(\{.+?})");
+        var match = reg.Matches(str);
+        match.ToList().ForEach(u =>
         {
-            var date = DateTime.Now;
-            var reg = new Regex(@"(\{.+?})");
-            var match = reg.Matches(str);
-            match.ToList().ForEach(a =>
-            {
-                var str = date.ToString(a.ToString().Substring(1, a.Length - 2));
-                str = str.Replace(a.ToString(), str);
-            });
-        }
+            var temp = date.ToString(u.ToString().Substring(1, u.Length - 2));
+            str = str.Replace(u.ToString(), temp);
+        });
         return str;
     }
 

+ 2 - 1
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -291,7 +291,8 @@ public class SysFileService : IDynamicApiController, ITransient
         if (!VerifyFileExtensionName.IsSameType(file.OpenReadStream(), suffix))
             throw Oops.Oh(ErrorCodeEnum.D8001);
 
-        var path = savePath.ParseToDateTimeForRep();
+        var path = string.IsNullOrWhiteSpace(savePath) ? _uploadOptions.Path : savePath;
+        path = path.ParseToDateTimeForRep();
         var newFile = new SysFile
         {
             Id = YitIdHelper.NextId(),