diff --git a/Directory.Build.props b/Directory.Build.props index dfff247..6bdeda8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 8.0.1 + 8.0.2 diff --git a/src/InterfaceForward.Api/InterfaceForwardApiModule.cs b/src/InterfaceForward.Api/InterfaceForwardApiModule.cs index 47a9da4..1a39f30 100644 --- a/src/InterfaceForward.Api/InterfaceForwardApiModule.cs +++ b/src/InterfaceForward.Api/InterfaceForwardApiModule.cs @@ -64,30 +64,7 @@ public class InterfaceForwardApiModule : FakeModule options.SerializerSettings.Converters.Add(new LongJsonConverter()); }); - services.AddFakeSwaggerGen(options => - { - options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme() - { - Description = "JWT授权数据将在请求头中进行传输,在下方输入Bearer {token} 即可,注意两者之间有空格", - Name = "Authorization", - In = ParameterLocation.Header, - Type = SecuritySchemeType.ApiKey - }); - options.AddSecurityRequirement(new OpenApiSecurityRequirement - { - { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference() - { - Id = "Bearer", - Type = ReferenceType.SecurityScheme - } - }, - [] - } - }); - }) + services.AddFakeSwaggerGen(addSecurity: true) .AddFakeAspNetCoreAuditing(); services.AddCors(options => @@ -131,6 +108,9 @@ public class InterfaceForwardApiModule : FakeModule // Add Aspire default endpoints. app.MapDefaultEndpoints(); + // 虚拟路由-网关适配 + app.UsePathBase(app.Configuration["ASPNETCORE_PATHBASE"]); + // Configure the HTTP request pipeline. app.UseFakeSwagger(); diff --git a/src/InterfaceForward.Api/Program.cs b/src/InterfaceForward.Api/Program.cs index 5f97342..9474ca4 100644 --- a/src/InterfaceForward.Api/Program.cs +++ b/src/InterfaceForward.Api/Program.cs @@ -4,6 +4,7 @@ using Serilog; var builder = WebApplication.CreateSlimBuilder(args); var configuration = builder.Configuration; builder.Configuration.AddConsul("idwms/itfxapi", source => source.ReloadOnChange = true); +builder.Configuration.AddConsul("idwms/common"); Log.Logger = new LoggerConfiguration() .ReadFrom.Configuration(configuration) .CreateLogger();