Merge branch dev with rel-9.0

framework/src/Volo.Abp.Swashbuckle/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs

@@ -16,7 +16,6 @@ public static IApplicationBuilder UseAbpSwaggerUI(
         return app.UseSwaggerUI(options =>
         {
             options.InjectJavascript("ui/abp.js");
-            options.InjectJavascript("ui/abp.swagger.js");
             options.IndexStream = () => resolver?.Resolver();
 
             setupAction?.Invoke(options);

framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/SwaggerHtmlResolver.cs

@@ -10,12 +10,14 @@ public class SwaggerHtmlResolver : ISwaggerHtmlResolver, ITransientDependency
 {
     public virtual Stream Resolver()
     {
+        var scriptBundleScript = "<script src=\"%(ScriptBundlePath)\" charset=\"utf-8\"></script>";
+        var abpSwaggerScript = "<script src=\"ui/abp.swagger.js\" charset=\"utf-8\"></script>";
         var stream = typeof(SwaggerUIOptions).GetTypeInfo().Assembly
             .GetManifestResourceStream("Swashbuckle.AspNetCore.SwaggerUI.index.html");
 
         var html = new StreamReader(stream!)
             .ReadToEnd()
-            .Replace("src=\"index.js\"", "src=\"ui/index.js\"");
+            .Replace(scriptBundleScript, $"{scriptBundleScript}\n{abpSwaggerScript}");
 
         return new MemoryStream(Encoding.UTF8.GetBytes(html));
     }

framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js

@@ -1,9 +1,10 @@
 var abp = abp || {};
 
 (function () {
-
-    abp.SwaggerUIBundle = function (configObject) {
-
+
+    var oldSwaggerUIBundle = SwaggerUIBundle;
+
+    SwaggerUIBundle = function (configObject) {
         var excludeUrl = ["swagger.json", "connect/token"]
         var firstRequest = true;
         var oidcSupportedFlows = configObject.oidcSupportedFlows || [];
@@ -109,6 +110,9 @@ var abp = abp || {};
             });
         }
 
-        return SwaggerUIBundle(configObject);
+        return oldSwaggerUIBundle(configObject);
     }
+
+    SwaggerUIBundle = Object.assign(SwaggerUIBundle, oldSwaggerUIBundle);
+
 })();