Merge remote-tracking branch 'origin/Api-Versioning' into Api-Versioning

abpframework · Feb 11, 2022 · 8d0ac6b · 8d0ac6b
2 parents c50d29b + d3e918b
commit 8d0ac6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ork/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/CurrentApiVersionInfo.cs b/...ork/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/CurrentApiVersionInfo.cs
@@ -4,7 +4,7 @@
 
 namespace Volo.Abp.Http.Client.ClientProxying;
 
-public class CurrentApiVersionInfo : ICurrentApiVersionInfo, ITransientDependency
+public class CurrentApiVersionInfo : ICurrentApiVersionInfo, ISingletonDependency
 {
     public ApiVersionInfo ApiVersionInfo => _currentApiVersionInfo.Value;
 

diff --git a/...olo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs b/...olo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs
@@ -114,7 +114,7 @@ private static void AddActionScript(StringBuilder script, string controllerName,
         if (versionParam != null)
         {
             var version = FindBestApiVersion(action);
-            script.AppendLine($"      var {ProxyScriptingJsFuncHelper.NormalizeJsVariableName(versionParam.Name)} = '{version}';");
+            script.AppendLine($"      var {ProxyScriptingJsFuncHelper.NormalizeJsVariableName(versionParam.Name)} = api_version ? api_version : '{version}';");
         }
 
         script.AppendLine("      return abp.ajax($.extend(true, {");