Create完全缓存

Author: xljiulang

WebApiClientCore.Extensions.OAuths/TokenProviderFactory.cs

@@ -12,7 +12,7 @@ sealed class TokenProviderFactory : ITokenProviderFactory
     {
         private readonly IServiceProvider serviceProvider;
         private readonly TokenProviderFactoryOptions options;
-        private readonly ConcurrentDictionary<Type, ITokenProvider> tokenProviderCache = new ConcurrentDictionary<Type, ITokenProvider>();
+        private readonly ConcurrentDictionary<CacheKey, ITokenProvider> tokenProviderCache = new ConcurrentDictionary<CacheKey, ITokenProvider>();
 
         /// <summary>
         /// 默认的token提供者工厂
@@ -40,15 +40,28 @@ public ITokenProvider Create(Type httpApiType, TypeMatchMode typeMatchMode)
                 throw new ArgumentNullException(nameof(httpApiType));
             }
 
+            var cacheKey = new CacheKey(httpApiType, typeMatchMode);
+            return this.tokenProviderCache.GetOrAdd(cacheKey, this.GetTokenProvider);
+        }
+
+        /// <summary>
+        /// 获取或创建其对应的token提供者
+        /// </summary>
+        /// <param name="cacheKey">缓存的键</param>    
+        /// <returns></returns> 
+        /// <exception cref="InvalidOperationException"></exception>
+        private ITokenProvider GetTokenProvider(CacheKey cacheKey)
+        {
+            var httpApiType = cacheKey.HttpApiType;
             if (this.options.TryGetValue(httpApiType, out var serviceType))
             {
                 var service = this.serviceProvider.GetRequiredService(serviceType);
                 return ((ITokenProviderService)service).TokenProvider;
             }
 
-            if (typeMatchMode == TypeMatchMode.TypeOrBaseTypes)
+            if (cacheKey.TypeMatchMode == TypeMatchMode.TypeOrBaseTypes)
             {
-                return this.tokenProviderCache.GetOrAdd(httpApiType, GetTokenProviderFromBaseType);
+                return this.GetTokenProviderFromBaseType(httpApiType);
             }
 
             throw new InvalidOperationException($"尚未注册{httpApiType}的token提供者");
@@ -72,5 +85,36 @@ private ITokenProvider GetTokenProviderFromBaseType(Type httpApiType)
             }
             throw new InvalidOperationException($"尚未注册{httpApiType}或其基础接口的token提供者");
         }
+
+        /// <summary>
+        /// 缓存的键
+        /// </summary>
+        private class CacheKey : IEquatable<CacheKey>
+        {
+            public Type HttpApiType { get; }
+
+            public TypeMatchMode TypeMatchMode { get; }
+
+            public CacheKey(Type httpApiType, TypeMatchMode typeMatchMode)
+            {
+                this.HttpApiType = httpApiType;
+                this.TypeMatchMode = typeMatchMode;
+            }
+
+            public bool Equals(CacheKey other)
+            {
+                return this.HttpApiType == other.HttpApiType && this.TypeMatchMode == other.TypeMatchMode;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is CacheKey other && this.Equals(other);
+            }
+
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(this.HttpApiType, this.TypeMatchMode);
+            }
+        }
     }
 }