chore: 构建稳定版本

2026-03-20 00:16:37 +08:00 · 2023-12-11 09:55:12 +08:00
parent 098d4bc85f
commit 769a6a9c63
756 changed files with 10431 additions and 19867 deletions
--- a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiConventionalRouteBuilder.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiConventionalRouteBuilder.cs
@@ -0,0 +1,73 @@
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.Mvc.Conventions;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Reflection;
+
+namespace Yi.Framework.AspNetCore.Mvc
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IConventionalRouteBuilder))]
+    public class YiConventionalRouteBuilder : ConventionalRouteBuilder
+    {
+        public YiConventionalRouteBuilder(IOptions<AbpConventionalControllerOptions> options) : base(options)
+        {
+        }
+        public override string Build(
+    string rootPath,
+    string controllerName,
+    ActionModel action,
+    string httpMethod,
+    [CanBeNull] ConventionalControllerSetting configuration)
+        {
+
+            var apiRoutePrefix = GetApiRoutePrefix(action, configuration);
+            var controllerNameInUrl =
+                NormalizeUrlControllerName(rootPath, controllerName, action, httpMethod, configuration);
+
+            var url = $"{apiRoutePrefix}/{rootPath}/{NormalizeControllerNameCase(controllerNameInUrl, configuration)}";
+
+            //Add {id} path if needed
+            var idParameterModel = action.Parameters.FirstOrDefault(p => p.ParameterName == "id");
+            if (idParameterModel != null)
+            {
+                if (TypeHelper.IsPrimitiveExtended(idParameterModel.ParameterType, includeEnums: true))
+                {
+                    url += "/{id}";
+                }
+                else
+                {
+                    var properties = idParameterModel
+                        .ParameterType
+                        .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+                    foreach (var property in properties)
+                    {
+                        url += "/{" + NormalizeIdPropertyNameCase(property, configuration) + "}";
+                    }
+                }
+            }
+
+            //Add action name if needed
+            var actionNameInUrl = NormalizeUrlActionName(rootPath, controllerName, action, httpMethod, configuration);
+            if (!actionNameInUrl.IsNullOrEmpty())
+            {
+                url += $"/{NormalizeActionNameCase(actionNameInUrl, configuration)}";
+
+                //Add secondary Id
+                var secondaryIds = action.Parameters
+                    .Where(p => p.ParameterName.EndsWith("Id", StringComparison.Ordinal)).ToList();
+                if (secondaryIds.Count == 1)
+                {
+                    url += $"/{{{NormalizeSecondaryIdNameCase(secondaryIds[0], configuration)}}}";
+                }
+            }
+
+            return url;
+        }
+
+    }
+}
--- a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiServiceConvention.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiServiceConvention.cs
@@ -0,0 +1,99 @@
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp;
+using Volo.Abp.AspNetCore;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.Conventions;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Reflection;
+
+namespace Yi.Framework.AspNetCore.Mvc
+{
+    [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+    [ExposeServices(typeof(IAbpServiceConvention))]
+    public class YiServiceConvention : AbpServiceConvention
+    {
+        public YiServiceConvention(IOptions<AbpAspNetCoreMvcOptions> options, IConventionalRouteBuilder conventionalRouteBuilder) : base(options, conventionalRouteBuilder)
+        {
+        }
+
+        protected override void ConfigureSelector(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
+        {
+            RemoveEmptySelectors(action.Selectors);
+
+            var remoteServiceAtt = ReflectionHelper.GetSingleAttributeOrDefault<RemoteServiceAttribute>(action.ActionMethod);
+            if (remoteServiceAtt != null && !remoteServiceAtt.IsEnabledFor(action.ActionMethod))
+            {
+                return;
+            }
+
+            if (!action.Selectors.Any())
+            {
+                AddAbpServiceSelector(rootPath, controllerName, action, configuration);
+            }
+            else
+            {
+                NormalizeSelectorRoutes(rootPath, controllerName, action, configuration);
+            }
+        }
+
+
+        protected override void AddAbpServiceSelector(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
+        {
+            if (action.ActionName.ToLower().Contains("vue"))
+            {
+            }
+            base.AddAbpServiceSelector(rootPath, controllerName, action, configuration);
+        }
+
+        protected override void NormalizeSelectorRoutes(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
+        {
+            foreach (var selector in action.Selectors)
+            {
+                var httpMethod = selector.ActionConstraints
+                    .OfType<HttpMethodActionConstraint>()
+                    .FirstOrDefault()?
+                    .HttpMethods?
+                    .FirstOrDefault();
+
+                if (httpMethod == null)
+                {
+                    httpMethod = SelectHttpMethod(action, configuration);
+                }
+
+                if (selector.AttributeRouteModel == null)
+                {
+                    selector.AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod, configuration);
+                }
+                else
+                {
+             
+                    var template = selector.AttributeRouteModel.Template;
+                    if (!template.StartsWith("/"))
+                    {
+                        var route = $"{AbpAspNetCoreConsts.DefaultApiPrefix}/{rootPath}/{template}";
+                        selector.AttributeRouteModel.Template = route;
+
+                    }
+                    
+                }
+
+
+
+                if (!selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Any())
+                {
+                    selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { httpMethod }));
+                }
+
+
+            }
+        }
+
+
+
+    }
+}