Jelajahi Sumber

修复swagger文档枚举值非int类型转换异常问题

zhontai 2 tahun lalu
induk
melakukan
00d31f864b

+ 3 - 4
src/platform/ZhonTai.Admin/Core/Filters/EnumSchemaFilter.cs

@@ -1,9 +1,7 @@
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 using System.Linq;
-using System.Reflection;
 using ZhonTai.Common.Extensions;
 
 namespace ZhonTai.Admin.Core.Filters;
@@ -15,9 +13,10 @@ public class EnumSchemaFilter : ISchemaFilter
         var type = context.Type;
         if (type.IsEnum)
         {
+            var enumValueType = type.GetField("value__").FieldType;
             var items = Enum.GetValues(type).Cast<Enum>()
             .Where(m => !m.ToString().Equals("Null")).Select(x =>
-            $"{x.ToDescription()}={((int)type.InvokeMember(x.ToString(), BindingFlags.GetField, null, null, null))}").ToList();
+            $"{x.ToDescription()}={Convert.ChangeType(x, enumValueType)}").ToList();
 
             if (items?.Count > 0)
             {

+ 22 - 4
src/platform/ZhonTai.Admin/Services/File/Dto/FileGetPageOutput.cs

@@ -1,6 +1,5 @@
 using OnceMi.AspNetCore.OSS;
 using System;
-using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Services.File.Dto;
 
@@ -19,7 +18,6 @@ public class FileGetPageOutput
     /// <summary>
     /// 文件Guid
     /// </summary>
-    [OrderGuid]
     public Guid FileGuid { get; set; }
 
     /// <summary>
@@ -35,10 +33,30 @@ public class FileGetPageOutput
     /// <summary>
     /// 文件大小格式化
     /// </summary>
-    public string SizeFormat { get; }
+    public string SizeFormat { get; set; }
 
     /// <summary>
     /// 链接地址
     /// </summary>
-    public string LinkUrl { get; }
+    public string LinkUrl { get; set; }
+
+    /// <summary>
+    /// 创建者
+    /// </summary>
+    public string CreatedUserName { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? CreatedTime { get; set; }
+
+    /// <summary>
+    /// 修改者
+    /// </summary>
+    public string ModifiedUserName { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? ModifiedTime { get; set; }
 }

+ 20 - 0
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -4309,6 +4309,26 @@
             链接地址
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.File.Dto.FileGetPageOutput.CreatedUserName">
+            <summary>
+            创建者
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.File.Dto.FileGetPageOutput.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.File.Dto.FileGetPageOutput.ModifiedUserName">
+            <summary>
+            修改者
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.File.Dto.FileGetPageOutput.ModifiedTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Services.File.Dto.FileUpdateInput">
             <summary>
             修改