diff --git a/OpenAuth.App/Base/PageReq.cs b/OpenAuth.App/Base/PageReq.cs index 73eb9695..8fcc1c72 100644 --- a/OpenAuth.App/Base/PageReq.cs +++ b/OpenAuth.App/Base/PageReq.cs @@ -2,7 +2,15 @@ { public class PageReq { + /// + /// 页码 + /// + /// 1 public int page { get; set; } + /// + /// 每页条数 + /// + /// 10 public int limit { get; set; } public string key { get; set; } diff --git a/OpenAuth.App/SSO/PassportLoginRequest.cs b/OpenAuth.App/SSO/PassportLoginRequest.cs index 4d25b309..3e779070 100644 --- a/OpenAuth.App/SSO/PassportLoginRequest.cs +++ b/OpenAuth.App/SSO/PassportLoginRequest.cs @@ -12,6 +12,7 @@ namespace OpenAuth.App.SSO /// /// 应用的AppSecrect,目前没判定可以随便填一个。如果需要判定请根据注释调整LoginParse.Do方法 /// + /// openauth public string AppKey { get; set; } public void Trim() diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs index ee35ab65..ea8d4a2f 100644 --- a/OpenAuth.WebApi/Startup.cs +++ b/OpenAuth.WebApi/Startup.cs @@ -41,13 +41,13 @@ namespace OpenAuth.WebApi public void ConfigureServices(IServiceCollection services) { services.Configure(options => { options.SuppressModelStateInvalidFilter = true; }); - - services.AddSingleton(provider => + + //在startup中需要强制创建log4net + var loggerFactory = LoggerFactory.Create(builder => { - var service = provider.GetRequiredService>(); - return new StartupLogger(service); + builder.AddLog4Net(); }); - var logger = services.BuildServiceProvider().GetRequiredService(); + ILogger logger = loggerFactory.CreateLogger(); var identityServer = ((ConfigurationSection) Configuration.GetSection("AppSetting:IdentityServerUrl")).Value; @@ -215,7 +215,7 @@ namespace OpenAuth.WebApi controller.Name.Replace("Controller", "")); } - c.DocExpansion(DocExpansion.None); + c.DocExpansion(DocExpansion.List); //默认展开列表 c.OAuthClientId("OpenAuth.WebApi"); //oauth客户端名称 c.OAuthAppName("开源版webapi认证"); // 描述 });