Merge branch 'release/Core_1.1.3'

Author: xljiulang

WebApiClientCore.Extensions.OAuths/TokenProviders/TokenProvider.cs

@@ -9,7 +9,7 @@ namespace WebApiClientCore.Extensions.OAuths.TokenProviders
     /// <summary>
     /// 表示Token提供者抽象类
     /// </summary>
-    public abstract class TokenProvider : Disposable, ITokenProvider
+    public abstract class TokenProvider : ITokenProvider
     {
         /// <summary>
         /// 最近请求到的token
@@ -108,15 +108,6 @@ public async Task<TokenResult> GetTokenAsync()
         /// <returns></returns>
         protected abstract Task<TokenResult?> RefreshTokenAsync(IServiceProvider serviceProvider, string refresh_token);
 
-        /// <summary>
-        /// 释放资源
-        /// </summary>
-        /// <param name="disposing"></param>
-        protected override void Dispose(bool disposing)
-        {
-            this.asyncRoot.Dispose();
-        }
-
         /// <summary>
         /// 转换为string
         /// </summary>

WebApiClientCore.Extensions.OAuths/WebApiClientCore.Extensions.OAuths.csproj

@@ -8,7 +8,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Sign.snk</AssemblyOriginatorKeyFile>
 
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
     <Authors>laojiu</Authors>
     <Company>laojiu</Company>
     <Copyright>Copyright © laojiu 2017-2020</Copyright>

WebApiClientCore/Attributes/ParameterAttributes/PathQueryAttribute.cs

@@ -30,11 +30,21 @@ public override Task OnRequestAsync(ApiParameterContext context)
                 throw new ApiInvalidConfigException(Resx.required_HttpHost);
             }
 
-            var keyValues = context.SerializeToKeyValues().CollectAs(this.CollectionFormat);
+            var keyValues = this.SerializeToKeyValues(context);
             context.HttpContext.RequestMessage.RequestUri = this.CreateUri(uri, keyValues);
             return Task.CompletedTask;
         }
 
+        /// <summary>
+        /// 序列化参数为keyValue
+        /// </summary>
+        /// <param name="context">上下文</param>
+        /// <returns></returns>
+        protected virtual IEnumerable<KeyValue> SerializeToKeyValues(ApiParameterContext context)
+        {
+            return context.SerializeToKeyValues().CollectAs(this.CollectionFormat);
+        }
+
         /// <summary>
         /// 创建新的uri
         /// </summary>

WebApiClientCore/WebApiClientCore.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
     <Authors>laojiu</Authors>
     <Company>laojiu</Company>
     <Copyright>Copyright © laojiu 2017-2020</Copyright>