Browse Source

Improve

pull/13881/head^2
liangshiwei 4 years ago
parent
commit
f3063a9cf4
  1. 12
      modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
  2. 4
      modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreModule.cs
  3. 4
      modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs

12
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs

@ -3,6 +3,7 @@ using System.Linq;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.FeatureManagement.JsonConverters; using Volo.Abp.FeatureManagement.JsonConverters;
using Volo.Abp.FeatureManagement.Localization; using Volo.Abp.FeatureManagement.Localization;
using Volo.Abp.Json;
using Volo.Abp.Json.Newtonsoft; using Volo.Abp.Json.Newtonsoft;
using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Json.SystemTextJson;
using Volo.Abp.Localization; using Volo.Abp.Localization;
@ -15,8 +16,9 @@ using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp.FeatureManagement; namespace Volo.Abp.FeatureManagement;
[DependsOn( [DependsOn(
typeof(AbpValidationModule) typeof(AbpValidationModule),
)] typeof(AbpJsonModule)
)]
public class AbpFeatureManagementDomainSharedModule : AbpModule public class AbpFeatureManagementDomainSharedModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
@ -45,15 +47,15 @@ public class AbpFeatureManagementDomainSharedModule : AbpModule
options.Converters.Add<NewtonsoftStringValueTypeJsonConverter>(); options.Converters.Add<NewtonsoftStringValueTypeJsonConverter>();
}); });
var contractsOptionsActions = context.Services.GetPreConfigureActions<ValueValidatorFactoryOptions>(); var valueValidatorFactoryOptions = context.Services.GetPreConfigureActions<ValueValidatorFactoryOptions>();
Configure<ValueValidatorFactoryOptions>(options => Configure<ValueValidatorFactoryOptions>(options =>
{ {
contractsOptionsActions.Configure(options); valueValidatorFactoryOptions.Configure(options);
}); });
Configure<AbpSystemTextJsonSerializerOptions>(options => Configure<AbpSystemTextJsonSerializerOptions>(options =>
{ {
options.JsonSerializerOptions.Converters.Add(new StringValueTypeJsonConverter(contractsOptionsActions.Configure())); options.JsonSerializerOptions.Converters.Add(new StringValueTypeJsonConverter(valueValidatorFactoryOptions.Configure()));
}); });
} }
} }

4
modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreModule.cs

@ -1,14 +1,12 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Json;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace Volo.Abp.FeatureManagement.EntityFrameworkCore; namespace Volo.Abp.FeatureManagement.EntityFrameworkCore;
[DependsOn( [DependsOn(
typeof(AbpFeatureManagementDomainModule), typeof(AbpFeatureManagementDomainModule),
typeof(AbpEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreModule)
typeof(AbpJsonModule)
)] )]
public class AbpFeatureManagementEntityFrameworkCoreModule : AbpModule public class AbpFeatureManagementEntityFrameworkCoreModule : AbpModule
{ {

4
modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs

@ -32,10 +32,10 @@ public class AbpFeatureManagementHttpApiModule : AbpModule
.AddBaseTypes(typeof(AbpUiResource)); .AddBaseTypes(typeof(AbpUiResource));
}); });
var contractsOptions = context.Services.ExecutePreConfiguredActions<ValueValidatorFactoryOptions>(); var valueValidatorFactoryOptions = context.Services.ExecutePreConfiguredActions<ValueValidatorFactoryOptions>();
Configure<JsonOptions>(options => Configure<JsonOptions>(options =>
{ {
options.JsonSerializerOptions.Converters.AddIfNotContains(new StringValueTypeJsonConverter(contractsOptions)); options.JsonSerializerOptions.Converters.AddIfNotContains(new StringValueTypeJsonConverter(valueValidatorFactoryOptions));
}); });
} }
} }

Loading…
Cancel
Save