tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 06:42:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/13.2.1'

Browse Source
This commit is contained in:
Thiago Loureiro de Azevedo 2019-03-23 22:41:04 +01:00
commit 4ee63040b9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Ocelot/DependencyInjection/OcelotBuilder.cs
View File

@ -72,7 +72,7 @@ namespace Ocelot.DependencyInjection
Services.TryAddSingleton<IAuthenticationOptionsCreator, AuthenticationOptionsCreator>(); Services.TryAddSingleton<IAuthenticationOptionsCreator, AuthenticationOptionsCreator>();
Services.TryAddSingleton<IUpstreamTemplatePatternCreator, UpstreamTemplatePatternCreator>(); Services.TryAddSingleton<IUpstreamTemplatePatternCreator, UpstreamTemplatePatternCreator>();
Services.TryAddSingleton<IRequestIdKeyCreator, RequestIdKeyCreator>(); Services.TryAddSingleton<IRequestIdKeyCreator, RequestIdKeyCreator>();
Services.TryAddSingleton<IServiceProviderConfigurationCreator,ServiceProviderConfigurationCreator>(); Services.TryAddSingleton<IServiceProviderConfigurationCreator, ServiceProviderConfigurationCreator>();
Services.TryAddSingleton<IQoSOptionsCreator, QoSOptionsCreator>(); Services.TryAddSingleton<IQoSOptionsCreator, QoSOptionsCreator>();
Services.TryAddSingleton<IReRouteOptionsCreator, ReRouteOptionsCreator>(); Services.TryAddSingleton<IReRouteOptionsCreator, ReRouteOptionsCreator>();
Services.TryAddSingleton<IRateLimitOptionsCreator, RateLimitOptionsCreator>(); Services.TryAddSingleton<IRateLimitOptionsCreator, RateLimitOptionsCreator>();
@ -144,7 +144,6 @@ namespace Ocelot.DependencyInjection
Services.AddWebEncoders(); Services.AddWebEncoders();
} }
public IOcelotBuilder AddSingletonDefinedAggregator<T>() public IOcelotBuilder AddSingletonDefinedAggregator<T>()
where T : class, IDefinedAggregator where T : class, IDefinedAggregator
{ {
@ -168,10 +167,11 @@ namespace Ocelot.DependencyInjection
public IOcelotBuilder AddDelegatingHandler<THandler>(bool global = false) public IOcelotBuilder AddDelegatingHandler<THandler>(bool global = false)
where THandler : DelegatingHandler where THandler : DelegatingHandler
{ {
if(global) if (global)
{ {
Services.AddTransient<THandler>(); Services.AddTransient<THandler>();
Services.AddTransient<GlobalDelegatingHandler>(s =>{ Services.AddTransient<GlobalDelegatingHandler>(s =>
{
var service = s.GetService<THandler>(); var service = s.GetService<THandler>();
return new GlobalDelegatingHandler(service); return new GlobalDelegatingHandler(service);
}); });

1
src/Ocelot/Middleware/Multiplexer/SimpleJsonResponseAggregator.cs
View File

@ -37,7 +37,6 @@ namespace Ocelot.Middleware.Multiplexer
var content = await contexts[0].DownstreamResponse.Content.ReadAsStringAsync(); var content = await contexts[0].DownstreamResponse.Content.ReadAsStringAsync();
contentBuilder.Append($"\"{responseKeys[k]}\":{content}"); contentBuilder.Append($"\"{responseKeys[k]}\":{content}");
} }
else else
{ {