Add `IsRemoteService` and `ApiVersion` to `ControllerApiDescriptionModel`.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiDescriptionExtensions.cs

@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Volo.Abp.Reflection;
+
+namespace Volo.Abp.AspNetCore.Mvc;
+
+public static class ApiDescriptionExtensions
+{
+    public static bool IsRemoteService(this ApiDescription actionDescriptor)
+    {
+        if (actionDescriptor.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
+        {
+            var remoteServiceAttr = ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<RemoteServiceAttribute>(controllerActionDescriptor.MethodInfo);
+            if (remoteServiceAttr != null && remoteServiceAttr.IsEnabled)
+            {
+                return true;
+            }
+
+            remoteServiceAttr = ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<RemoteServiceAttribute>(controllerActionDescriptor.ControllerTypeInfo);
+            if (remoteServiceAttr != null && remoteServiceAttr.IsEnabled)
+            {
+                return true;
+            }
+
+            if (typeof(IRemoteService).IsAssignableFrom(controllerActionDescriptor.ControllerTypeInfo))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpRemoteServiceApiDescriptionProvider.cs

@@ -42,7 +42,7 @@ public class AbpRemoteServiceApiDescriptionProvider : IApiDescriptionProvider, I
     {
         foreach (var apiResponseType in GetApiResponseTypes())
         {
-            foreach (var result in context.Results.Where(IsRemoteService))
+            foreach (var result in context.Results.Where(x => x.IsRemoteService()))
             {
                 var actionProducesResponseTypeAttributes =
                     ReflectionHelper.GetAttributesOfMemberOrDeclaringType<ProducesResponseTypeAttribute>(
@@ -85,29 +85,4 @@ public class AbpRemoteServiceApiDescriptionProvider : IApiDescriptionProvider, I
 
         return _options.SupportedResponseTypes;
     }
-
-    protected virtual bool IsRemoteService(ApiDescription actionDescriptor)
-    {
-        if (actionDescriptor.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
-        {
-            var remoteServiceAttr = ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<RemoteServiceAttribute>(controllerActionDescriptor.MethodInfo);
-            if (remoteServiceAttr != null && remoteServiceAttr.IsEnabled)
-            {
-                return true;
-            }
-
-            remoteServiceAttr = ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<RemoteServiceAttribute>(controllerActionDescriptor.ControllerTypeInfo);
-            if (remoteServiceAttr != null && remoteServiceAttr.IsEnabled)
-            {
-                return true;
-            }
-
-            if (typeof(IRemoteService).IsAssignableFrom(controllerActionDescriptor.ControllerTypeInfo))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Versioning;
 using Microsoft.Extensions.Logging;
@@ -65,12 +66,16 @@ public class AspNetCoreApiDescriptionModelProvider : IApiDescriptionModelProvide
             }
         }
 
-        foreach (var (moduleName, module) in model.Modules)
+        foreach (var (_, module) in model.Modules)
         {
             var controllers = module.Controllers.GroupBy(x => x.Value.Type).ToList();
             foreach (var controller in controllers.Where(x => x.Count() > 1))
             {
-                module.Controllers.RemoveAll(x => controller.OrderBy(c => c.Value.ControllerGroupName).Skip(1).Contains(x));
+                var removedController = module.Controllers.RemoveAll(x => x.Value.IsRemoteService && controller.OrderBy(c => c.Value.ControllerGroupName).Skip(1).Contains(x));
+                foreach (var removed in removedController)
+                {
+                    Logger.LogInformation($"The controller named '{removed.Value.Type}' was removed from ApplicationApiDescriptionModel because it same with other controller.");
+                }
             }
         }
 
@@ -97,8 +102,9 @@ public class AspNetCoreApiDescriptionModelProvider : IApiDescriptionModelProvide
         var controllerModel = moduleModel.GetOrAddController(
             _options.ControllerNameGenerator(controllerType, setting),
             FindGroupName(controllerType) ?? apiDescription.GroupName,
-            controllerType,
+            apiDescription.IsRemoteService(),
             apiDescription.GetProperty<ApiVersion>()?.ToString(),
+            controllerType,
             _modelOptions.IgnoredInterfaces
         );
 

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ControllerApiDescriptionModel.cs

@@ -12,6 +12,10 @@ public class ControllerApiDescriptionModel
 
     public string ControllerGroupName { get; set; }
 
+    public bool IsRemoteService { get; set; }
+
+    public string ApiVersion { get; set; }
+
     public string Type { get; set; }
 
     public List<ControllerInterfaceApiDescriptionModel> Interfaces { get; set; }
@@ -23,12 +27,14 @@ public class ControllerApiDescriptionModel
 
     }
 
-    public static ControllerApiDescriptionModel Create(string controllerName, string groupName, Type type, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
+    public static ControllerApiDescriptionModel Create(string controllerName, string groupName, bool isRemoteService, string apiVersion, Type type, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
     {
         return new ControllerApiDescriptionModel
         {
             ControllerName = controllerName,
             ControllerGroupName = groupName,
+            IsRemoteService = isRemoteService,
+            ApiVersion = apiVersion,
             Type = type.FullName,
             Actions = new Dictionary<string, ActionApiDescriptionModel>(),
             Interfaces = type

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModuleApiDescriptionModel.cs

@@ -49,10 +49,10 @@ public class ModuleApiDescriptionModel
         return Controllers[controller.Type] = controller;
     }
 
-    public ControllerApiDescriptionModel GetOrAddController(string name, string groupName, Type type, [CanBeNull]string apiVersion, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
+    public ControllerApiDescriptionModel GetOrAddController(string name, string groupName, bool isRemoteService, string apiVersion, Type type, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
     {
         var key = apiVersion.IsNullOrWhiteSpace() ? type.FullName : $"{apiVersion + "."}{type.FullName}";
-        return Controllers.GetOrAdd(key, () => ControllerApiDescriptionModel.Create(name, groupName, type, ignoredInterfaces));
+        return Controllers.GetOrAdd(key, () => ControllerApiDescriptionModel.Create(name, groupName, isRemoteService, apiVersion, type, ignoredInterfaces));
     }
 
     public ModuleApiDescriptionModel CreateSubModel(string[] controllers, string[] actions)