diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs index d40f85925..78534abe9 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs @@ -89,6 +89,16 @@ namespace Ocelot.Multiplexer responseObject.Merge(contentObject, mergeSetting); } } + + if (responseObject == null) + { + return new DownstreamResponse( + null, + HttpStatusCode.NotFound, + new List>>(), + "Not Found"); + } + var stringContent = new StringContent(responseObject.ToString()) { Headers = { ContentType = new MediaTypeHeaderValue("application/json") } diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json index 4043370d4..52fece402 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json @@ -2034,8 +2034,7 @@ "wechat-setting-global", "tencent-cloud-setting-global", "aliyun-setting-global", - "oss-management-setting-global", - "invoice-setting-global" + "oss-management-setting-global" ], "UpstreamPathTemplate": "/api/setting-management/settings/by-global", "Aggregator": "AbpResponseMergeAggregator", @@ -2047,8 +2046,7 @@ "wechat-setting-current-tenant", "tencent-cloud-setting-current-tenant", "aliyun-setting-current-tenant", - "oss-management-setting-current-tenant", - "invoice-setting-current-tenant" + "oss-management-setting-current-tenant" ], "UpstreamPathTemplate": "/api/setting-management/settings/by-current-tenant", "Aggregator": "AbpResponseMergeAggregator", @@ -2056,8 +2054,7 @@ }, { "RouteKeys": [ - "setting-current-user", - "manufacture-setting-current-user" + "setting-current-user" ], "UpstreamPathTemplate": "/api/setting-management/settings/by-current-user", "Aggregator": "AbpResponseMergeAggregator",