From b9acc164d8bbd8e723afe42f91b5fbddeab85565 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 29 Dec 2025 19:21:28 +0800
Subject: [PATCH] Optimize cache key retrieval in configuration client

---
 ...MvcCachedApplicationConfigurationClient.cs | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
index 9f9205f92d..b4e81c986a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs
@@ -42,8 +42,21 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu
 
     public virtual async Task<ApplicationConfigurationDto> GetAsync()
     {
-        var cacheKey = await CreateCacheKeyAsync();
+        string? cacheKey = null;
         var httpContext = HttpContextAccessor?.HttpContext;
+        if (httpContext != null && httpContext.Items["ApplicationConfigurationDto_CacheKey"] is string key)
+        {
+            cacheKey = key;
+        }
+
+        if (cacheKey.IsNullOrWhiteSpace())
+        {
+            cacheKey = await CreateCacheKeyAsync();
+            if (httpContext != null)
+            {
+                httpContext.Items["ApplicationConfigurationDto_CacheKey"] = cacheKey;
+            }
+        }
 
         if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
         {
@@ -90,8 +103,21 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu
 
     public ApplicationConfigurationDto Get()
     {
-        var cacheKey = AsyncHelper.RunSync(CreateCacheKeyAsync);
+        string? cacheKey = null;
         var httpContext = HttpContextAccessor?.HttpContext;
+        if (httpContext != null && httpContext.Items["ApplicationConfigurationDto_CacheKey"] is string key)
+        {
+            cacheKey = key;
+        }
+
+        if (cacheKey.IsNullOrWhiteSpace())
+        {
+            cacheKey = AsyncHelper.RunSync(CreateCacheKeyAsync);
+            if (httpContext != null)
+            {
+                httpContext.Items["ApplicationConfigurationDto_CacheKey"] = cacheKey;
+            }
+        }
 
         if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
         {