Merge pull request #216 from xiangxiren/master

1、为AssemblyAutoRegisterOptions.SmartSqlAlias设置默认值；2、仓储接口注册时，获取ISqlMapper实例都通过IServiceProvider.EnsureSmartSql方法获取

Author: XiaoHeitu

src/SmartSql.DIExtension/AssemblyAutoRegisterOptions.cs

@@ -10,8 +10,8 @@ public class AssemblyAutoRegisterOptions : TypeScanOptions
         /// <summary>
         /// 实例别名
         /// </summary>
-        public String SmartSqlAlias { get; set; }
-        
+        public String SmartSqlAlias { get; set; } = SmartSqlBuilder.DEFAULT_ALIAS;
+
         /// <summary>
         /// Scope模板
         /// 默认：I{Scope}Repository

src/SmartSql.DIExtension/DyRepositoryExtensions.cs

@@ -1,12 +1,9 @@
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using System;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
-using SmartSql;
 using SmartSql.DIExtension;
 using SmartSql.DyRepository;
-using System;
-using System.Linq;
-using System.Reflection;
-using SmartSql.Exceptions;
 using SmartSql.Utils;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -48,13 +45,12 @@ public static SmartSqlDIBuilder AddRepositoryFactory(this SmartSqlDIBuilder buil
         public static SmartSqlDIBuilder AddRepository<T>(this SmartSqlDIBuilder builder, string smartSqlAlias, string scope = "") where T : class
         {
             builder.AddRepositoryFactory();
-            builder.Services.AddSingleton<T>(sp =>
+            builder.Services.AddSingleton(sp =>
             {
-                ISqlMapper sqlMapper = sp.GetRequiredService<ISqlMapper>(); ;
-                if (!String.IsNullOrEmpty(smartSqlAlias))
-                {
-                    sqlMapper = sp.EnsureSmartSql(smartSqlAlias).SqlMapper;
-                }
+                var sqlMapper = string.IsNullOrEmpty(smartSqlAlias)
+                    ? sp.EnsureSmartSql().SqlMapper
+                    : sp.EnsureSmartSql(smartSqlAlias).SqlMapper;
+
                 var factory = sp.GetRequiredService<IRepositoryFactory>();
                 return factory.CreateInstance(typeof(T), sqlMapper, scope) as T;
             });
@@ -80,18 +76,17 @@ public static SmartSqlDIBuilder AddRepositoryFromAssembly(this SmartSqlDIBuilder
             {
                 builder.Services.AddSingleton(type, sp =>
                 {
-                    ISqlMapper sqlMapper = sp.GetRequiredService<ISqlMapper>(); ;
-                    if (!String.IsNullOrEmpty(options.SmartSqlAlias))
-                    {
-                        sqlMapper = sp.EnsureSmartSql(options.SmartSqlAlias).SqlMapper;
-                    }
+                    var sqlMapper = string.IsNullOrEmpty(options.SmartSqlAlias)
+                        ? sp.EnsureSmartSql().SqlMapper
+                        : sp.EnsureSmartSql(options.SmartSqlAlias).SqlMapper;
+
                     var factory = sp.GetRequiredService<IRepositoryFactory>();
                     var scope = string.Empty;
                     if (!String.IsNullOrEmpty(options.ScopeTemplate))
                     {
                         scope = templateParser.Parse(type.Name);
                     }
-                    
+
                     var instance = factory.CreateInstance(type, sqlMapper, scope);
                     if (instance.IsDyRepository())
                     {

src/SmartSql.Test.Unit/DI/DITest.cs

@@ -54,7 +54,7 @@ public void AddSmartSqlByAction()
         public void AddRepositoryFromAssembly()
         {
             IServiceCollection services = new ServiceCollection();
-            services.AddSmartSql("AddRepositoryFromAssembly")
+            services.AddSmartSql()
                 .AddRepositoryFromAssembly(o =>
                 {
                     o.AssemblyString = "SmartSql.Test";