修复 Use 无法依赖注入问题

修复 FreeSql 没有字符串链接的时候异常问题
增加了部分测试

Gear.Test.Api/Controllers/WeatherForecastController.cs

@@ -1,4 +1,5 @@
 using Gear.Abstractions;
+using Gear.Test.Api.Uses;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
@@ -15,7 +16,7 @@ namespace Gear.Test.Api.Controllers
         {
             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
         };
-
+        private ITestUse TestUse => LazyServiceProvider.LazyGetService<ITestUse>();
 
         public IEnumerable<WeatherForecast> Get()
         {
@@ -30,5 +31,9 @@ namespace Gear.Test.Api.Controllers
             })
             .ToArray();
         }
+        public string GetUse()
+        {
+            return TestUse.HelloUse();
+        }
     }
 }

Gear.Test.Api/Uses/ITestUse.cs

@@ -0,0 +1,13 @@
+using Gear.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Gear.Test.Api.Uses
+{
+    public interface ITestUse 
+    {
+        string HelloUse();
+    }
+}

Gear.Test.Api/Uses/TestUse.cs

@@ -0,0 +1,16 @@
+using Gear.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Gear.Test.Api.Uses
+{
+    public class TestUse : Use, ITestUse
+    {
+        public string HelloUse()
+        {
+            return "Hello Use!";
+        }
+    }
+}

Gear/Gear.csproj

@@ -8,7 +8,7 @@
 		<Company>全网科技</Company>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageId>Gear</PackageId>
-		<Version>0.1.7</Version>
+		<Version>0.1.8</Version>
 		<Product>Gear</Product>
 		<AssemblyName>Gear</AssemblyName>
 	</PropertyGroup>

Gear/Gear/Infrastructure/Extensions/FreeSqlManager.cs

@@ -32,7 +32,12 @@ namespace Gear.Infrastructure.Extensions
         }
         public static IFreeSql GetFreeSql(string configurationKey = "ConnectionString")
         {
-            return ib.Get(configurationKey);
+            if (ib.GetKeys().Any(o => o == configurationKey))
+            {
+                return ib.Get(configurationKey);
+            }
+
+            return null;
         }
     }
 }

Gear/Gear/Infrastructure/Extensions/ServiceCollectionServiceExtensions.cs

@@ -16,6 +16,7 @@ using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.Grafana.Loki;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Loader;
@@ -42,62 +43,103 @@ namespace Gear.Infrastructure.Extensions
                 assemblies.Add(typeof(ServiceCollectionServiceExtensions).Assembly);
             }
 
+            services.AddLocalServiceLifetime(assemblies);
+
+            services.AddHttpContextAccessor();
+
+            services.AddAutoMapper(assemblies);
+
+            services.Configure<MvcOptions>(options =>
+            {
+                options.Conventions.Add(new ApplicationConvention());
+                options.Filters.Add<DefaultApiResponseFilter>();
+                options.Filters.Add<RunParameterActionFilter>();
+            });
+
+            return services;
+        }
+
+        private static void AddLocalServiceLifetime(this IServiceCollection services, List<Assembly> assemblies)
+        {
             foreach (var assembly in assemblies)
             {
                 var types = assembly.GetTypes();
 
-                foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+                services.AddUses(types);
-                typeof(ITransientDependency) != o && typeof(ITransientDependency).IsAssignableFrom(o)))
-                {
-                    var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
 
-                    if (interfaceType != null)
+                services.AddTransientDependency(types);
-                        services.TryAddTransient(interfaceType, type);
-                    else
-                        services.TryAddTransient(type, type);
 
-                }
+                services.AddSingletonDependency(types);
 
-                foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+                services.AddScopedDependency(types);
-                typeof(ISingletonDependency) != o && typeof(ISingletonDependency).IsAssignableFrom(o)))
+            }
-                {
+        }
-                    var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
-
-                    if (interfaceType != null)
-                        services.TryAddSingleton(interfaceType, type);
-                    else
-                        services.TryAddSingleton(type, type);
 
-                }
+        private static void AddUses(this IServiceCollection services, Type[] types)
+        {
+            foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+                !typeof(AppService).IsAssignableFrom(o) &&
+                typeof(Use) != o &&
+                typeof(Use).IsAssignableFrom(o)))
+            {
+                var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
 
-                foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+                services.TryAddTransient(type, type);
-                typeof(IScopedDependency) != o && typeof(IScopedDependency).IsAssignableFrom(o)))
+                services.TryAddTransient(interfaceType, o =>
                 {
-                    var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
+                    Use use = (Use)o.GetService(type);
+                    use.LazyServiceProvider = o.GetService<ILazyServiceProvider>();
+                    return use;
+                });
+            }
+        }
 
-                    if (interfaceType != null)
+        private static void AddScopedDependency(this IServiceCollection services, Type[] types)
-                        services.TryAddScoped(interfaceType, type);
+        {
-                    else
+            foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
-                        services.TryAddScoped(type, type);
+            typeof(IScopedDependency) != o && typeof(IScopedDependency).IsAssignableFrom(o)))
+            {
+                var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
 
-                }
+                if (interfaceType != null)
+                    services.TryAddScoped(interfaceType, type);
+                else
+                    services.TryAddScoped(type, type);
 
             }
+        }
 
-            services.AddHttpContextAccessor();
+        private static void AddSingletonDependency(this IServiceCollection services, Type[] types)
+        {
+            foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+            typeof(ISingletonDependency) != o && typeof(ISingletonDependency).IsAssignableFrom(o)))
+            {
+                var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
 
-            services.AddAutoMapper(assemblies);
+                if (interfaceType != null)
+                    services.TryAddSingleton(interfaceType, type);
+                else
+                    services.TryAddSingleton(type, type);
 
-            services.Configure<MvcOptions>(options =>
+            }
+        }
+
+        private static void AddTransientDependency(this IServiceCollection services, Type[] types)
+        {
+            foreach (var type in types.Where(o => !o.IsInterface && !o.IsAbstract && o.IsClass &&
+            typeof(ITransientDependency) != o && typeof(ITransientDependency).IsAssignableFrom(o)))
             {
-                options.Conventions.Add(new ApplicationConvention());
+                var interfaceType = type.GetInterfaces().FirstOrDefault(interfaceType => interfaceType.Name.EndsWith(type.Name));
-                options.Filters.Add<DefaultApiResponseFilter>();
-                options.Filters.Add<RunParameterActionFilter>();
-            });
 
-            return services;
+                if (interfaceType != null)
+                    services.TryAddTransient(interfaceType, type);
+                else
+                    services.TryAddTransient(type, type);
+
+            }
         }
 
+
         /// <summary>
         /// 对称加密配置
         /// </summary>