fix: 修复 AutoMapper 组件动态构建映射配置丢失原有映射器问题

Author: jianxuanbing

framework/src/Bing.AutoMapper/Bing/AutoMapper/AutoMapperObjectMapper.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+using Bing.ObjectMapping;
 
 namespace Bing.AutoMapper
 {
@@ -27,14 +29,22 @@ public class AutoMapperObjectMapper : Bing.ObjectMapping.IObjectMapper
         /// </summary>
         private IMapper _mapper;
 
+        /// <summary>
+        /// 映射器
+        /// </summary>
+        private readonly IReadOnlyCollection<IObjectMapperProfile> _profiles;
+
         /// <summary>
         /// 初始化一个<see cref="AutoMapperObjectMapper"/>类型的实例
         /// </summary>
         /// <param name="configuration">AutoMapper配置提供程序</param>
-        public AutoMapperObjectMapper(IConfigurationProvider configuration)
+        /// <param name="profiles">映射器</param>
+        public AutoMapperObjectMapper(IConfigurationProvider configuration, IReadOnlyCollection<IObjectMapperProfile> profiles)
         {
             _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
+            _profiles = profiles;
             _mapper = _configuration.CreateMapper();
+            
         }
 
         #region Map(将源对象映射到目标对象)
@@ -127,11 +137,13 @@ private TDestination GetResult<TDestination>(Type sourceType, Type destinationTy
         private void ConfigMap(Type sourceType, Type destinationType)
         {
             var maps = _configuration.GetAllTypeMaps();
-            _configuration=new MapperConfiguration(t =>
+            _configuration = new MapperConfiguration(t =>
             {
                 t.CreateMap(sourceType, destinationType);
                 foreach (var map in maps) 
                     t.CreateMap(map.SourceType, map.DestinationType);
+                foreach (var profile in _profiles)
+                    t.AddProfile(profile as Profile);
             });
             _mapper = _configuration.CreateMapper();
         }

framework/src/Bing.AutoMapper/Bing/AutoMapper/Extensions.Service.cs

@@ -36,7 +36,7 @@ public static void AddAutoMapper(this IServiceCollection services)
                     cfg.AddProfile(instance as Profile);
                 }
             });
-            var mapper = new AutoMapperObjectMapper(configuration);
+            var mapper = new AutoMapperObjectMapper(configuration, instances);
             ObjectMapperExtensions.SetMapper(mapper);
             services.TryAddSingleton<IObjectMapper>(mapper);
         }

framework/tests/Bing.AutoMapper.Tests/MapTest.cs

@@ -34,7 +34,7 @@ public MapTest()
                     cfg.AddProfile(instance as Profile);
                 }
             });
-            var mapper = new AutoMapperObjectMapper(configuration);
+            var mapper = new AutoMapperObjectMapper(configuration, instances);
             ObjectMapperExtensions.SetMapper(mapper);
         }
 
@@ -224,7 +224,28 @@ public void Test_MapTo_CustomProfile()
         {
             var source = new AutoMapperSourceSample { SourceStringValue = "666" };
             var target = source.MapTo<AutoMapperTargetSample>();
-            Assert.Equal("666", target.TargetSampleValue);
+            Assert.Equal("666-001", target.TargetSampleValue);
+        }
+
+        /// <summary>
+        /// 测试自定义配置及非自定义规则映射
+        /// </summary>
+        [Fact]
+        public void Test_MapTo_CustomProfile_WithMoreRule()
+        {
+            var source = new AutoMapperSourceSample { SourceStringValue = "666" };
+            var target = source.MapTo<AutoMapperTargetSample>();
+            Assert.Equal("666-001", target.TargetSampleValue);
+
+            var sample = new Sample();
+            var sample2 = new Sample2() { StringValue = "a" };
+            sample2.MapTo(sample);
+
+            Assert.Equal("a", sample.StringValue);
+
+            source = new AutoMapperSourceSample { SourceStringValue = "666" };
+            target = source.MapTo<AutoMapperTargetSample>();
+            Assert.Equal("666-001", target.TargetSampleValue);
         }
 
         [Fact]

framework/tests/Bing.AutoMapper.Tests/TestMapperConfiguration.cs

@@ -15,7 +15,7 @@ public class TestMapperConfiguration : Profile, IObjectMapperProfile
         public void CreateMap()
         {
             CreateMap<AutoMapperSourceSample, AutoMapperTargetSample>()
-                .ForMember(x => x.TargetSampleValue, x => x.MapFrom(p => p.SourceStringValue));
+                .ForMember(x => x.TargetSampleValue, x => x.MapFrom(p => p.SourceStringValue + "-001"));
         }
     }
 }

framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs

@@ -96,7 +96,7 @@ public CrudServiceTest()
                     cfg.AddProfile(instance as Profile);
                 }
             });
-            var mapper = new AutoMapperObjectMapper(configuration);
+            var mapper = new AutoMapperObjectMapper(configuration, instances);
             ObjectMapperExtensions.SetMapper(mapper);
         }
 

modules/admin/src/Bing.Admin/Modules/AuthenticationModule.cs

@@ -44,6 +44,9 @@ public override IServiceCollection AddServices(IServiceCollection services)
              {
                  o.Store.StoreOriginalPassword = true;
                  o.Password.MinLength = 6;
+                 o.Password.Uppercase = true;
+                 o.Password.Lowercase = true;
+                 o.Password.Digit = true;
              });
             // 添加Jwt认证
             services.AddJwt(configuration);