Merge branch 'WangJunZzz:main' into main

aspnet-core/Directory.Build.props

@@ -19,6 +19,7 @@
 		<SerilogAspNetCoreVersion>4.1.0</SerilogAspNetCoreVersion>
 		<SerilogExceptionsVersion>7.0.0</SerilogExceptionsVersion>
 		<SerilogSettingsConfigurationVersion>3.3.0</SerilogSettingsConfigurationVersion>
+		<SerilogSinksRollingFileVersion>3.3.0</SerilogSinksRollingFileVersion>
 		<SerilogSinksElasticsearchVersion>8.4.1</SerilogSinksElasticsearchVersion>
 		<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
 		<NESTVersion>7.15.1</NESTVersion>

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
     {

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;

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;
 

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
     {

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<IDataDictionaryManagementDbContext, DataDictionary, Guid>,

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;
 

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<TStartupModule> : DataDictionaryManagementTestBase<TStartupModule>

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
 {

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

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;
 

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;

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
 {
     /// <summary>
     /// 消息类型 

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

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
     {

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

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
 {
     /// <summary>
     /// 消息通知 

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
 {
     /// <summary>
     /// 消息订阅者 

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

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

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;
 

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;

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;

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
 {

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
 {

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
 {

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;

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;

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
     {

aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj

@@ -30,6 +30,7 @@
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="$(SerilogSinksElasticsearchVersion)" />
     <PackageReference Include="Serilog.Sinks.File" Version="$(SerilogSinksFileVersion)" />
     <PackageReference Include="Serilog.Sinks.Async" Version="$(SerilogSinksAsyncVersion)" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="$(SerilogSinksRollingFileVersion)" />
     <PackageReference Include="Hangfire.MySqlStorage" Version="$(HangfireMySqlStorageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpPackageVersion)" />

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
     {

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

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;
 

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<Guid>
     {

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
     {

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
         {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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<Guid>
     {

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
     {

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
     {

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
     {

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
     {

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;
 

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
     {

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
     {

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

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
 {
     /// <summary>
     ///   Dto为什么在Service层

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
 {

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;

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
     {

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
     {

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
     {

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;

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;

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

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
     {

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;

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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;

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;

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;

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;

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;
 

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;

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
     {

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
     {

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
     {

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),

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
 {
     /// <summary>
     /// swagger 枚举映射，

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
 {
     /// <summary>
     /// 在使用nswag的时候，原生默认的api导致生产的代理类存在问题

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
     {

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
 {
     /// <summary>
     /// 修改Abp 返回状态码