diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 34471841..57cd1fe2 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -19,6 +19,7 @@ 4.1.0 7.0.0 3.3.0 + 3.3.0 8.4.1 13.0.1 7.15.1 diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/DataDictionaries/DataDictionaryDomainException.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/DataDictionaries/DataDictionaryDomainException.cs index 15be19bf..8a4d320a 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/DataDictionaries/DataDictionaryDomainException.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/DataDictionaries/DataDictionaryDomainException.cs @@ -3,7 +3,7 @@ using System.Runtime.Serialization; using Microsoft.Extensions.Logging; using Volo.Abp; -namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Exceptions +namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries { public class DataDictionaryDomainException : UserFriendlyException { diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs index 7d27793c..4c43325a 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Exceptions; using Lion.AbpPro.Extension.Customs; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs index daa60cd0..71e36252 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs @@ -4,7 +4,6 @@ using System.Threading; using System.Threading.Tasks; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dto; -using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Exceptions; using Volo.Abp.Caching; using Volo.Abp.Domain.Services; diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/DataDictionaryEfCoreQueryableExtensions.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/DataDictionaryEfCoreQueryableExtensions.cs index 84574d1c..495dfd00 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/DataDictionaryEfCoreQueryableExtensions.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/DataDictionaryEfCoreQueryableExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates; using Microsoft.EntityFrameworkCore; -namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries +namespace Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.DataDictionaries { public static class DataDictionaryEfCoreQueryableExtensions { diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs index 5ffc5cfd..83f40d8d 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs @@ -3,14 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Lion.AbpPro.DataDictionaryManagement.DataDictionaries; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates; -using Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; -namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries +namespace Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.DataDictionaries { public class EfCoreDataDictionaryRepository : EfCoreRepository, diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/DataDictionaries/DataDictionaryManager_Tests.cs b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/DataDictionaries/DataDictionaryManager_Tests.cs index f7ffbba0..c69642ee 100644 --- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/DataDictionaries/DataDictionaryManager_Tests.cs +++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/DataDictionaries/DataDictionaryManager_Tests.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Exceptions; using Shouldly; using Xunit; diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/DataDictionaries/EfCoreDataDictionaryRepository_Tests.cs b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/DataDictionaries/EfCoreDataDictionaryRepository_Tests.cs index 1168d6b0..214a00f8 100644 --- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/DataDictionaries/EfCoreDataDictionaryRepository_Tests.cs +++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/DataDictionaries/EfCoreDataDictionaryRepository_Tests.cs @@ -1,8 +1,6 @@ -using System.Threading.Tasks; -using Lion.AbpPro.DataDictionaryManagement.DataDictionaries; using Volo.Abp.Modularity; -namespace Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.DataDictionaries +namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries { public abstract class EfCoreDataDictionaryRepository_Tests : DataDictionaryManagementTestBase diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/CreateNotificationInput.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/CreateNotificationInput.cs index 3eb08b4c..2885a3dd 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/CreateNotificationInput.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/CreateNotificationInput.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; namespace Lion.AbpPro.NotificationManagement.Notifications.Dtos { diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/SendNotificationDto.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/SendNotificationDto.cs index c939499a..2b2f67dd 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/SendNotificationDto.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/Dtos/SendNotificationDto.cs @@ -1,3 +1,5 @@ +using Lion.AbpPro.NotificationManagement.Notifications.Enums; + namespace Lion.AbpPro.NotificationManagement.Notifications.Dtos { public class SendNotificationDto diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/INotificationAppService.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/INotificationAppService.cs index aac1b30f..bababe16 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/INotificationAppService.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Notifications/INotificationAppService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Lion.AbpPro.NotificationManagement.Notifications.Dtos; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Notifications/NotificationAppService.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Notifications/NotificationAppService.cs index 9ac5c26a..38336347 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Notifications/NotificationAppService.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Notifications/NotificationAppService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Lion.AbpPro.NotificationManagement.Hubs; using Lion.AbpPro.NotificationManagement.Notifications.Dtos; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; using Microsoft.AspNetCore.SignalR; using Volo.Abp; using Volo.Abp.Application.Dtos; diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Enums/MessageType.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Enums/MessageType.cs index dbc48735..ecb7b363 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Enums/MessageType.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Enums/MessageType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Lion.AbpPro.NotificationManagement.Notifications +namespace Lion.AbpPro.NotificationManagement.Notifications.Enums { /// /// 消息类型 diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Etos/NotificationEto.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Etos/NotificationEto.cs index bcd03708..c6e0631f 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Etos/NotificationEto.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/Etos/NotificationEto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; namespace Lion.AbpPro.NotificationManagement.Notifications.Etos diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/MaxLengths/NotificationMaxLengths.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/MaxLengths/NotificationMaxLengths.cs index c44c7e80..f20f6266 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/MaxLengths/NotificationMaxLengths.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Notifications/MaxLengths/NotificationMaxLengths.cs @@ -1,4 +1,4 @@ -namespace Lion.AbpPro.NotificationManagement.Notifications +namespace Lion.AbpPro.NotificationManagement.Notifications.MaxLengths { public class NotificationMaxLengths { diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/NotificationDomainAutoMapperProfile.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/NotificationDomainAutoMapperProfile.cs index ab096f7e..0cdc8f4b 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/NotificationDomainAutoMapperProfile.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/NotificationDomainAutoMapperProfile.cs @@ -1,5 +1,6 @@ using AutoMapper; using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Lion.AbpPro.NotificationManagement.Notifications.Etos; namespace Lion.AbpPro.NotificationManagement diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/Notification.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/Notification.cs index 327d3abe..e6cd78bb 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/Notification.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/Notification.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using Lion.AbpPro.Extension.Customs; -using Volo.Abp.Domain.Entities.Auditing; using Lion.AbpPro.NotificationManagement.Notifications.DistributedEvents; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; +using Lion.AbpPro.NotificationManagement.Notifications.MaxLengths; +using Volo.Abp.Domain.Entities.Auditing; - -namespace Lion.AbpPro.NotificationManagement.Notifications +namespace Lion.AbpPro.NotificationManagement.Notifications.Aggregates { /// /// 消息通知 diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/NotificationSubscription.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/NotificationSubscription.cs index 3b47a026..e0b1d0a8 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/NotificationSubscription.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/Aggregates/NotificationSubscription.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.Domain.Entities.Auditing; -namespace Lion.AbpPro.NotificationManagement.Notifications +namespace Lion.AbpPro.NotificationManagement.Notifications.Aggregates { /// /// 消息订阅者 diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/INotificationRepository.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/INotificationRepository.cs index 67333850..3c6ae931 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/INotificationRepository.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/INotificationRepository.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Volo.Abp.Domain.Repositories; namespace Lion.AbpPro.NotificationManagement.Notifications diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationDomainAutoMapperProfile.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationDomainAutoMapperProfile.cs index e3e2b77f..66f0e68e 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationDomainAutoMapperProfile.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationDomainAutoMapperProfile.cs @@ -1,4 +1,5 @@ using AutoMapper; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Lion.AbpPro.NotificationManagement.Notifications.Etos; namespace Lion.AbpPro.NotificationManagement.Notifications diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationManager.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationManager.cs index e30fb9fd..4239bff7 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationManager.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Notifications/NotificationManager.cs @@ -2,7 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Lion.AbpPro.NotificationManagement.Notifications.DistributedEvents; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; using Lion.AbpPro.NotificationManagement.Notifications.Etos; using Volo.Abp.Users; diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/INotificationManagementDbContext.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/INotificationManagementDbContext.cs index 940220c0..e510fc43 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/INotificationManagementDbContext.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/INotificationManagementDbContext.cs @@ -1,4 +1,5 @@ using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContext.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContext.cs index c21611ad..4609ea10 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContext.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContext.cs @@ -1,4 +1,5 @@ using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContextModelCreatingExtensions.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContextModelCreatingExtensions.cs index b55ceabf..90ff0056 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContextModelCreatingExtensions.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/NotificationManagementDbContextModelCreatingExtensions.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; namespace Lion.AbpPro.NotificationManagement.EntityFrameworkCore { diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationQueryableExtensions.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationQueryableExtensions.cs index e4c794f5..a33a3b1d 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationQueryableExtensions.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationQueryableExtensions.cs @@ -1,6 +1,7 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; namespace Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Notifications { diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationRepository.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationRepository.cs index fe97aec6..2b77f82e 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationRepository.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/EntityFrameworkCore/Notifications/EfCoreNotificationRepository.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; using Lion.AbpPro.NotificationManagement.Notifications; +using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; namespace Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Notifications { diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Notifications/NotificationController.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Notifications/NotificationController.cs index 8978fb5b..71bf21d7 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Notifications/NotificationController.cs +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Notifications/NotificationController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Lion.AbpPro.NotificationManagement.Notifications.Dtos; +using Lion.AbpPro.NotificationManagement.Notifications.Enums; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using Volo.Abp.Application.Dtos; diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs index b4763dbe..89642dd9 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -2,8 +2,6 @@ using Lion.AbpPro.ConfigurationOptions; using Lion.AbpPro.EntityFrameworkCore; using Lion.AbpPro.Extensions; using Lion.AbpPro.MultiTenancy; -using Lion.AbpPro.Swaggers; -using LionAbpPro.Extensions.Filters; using Hangfire; using Hangfire.MySql; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -25,6 +23,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Lion.AbpPro.CAP; +using Lion.AbpPro.Extensions.Filters; +using Lion.AbpPro.Shared.Hosting.Microservices; +using Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.AspNetCore.Builder; +using Lion.AbpPro.Shared.Hosting.Microservices.Swaggers; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Authentication.JwtBearer; diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Filters/CustomHangfireAuthorizeFilter.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Filters/CustomHangfireAuthorizeFilter.cs index b4ac1b1d..91641f65 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Filters/CustomHangfireAuthorizeFilter.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Filters/CustomHangfireAuthorizeFilter.cs @@ -2,7 +2,7 @@ using Hangfire.Dashboard; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Users; -namespace LionAbpPro.Extensions.Filters +namespace Lion.AbpPro.Extensions.Filters { public class CustomHangfireAuthorizeFilter : IDashboardAuthorizationFilter { diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj index 8076c925..3ccf45cf 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj @@ -30,6 +30,7 @@ + diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs index a167d1c5..8e098355 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogInput.cs @@ -1,7 +1,7 @@ using System; using Lion.AbpPro.Extension.Customs.Dtos; -namespace Lion.AbpPro.ElasticsearchRepository.Dto +namespace Lion.AbpPro.ElasticSearchs.Dto { public class PagingElasticSearchLogInput : PagingBase { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs index 23216e4c..3a340720 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/Dto/PagingElasticSearchLogOutput.cs @@ -1,7 +1,6 @@ using System; - -namespace Lion.AbpPro.ElasticsearchRepository.Dto +namespace Lion.AbpPro.ElasticSearchs.Dto { public class PagingElasticSearchLogOutput diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/ILionAbpProLogAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/ILionAbpProLogAppService.cs index f219cd66..3e45c7c1 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/ILionAbpProLogAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/ElasticSearchs/ILionAbpProLogAppService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Lion.AbpPro.ElasticsearchRepository.Dto; +using Lion.AbpPro.ElasticSearchs.Dto; using Lion.AbpPro.Extension.Customs.Dtos; using Volo.Abp.Application.Services; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/ApiResourceOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/ApiResourceOutput.cs index 88d8da25..3225c574 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/ApiResourceOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/ApiResourceOutput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class ApiResourceOutput : EntityDto { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/CreateApiResourceInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/CreateApiResourceInput.cs index 3e3adc34..d9e948fe 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/CreateApiResourceInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/CreateApiResourceInput.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class CreateApiResourceInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/PagingApiRseourceListInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/PagingApiRseourceListInput.cs index aa6a7e92..159ffca4 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/PagingApiRseourceListInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/PagingApiRseourceListInput.cs @@ -1,6 +1,6 @@ using Lion.AbpPro.Extension.Customs.Dtos; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class PagingApiRseourceListInput : PagingBase { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/UpdateApiResourceInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/UpdateApiResourceInput.cs index e167479f..7f2e0dc7 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/UpdateApiResourceInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/Dtos/UpdateApiResourceInput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class UpdateApiResourceInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/IApiResourceAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/IApiResourceAppService.cs index 19e4d3b8..a2b09543 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/IApiResourceAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/ApiResources/IApiResourceAppService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Lion.AbpPro.IdentityServers.Dtos; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.IdentityServers.ApiResources.Dtos; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -namespace Lion.AbpPro.IdentityServers +namespace Lion.AbpPro.IdentityServers.ApiResources { public interface IApiResourceAppService : IApplicationService { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddCorsInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddCorsInput.cs index d6c104a8..27e4d05c 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddCorsInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddCorsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class AddCorsInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddRedirectUriInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddRedirectUriInput.cs index 33a5ec65..5249b3fb 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddRedirectUriInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/AddRedirectUriInput.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class AddRedirectUriInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientClaimOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientClaimOutput.cs index 25ebdaf8..b0195a66 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientClaimOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientClaimOutput.cs @@ -1,7 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientClaimOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientCorsOriginOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientCorsOriginOutput.cs index 14f19d11..05795339 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientCorsOriginOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientCorsOriginOutput.cs @@ -1,7 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientCorsOriginOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientGrantTypeOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientGrantTypeOutput.cs index 101a1fdd..d53e2179 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientGrantTypeOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientGrantTypeOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientGrantTypeOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientIdPRestrictionOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientIdPRestrictionOutput.cs index 86aac5ed..0ed71def 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientIdPRestrictionOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientIdPRestrictionOutput.cs @@ -1,7 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientIdPRestrictionOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPostLogoutRedirectUriOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPostLogoutRedirectUriOutput.cs index 293d48a6..50c2bc73 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPostLogoutRedirectUriOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPostLogoutRedirectUriOutput.cs @@ -1,7 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientPostLogoutRedirectUriOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPropertyOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPropertyOutput.cs index 50a2919b..4e6fb228 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPropertyOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientPropertyOutput.cs @@ -1,7 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientPropertyOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientRedirectUriOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientRedirectUriOutput.cs index a7595a42..c127ec2c 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientRedirectUriOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientRedirectUriOutput.cs @@ -1,6 +1,6 @@ using System; -using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients + +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientRedirectUriOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientScopeOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientScopeOutput.cs index d0cb2ada..21b3e0e1 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientScopeOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientScopeOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientScopeOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientSecretOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientSecretOutput.cs index 0d044364..03443bcf 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientSecretOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/ClientSecretOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class ClientSecretOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/CreateClientInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/CreateClientInput.cs index 7585ccb1..10f5f39f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/CreateClientInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/CreateClientInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class CreateClientInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/EnabledInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/EnabledInput.cs index 41f8a648..2a610fe8 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/EnabledInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/EnabledInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class EnabledInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListInput.cs index f678dbfb..4b0fbfef 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListInput.cs @@ -1,6 +1,6 @@ using Lion.AbpPro.Extension.Customs.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class PagingClientListInput:PagingBase { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListOutput.cs index 69492d3e..6ad13c6e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/PagingClientListOutput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Volo.Abp.Application.Dtos; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class PagingClientListOutput : EntityDto { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveCorsInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveCorsInput.cs index fa338680..92f6b6f6 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveCorsInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveCorsInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class RemoveCorsInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveRedirectUriInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveRedirectUriInput.cs index 14551196..0b076842 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveRedirectUriInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/RemoveRedirectUriInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class RemoveRedirectUriInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdataBasicDataInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdataBasicDataInput.cs index da89047b..73dd3cea 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdataBasicDataInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdataBasicDataInput.cs @@ -1,4 +1,4 @@ -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class UpdataBasicDataInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdateScopeInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdateScopeInput.cs index 7545ba06..9bac4b1d 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdateScopeInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/Dtos/UpdateScopeInput.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Lion.AbpPro.IdentityServers.Clients +namespace Lion.AbpPro.IdentityServers.Clients.Dtos { public class UpdateScopeInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/IIdentityServerClientAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/IIdentityServerClientAppService.cs index 37b7dcbf..402f6471 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/IIdentityServerClientAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/IdentityServers/Clients/IIdentityServerClientAppService.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.IdentityServers.Clients.Dtos; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/SettingOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/SettingOutput.cs index 8bd70fb2..f3e7db67 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/SettingOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/SettingOutput.cs @@ -1,7 +1,6 @@ -using System; using System.Collections.Generic; -namespace Lion.AbpPro.Settings +namespace Lion.AbpPro.Settings.Dtos { public class SettingOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/UpdateSettingInput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/UpdateSettingInput.cs index b7567ed1..59fc700e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/UpdateSettingInput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/Dtos/UpdateSettingInput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Lion.AbpPro.Settings +namespace Lion.AbpPro.Settings.Dtos { public class UpdateSettingInput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/ISettingAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/ISettingAppService.cs index ab90e623..9e37fe07 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/ISettingAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Settings/ISettingAppService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Lion.AbpPro.Settings.Dtos; using Volo.Abp.Application.Services; namespace Lion.AbpPro.Settings diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs index 96ffac17..613f31e4 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Dto/PagingElasticSearchLogDto.cs @@ -1,7 +1,7 @@ using System; using Nest; -namespace Lion.AbpPro.ElasticSearchs +namespace Lion.AbpPro.ElasticSearchs.Dto { /// /// Dto为什么在Service层 diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/ElasticSearchApplicationAutoMapperProfile.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/ElasticSearchApplicationAutoMapperProfile.cs index cd482a47..745c3492 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/ElasticSearchApplicationAutoMapperProfile.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/ElasticSearchApplicationAutoMapperProfile.cs @@ -1,10 +1,10 @@ using AutoMapper; -using Lion.AbpPro.ElasticsearchRepository.Dto; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Lion.AbpPro.ElasticSearchs.Dto; namespace Lion.AbpPro.ElasticSearchs { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/LionAbpProLogAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/LionAbpProLogAppService.cs index 88c94f57..8d143f51 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/LionAbpProLogAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/LionAbpProLogAppService.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Lion.AbpPro.ElasticsearchRepository; -using Lion.AbpPro.ElasticsearchRepository.Dto; +using Lion.AbpPro.ElasticSearchs.Dto; +using Lion.AbpPro.ElasticSearchs.Providers; using Lion.AbpPro.Extension.Customs.Dtos; using Lion.AbpPro.Permissions; using Microsoft.AspNetCore.Authorization; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs index 9cd9e4c6..14115f90 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchBasicService.cs @@ -1,7 +1,6 @@ using Nest; -using Volo.Abp.Domain.Services; -namespace Lion.AbpPro.ElasticsearchRepository +namespace Lion.AbpPro.ElasticSearchs.Providers { public abstract class ElasticsearchBasicService : AbpProAppService { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs index 92d57d78..bbd475ee 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/ElasticsearchProvider.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration; using Nest; using Volo.Abp.DependencyInjection; -namespace Lion.AbpPro.ElasticsearchRepository +namespace Lion.AbpPro.ElasticSearchs.Providers { public class ElasticsearchProvider : IElasticsearchProvider, ISingletonDependency { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs index da413378..95a3b3c0 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/ElasticSearchs/Providers/IElasticsearchProvider.cs @@ -1,7 +1,7 @@ using Nest; using Volo.Abp.DependencyInjection; -namespace Lion.AbpPro.ElasticsearchRepository +namespace Lion.AbpPro.ElasticSearchs.Providers { public interface IElasticsearchProvider : ISingletonDependency { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/ApiResources/ApiResourceAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/ApiResources/ApiResourceAppService.cs index cd577366..d7786850 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/ApiResources/ApiResourceAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/ApiResources/ApiResourceAppService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Lion.AbpPro.IdentityServer; -using Lion.AbpPro.IdentityServers.Dtos; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.IdentityServers.ApiResources.Dtos; using Lion.AbpPro.Permissions; using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/Clients/IdentityServerClientAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/Clients/IdentityServerClientAppService.cs index 7f1700cd..18b27d41 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/Clients/IdentityServerClientAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/Clients/IdentityServerClientAppService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Lion.AbpPro.IdentityServer; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.IdentityServers.Clients.Dtos; using Lion.AbpPro.Permissions; using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityResources/IdentityResourceAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityResources/IdentityResourceAppService.cs index 79868d44..3af09d6d 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityResources/IdentityResourceAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityResources/IdentityResourceAppService.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Lion.AbpPro.Extension.Customs.Dtos; using Lion.AbpPro.IdentityServer; -using Lion.AbpPro.IdentityServers.IdentityResources; using Lion.AbpPro.IdentityServers.IdentityResources.Dtos; -using Lion.AbpPro.Extension.Customs.Dtos; using Lion.AbpPro.Permissions; using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; using Volo.Abp.IdentityServer.IdentityResources; -namespace Lion.AbpPro.IdentityServers.Mappers.IdentityResources +namespace Lion.AbpPro.IdentityServers.IdentityResources { [Authorize(Policy = AbpProPermissions.IdentityServer.IdentityResources.Default)] public class IdentityResourceAppService : AbpProAppService, IIdentityResourceAppService diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs index 9ea322ea..4639965f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs @@ -1,17 +1,14 @@ using AutoMapper; -using Lion.AbpPro.ElasticsearchRepository.Dto; -using Lion.AbpPro.ElasticSearchs; +using Lion.AbpPro.IdentityServers.ApiResources.Dtos; using Lion.AbpPro.IdentityServers.ApiScopes.Dtos; -using Lion.AbpPro.IdentityServers.Clients; -using Lion.AbpPro.IdentityServers.Dtos; +using Lion.AbpPro.IdentityServers.Clients.Dtos; using Lion.AbpPro.IdentityServers.IdentityResources.Dtos; using Volo.Abp.IdentityServer.ApiResources; using Volo.Abp.IdentityServer.ApiScopes; using Volo.Abp.IdentityServer.Clients; -using Volo.Abp.IdentityServer.Devices; using Volo.Abp.IdentityServer.IdentityResources; -namespace Lion.AbpPro.IdentityServers.Mappers +namespace Lion.AbpPro.IdentityServers { public class IdentityServerApplicationAutoMapperProfile : Profile { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs index ed5b48b7..5bfdacdf 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Lion.AbpPro.Localization; using Lion.AbpPro.Permissions; +using Lion.AbpPro.Settings.Dtos; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Localization; using Volo.Abp.SettingManagement; diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceClaimOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceClaimOutput.cs index 9e014eec..9478f58c 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceClaimOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceClaimOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class ApiResourceClaimOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourcePropertyOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourcePropertyOutput.cs index 3a973bb1..32741cd0 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourcePropertyOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourcePropertyOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class ApiResourcePropertyOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceScopeOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceScopeOutput.cs index 8fbf606b..4718d130 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceScopeOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceScopeOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class ApiResourceScopeOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceSecretOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceSecretOutput.cs index 4e820160..a60d6bfc 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceSecretOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/IdentityServers/ApiResources/Dtos/ApiResourceSecretOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Lion.AbpPro.IdentityServers.Dtos +namespace Lion.AbpPro.IdentityServers.ApiResources.Dtos { public class ApiResourceSecretOutput { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs index 8ca82448..0a31a168 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Reflection; -using Lion.AbpPro.Localization; -namespace System +namespace Lion.AbpPro.Localization.Extensions { public static class EnumLocalicationExtension { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs index 1a0d90af..f970346a 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; -using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; @@ -18,7 +17,7 @@ using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource; using ApiScope = Volo.Abp.IdentityServer.ApiScopes.ApiScope; using Client = Volo.Abp.IdentityServer.Clients.Client; -namespace Lion.AbpPro.IdentityServer +namespace Lion.AbpPro.Data.Seeds { public class IdentityServerDataSeedContributor : IDataSeedContributor, ITransientDependency { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/UserDataSeedContributor.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/UserDataSeedContributor.cs index f14420a2..bf732548 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/UserDataSeedContributor.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/UserDataSeedContributor.cs @@ -1,10 +1,9 @@ -using System; using System.Threading.Tasks; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Identity; -namespace Lion.AbpPro.Users +namespace Lion.AbpPro.Data.Seeds { public class UserDataSeedContributor : IDataSeedContributor, ITransientDependency { diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs index 508c3261..51ae49d9 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs @@ -3,7 +3,6 @@ using Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore; using Lion.AbpPro.NotificationManagement; using Lion.AbpPro.NotificationManagement.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using Lion.AbpPro.Users; using Volo.Abp.AuditLogging; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ApiResourceController.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ApiResourceController.cs index 73b81f11..defabd55 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ApiResourceController.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ApiResourceController.cs @@ -2,7 +2,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Lion.AbpPro.Extension.Customs.Dtos; using Lion.AbpPro.IdentityServers; -using Lion.AbpPro.IdentityServers.Dtos; +using Lion.AbpPro.IdentityServers.ApiResources; +using Lion.AbpPro.IdentityServers.ApiResources.Dtos; using Lion.AbpPro.Permissions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ClientController.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ClientController.cs index 13aad39f..29d9a3a1 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ClientController.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/IdentityServers/ClientController.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Lion.AbpPro.IdentityServers.Clients; using Lion.AbpPro.Permissions; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.IdentityServers.Clients.Dtos; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/LionAbpProLogController.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/LionAbpProLogController.cs index dbf39ec4..4f142498 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/LionAbpProLogController.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/LionAbpProLogController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Lion.AbpPro.ElasticsearchRepository.Dto; using Lion.AbpPro.ElasticSearchs; +using Lion.AbpPro.ElasticSearchs.Dto; using Lion.AbpPro.Permissions; using Lion.AbpPro.Extension.Customs.Dtos; using Microsoft.AspNetCore.Authorization; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/SettingController.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/SettingController.cs index 16e2105e..6829307e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/SettingController.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/SettingController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Lion.AbpPro.Settings; +using Lion.AbpPro.Settings.Dtos; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; diff --git a/aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs b/aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs index dc9057b7..d155e796 100644 --- a/aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs +++ b/aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs @@ -1,5 +1,6 @@ using System; using Lion.AbpPro.Localization; +using Lion.AbpPro.Localization.Extensions; using Shouldly; using Volo.Abp.Localization; using Xunit; diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs index 55945235..e122f38e 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs @@ -1,10 +1,11 @@ using System; using Consul; +using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Microsoft.AspNetCore.Builder +namespace Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.AspNetCore.Builder { public static class ApplicationBuilderExtensions { diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/MVC/Filters/ResultExceptionFilter.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/MVC/Filters/ResultExceptionFilter.cs index d85efb65..dd3ef677 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/MVC/Filters/ResultExceptionFilter.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/MVC/Filters/ResultExceptionFilter.cs @@ -1,13 +1,16 @@ -using Microsoft.AspNetCore.Mvc.Abstractions; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; using System; using System.Linq; using System.Text; using System.Threading.Tasks; using Lion.AbpPro.Extension.Customs.Dtos; +using Lion.AbpPro.Shared.Hosting.Microservices.System; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; using Volo.Abp; using Volo.Abp.AspNetCore.ExceptionHandling; using Volo.Abp.Authorization; @@ -18,8 +21,7 @@ using Volo.Abp.Http; using Volo.Abp.Json; using Volo.Abp.Validation; - -namespace Microsoft.AspNetCore.Mvc.Filters +namespace Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.AspNetCore.MVC.Filters { public class ResultExceptionFilter : IFilterMetadata, IAsyncExceptionFilter, ITransientDependency { diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs index 72e96945..c27200c0 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs @@ -1,8 +1,9 @@ using System; using Consul; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.Extensions.DependencyInjection +namespace Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.Extensions.DependencyInjection { public static class ServiceCollectionExtensions { diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/SharedHostingMicroserviceModule.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/SharedHostingMicroserviceModule.cs index 0d2d7496..266b8f5c 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/SharedHostingMicroserviceModule.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/SharedHostingMicroserviceModule.cs @@ -1,7 +1,8 @@ using System; using System.Linq; +using Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.AspNetCore.MVC.Filters; +using Lion.AbpPro.Shared.Hosting.Microservices.Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Cors; -using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -13,7 +14,7 @@ using Volo.Abp.Modularity; using Volo.Abp.Swashbuckle; using Volo.Abp.UI.Navigation.Urls; -namespace Lion.AbpPro +namespace Lion.AbpPro.Shared.Hosting.Microservices { [DependsOn( typeof(AbpSwashbuckleModule), diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/EnumSchemaFilter.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/EnumSchemaFilter.cs index e6390b34..310186b5 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/EnumSchemaFilter.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/EnumSchemaFilter.cs @@ -4,7 +4,7 @@ using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -namespace Lion.AbpPro.Swaggers +namespace Lion.AbpPro.Shared.Hosting.Microservices.Swaggers { /// /// swagger 枚举映射， diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/HiddenAbpDefaultApiFilter.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/HiddenAbpDefaultApiFilter.cs index 12cd1ff7..50a74af7 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/HiddenAbpDefaultApiFilter.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Swaggers/HiddenAbpDefaultApiFilter.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -namespace Lion.AbpPro.Swaggers +namespace Lion.AbpPro.Shared.Hosting.Microservices.Swaggers { /// /// 在使用nswag的时候，原生默认的api导致生产的代理类存在问题 diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/System/WrapResultAttribute.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/System/WrapResultAttribute.cs index 6b4e7951..dd441526 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/System/WrapResultAttribute.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/System/WrapResultAttribute.cs @@ -1,4 +1,6 @@ -namespace System +using System; + +namespace Lion.AbpPro.Shared.Hosting.Microservices.System { public class WrapResultAttribute : Attribute { diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Volo/Abp/DefaultHttpExceptionStatusCodeFinder.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Volo/Abp/DefaultHttpExceptionStatusCodeFinder.cs index fb6c1ef0..e3c6a472 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Volo/Abp/DefaultHttpExceptionStatusCodeFinder.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Volo/Abp/DefaultHttpExceptionStatusCodeFinder.cs @@ -2,13 +2,15 @@ using System; using System.Net; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; +using Volo.Abp; +using Volo.Abp.AspNetCore.ExceptionHandling; using Volo.Abp.Authorization; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities; using Volo.Abp.ExceptionHandling; using Volo.Abp.Validation; -namespace Volo.Abp.AspNetCore.ExceptionHandling +namespace Lion.AbpPro.Shared.Hosting.Microservices.Volo.Abp { /// /// 修改Abp 返回状态码