Parcourir la source

😁修复swagger的schemaId重复问题

zuohuaijun il y a 2 ans
Parent
commit
e5f6d15bc4

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatInput.cs

@@ -81,7 +81,7 @@ public class MessageTemplateSendInput
     /// 模板数据,格式形如 { "key1": { "value": any }, "key2": { "value": any } }
     /// </summary>
     [Required(ErrorMessage = "模板数据不能为空")]
-    public Dictionary<string, CgibinMessageTemplateSendRequest.Types.DataItem> Data { get; set; }
+    public Dictionary<string, object> Data { get; set; }
 
     /// <summary>
     /// 模板跳转链接

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs

@@ -78,7 +78,7 @@ public class SendSubscribeMessageInput
     /// 模板内容,格式形如 { "key1": { "value": any }, "key2": { "value": any } }
     /// </summary>
     [Required(ErrorMessage = "模板内容不能为空")]
-    public Dictionary<string, CgibinMessageSubscribeSendRequest.Types.DataItem> Data { get; set; }
+    public Dictionary<string, object> Data { get; set; }
 
     /// <summary>
     /// 跳转小程序类型

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatService.cs

@@ -160,7 +160,7 @@ public class SysWechatService : IDynamicApiController, ITransient
                 AppId = _wechatApiHttpClient._wechatOptions.WechatAppId,
                 PagePath = input.MiniProgramPagePath,
             },
-            Data = input.Data
+            Data = (IDictionary<string, CgibinMessageTemplateSendRequest.Types.DataItem>)input.Data
         };
         var resMessage = await _wechatApiClient.ExecuteCgibinMessageTemplateSendAsync(reqMessage);
         return resMessage;

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs

@@ -145,7 +145,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient
             AccessToken = accessToken,
             TemplateId = input.TemplateId,
             ToUserOpenId = input.ToUserOpenId,
-            Data = input.Data,
+            Data = (IDictionary<string, CgibinMessageSubscribeSendRequest.Types.DataItem>)input.Data,
             MiniProgramState = input.MiniprogramState,
             Language = input.Language,
             MiniProgramPagePath = input.MiniProgramPagePath

+ 1 - 7
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -86,13 +86,7 @@ public class Startup : AppStartup
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
             //.AddXmlSerializerFormatters()
             //.AddXmlDataContractSerializerFormatters()
-            .AddInjectWithUnifyResult<AdminResultProvider>(options =>
-            {
-                options.ConfigureSwaggerGen(gen =>
-                {
-                    gen.CustomSchemaIds(u => u.FullName);
-                });
-            });
+            .AddInjectWithUnifyResult<AdminResultProvider>();
 
         //// 第三方授权登录
         //services.AddAuthentication()