Browse Source
Merge pull request #10641 from abpframework/maliming/IsWebSocketRequest
Skip `WebSocketRequest` in `MvcCachedApplicationConfigurationClient`.
pull/10666/head
Halil İbrahim Kalkan
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
3 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
|
|
|
@ -45,11 +45,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client |
|
|
|
var cacheKey = CreateCacheKey(); |
|
|
|
var httpContext = HttpContextAccessor?.HttpContext; |
|
|
|
|
|
|
|
if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration) |
|
|
|
if (httpContext != null && !httpContext.WebSockets.IsWebSocketRequest && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration) |
|
|
|
{ |
|
|
|
|
|
|
|
return configuration; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
configuration = await Cache.GetOrAddAsync( |
|
|
|
cacheKey, |
|
|
|
async () => await ApplicationConfigurationAppService.GetAsync(), |
|
|
|
@ -59,7 +61,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client |
|
|
|
} |
|
|
|
); |
|
|
|
|
|
|
|
if (httpContext != null) |
|
|
|
if (httpContext != null && !httpContext.WebSockets.IsWebSocketRequest) |
|
|
|
{ |
|
|
|
httpContext.Items[cacheKey] = configuration; |
|
|
|
} |
|
|
|
@ -72,7 +74,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client |
|
|
|
var cacheKey = CreateCacheKey(); |
|
|
|
var httpContext = HttpContextAccessor?.HttpContext; |
|
|
|
|
|
|
|
if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration) |
|
|
|
if (httpContext != null && !httpContext.WebSockets.IsWebSocketRequest && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration) |
|
|
|
{ |
|
|
|
return configuration; |
|
|
|
} |
|
|
|
|
