diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 95a6f31..785b581 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 95a6f31a5a1546e612566198f63a2f5e6ce24748 +Subproject commit 785b5817c390daa4aa5d2076f7140fe25c3fd990 diff --git a/NuGet.Config b/NuGet.Config index 3a983bb..0852dfa 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,7 +2,7 @@ - + diff --git a/src/JiShe.IoT.Application/GlobalUsings.cs b/src/JiShe.IoT.Application/GlobalUsings.cs index a55824f..c750bc3 100644 --- a/src/JiShe.IoT.Application/GlobalUsings.cs +++ b/src/JiShe.IoT.Application/GlobalUsings.cs @@ -12,8 +12,6 @@ global using JiShe.IoT.Permissions; global using Microsoft.AspNetCore.Authorization; global using Microsoft.Extensions.Configuration; global using Volo.Abp.Application.Services; -global using Volo.Abp.AutoMapper; global using Volo.Abp.BackgroundJobs.Hangfire; global using Volo.Abp.DependencyInjection; -global using Volo.Abp.Modularity; -global using Profile = AutoMapper.Profile; \ No newline at end of file +global using Volo.Abp.Modularity; \ No newline at end of file diff --git a/src/JiShe.IoT.Application/IoTApplicationAutoMapperProfile.cs b/src/JiShe.IoT.Application/IoTApplicationAutoMapperProfile.cs deleted file mode 100644 index a35d6fb..0000000 --- a/src/JiShe.IoT.Application/IoTApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace JiShe.IoT -{ - public class IoTApplicationAutoMapperProfile : Profile - { - public IoTApplicationAutoMapperProfile() - { - - } - } -} diff --git a/src/JiShe.IoT.Application/IoTApplicationModule.cs b/src/JiShe.IoT.Application/IoTApplicationModule.cs index de431fb..492d9c6 100644 --- a/src/JiShe.IoT.Application/IoTApplicationModule.cs +++ b/src/JiShe.IoT.Application/IoTApplicationModule.cs @@ -35,10 +35,6 @@ namespace JiShe.IoT { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => - { - options.AddMaps(); - }); } diff --git a/src/JiShe.IoT.Domain/GlobalUsings.cs b/src/JiShe.IoT.Domain/GlobalUsings.cs index a93d1ab..f43bc95 100644 --- a/src/JiShe.IoT.Domain/GlobalUsings.cs +++ b/src/JiShe.IoT.Domain/GlobalUsings.cs @@ -16,7 +16,6 @@ global using JiShe.IoT.Users.Dto; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Logging.Abstractions; -global using Volo.Abp.AutoMapper; global using Volo.Abp.Data; global using Volo.Abp.DependencyInjection; global using Volo.Abp.Domain.Services; diff --git a/src/JiShe.IoT.Domain/IoTDomainModule.cs b/src/JiShe.IoT.Domain/IoTDomainModule.cs index a291dd1..a12cae7 100644 --- a/src/JiShe.IoT.Domain/IoTDomainModule.cs +++ b/src/JiShe.IoT.Domain/IoTDomainModule.cs @@ -29,7 +29,6 @@ namespace JiShe.IoT public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); - Configure(options => { options.AddMaps(); }); } } } \ No newline at end of file diff --git a/src/JiShe.IoT.Domain/IoTDomainService.cs b/src/JiShe.IoT.Domain/IoTDomainService.cs index b193eb5..3960cb9 100644 --- a/src/JiShe.IoT.Domain/IoTDomainService.cs +++ b/src/JiShe.IoT.Domain/IoTDomainService.cs @@ -22,15 +22,6 @@ namespace JiShe.IoT /// protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService(); - - /// - /// 对象映射器 - /// - protected IObjectMapper ObjectMapper => LazyServiceProvider.LazyGetService( - provider => - ObjectMapperContext == null - ? provider.GetRequiredService() - : (IObjectMapper)provider.GetRequiredService( - typeof(IObjectMapper<>).MakeGenericType(ObjectMapperContext))); + } } \ No newline at end of file