diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xml b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xml new file mode 100644 index 000000000..1715698cc --- /dev/null +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xsd b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xsd new file mode 100644 index 000000000..11da52550 --- /dev/null +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/FodyWeavers.xml b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/FodyWeavers.xml new file mode 100644 index 000000000..1715698cc --- /dev/null +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xml b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xml new file mode 100644 index 000000000..1715698cc --- /dev/null +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xsd b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xsd new file mode 100644 index 000000000..11da52550 --- /dev/null +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs index 8fd8df93e..5238d64bf 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs @@ -18,18 +18,15 @@ public class TenantCloudSettingAppService : ApplicationService, ITenantCloudSett protected ISettingManager SettingManager { get; } protected IPermissionChecker PermissionChecker { get; } protected ISettingDefinitionManager SettingDefinitionManager { get; } - protected ITencentCloudClientFactory TencentCloudClientFactory { get; } public TenantCloudSettingAppService( ISettingManager settingManager, IPermissionChecker permissionChecker, - ISettingDefinitionManager settingDefinitionManager, - ITencentCloudClientFactory tencentCloudClientFactory) + ISettingDefinitionManager settingDefinitionManager) { SettingManager = settingManager; PermissionChecker = permissionChecker; SettingDefinitionManager = settingDefinitionManager; - TencentCloudClientFactory = tencentCloudClientFactory; LocalizationResource = typeof(TencentCloudResource); } @@ -76,6 +73,12 @@ public class TenantCloudSettingAppService : ApplicationService, ITenantCloudSett await SettingManager.GetOrNullAsync(TencentCloudSettingNames.SecretKey, providerName, providerKey), ValueType.String, providerName); + basicSetting.AddDetail( + SettingDefinitionManager.Get(TencentCloudSettingNames.DurationSecond), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(TencentCloudSettingNames.SecretKey, providerName, providerKey), + ValueType.Number, + providerName); #endregion diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/AbpTencentCloudModule.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/AbpTencentCloudModule.cs index 9a0ccd660..f270cf8d0 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/AbpTencentCloudModule.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/AbpTencentCloudModule.cs @@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Tencent .AddVirtualJson("/LINGYUN/Abp/Tencent/Localization/Resources"); }); - context.Services.AddTransient>(); + context.Services.AddTransient(typeof(TencentCloudClientFactory<>)); //Configure(options => //{ // 按照腾讯SDK, 所有客户端都有三个参数组成, 暂时设计为通过反射构造函数来创建客户端 diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/en.json b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/en.json index 2dcca815b..f54f6bf1b 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/en.json +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/en.json @@ -12,6 +12,8 @@ "Description:SecretId": "The Secret Id can be obtained only from Tencent Cloud Management Console.", "DisplayName:SecretKey": "Secret Key", "Description:SecretKey": "The Secret Key can be obtained only from Tencent Cloud Management Console.", + "DisplayName:DurationSecond": "Duration Seconds", + "Description:DurationSecond": "Duration Seconds", "DisplayName:HttpMethod": "Http Method", "Description:HttpMethod": "The SDK uses the POST method by default, but if you must use the GET method, you can set it here. The GET method cannot handle some large requests.", "DisplayName:Timeout": "Timeout", diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/zh-Hans.json b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/zh-Hans.json index 4b76d952b..9a264d129 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Localization/Resources/zh-Hans.json @@ -12,6 +12,8 @@ "Description:SecretId": "密钥Id，只能从腾讯云管理控制台获取。", "DisplayName:SecretKey": "密钥Key", "Description:SecretKey": "密钥Key，只能从腾讯云管理控制台获取。", + "DisplayName:DurationSecond": "持续时间", + "Description:DurationSecond": "会话持续时长,单位(秒)", "DisplayName:HttpMethod": "请求类型", "Description:HttpMethod": "SDK默认使用POST方法，如果你一定要使用GET方法，可以在这里设置。GET方法无法处理一些较大的请求。", "DisplayName:Timeout": "超时时间", diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs index 4eef82366..f7a152a92 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs @@ -46,6 +46,17 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider isVisibleToClients: false, isEncrypted: true ) + .WithProviders( + DefaultValueSettingValueProvider.ProviderName, + GlobalSettingValueProvider.ProviderName, + TenantSettingValueProvider.ProviderName), + new SettingDefinition( + TencentCloudSettingNames.DurationSecond, + defaultValue: "600", + displayName: L("DisplayName:DurationSecond"), + description: L("Description:DurationSecond"), + isVisibleToClients: false + ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/FodyWeavers.xsd b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/FodyWeavers.xsd new file mode 100644 index 000000000..11da52550 --- /dev/null +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs index 0a0baa433..67a08e514 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs @@ -4,6 +4,7 @@ using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; @@ -11,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Unicode; using Volo.Abp; @@ -31,6 +33,7 @@ namespace LY.MicroService.BackendAdmin; public partial class BackendAdminHttpApiHostModule { + protected const string DefaultCorsPolicyName = "Default"; private void PreConfigureApp() { AbpSerilogEnrichersConsts.ApplicationName = "Backend-Admin"; @@ -256,6 +259,30 @@ public partial class BackendAdminHttpApiHostModule }); } + private void ConfigureCors(IServiceCollection services, IConfiguration configuration) + { + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) { services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs index c3b971d85..058a83677 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs @@ -95,15 +95,16 @@ public partial class BackendAdminHttpApiHostModule : AbpModule var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); + ConfigureLocalization(); ConfigureJsonSerializer(); - ConfigurePermissionManagement(); ConfigureExceptionHandling(); - ConfigureCaching(configuration); ConfigureVirtualFileSystem(); - ConfigureMultiTenancy(configuration); + ConfigurePermissionManagement(); + ConfigureCaching(configuration); ConfigureAuditing(configuration); ConfigureSwagger(context.Services); - ConfigureLocalization(); + ConfigureMultiTenancy(configuration); + ConfigureCors(context.Services, configuration); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); } @@ -114,8 +115,10 @@ public partial class BackendAdminHttpApiHostModule : AbpModule app.UseCorrelationId(); // 虚拟文件系统 app.UseStaticFiles(); - //路由 + // 路由 app.UseRouting(); + // 跨域 + app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); // jwt diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json index 7491b882c..a5e788276 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -14,7 +14,8 @@ "KnownProxies": [ "localhost" ] - } + }, + "CorsOrigins": "http://localhost:3100" }, "ConnectionStrings": { "Default": "Server=localhost;Database=Platform;User Id=root;Password=123456", diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs index ad71776a0..1c83328dc 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs @@ -4,6 +4,7 @@ using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; @@ -11,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Unicode; using Volo.Abp; @@ -28,6 +30,8 @@ namespace LY.MicroService.LocalizationManagement; public partial class LocalizationManagementHttpApiHostModule { + protected const string DefaultCorsPolicyName = "Default"; + private void PreConfigureApp() { AbpSerilogEnrichersConsts.ApplicationName = "Localization"; @@ -205,6 +209,30 @@ public partial class LocalizationManagementHttpApiHostModule }); } + private void ConfigureCors(IServiceCollection services, IConfiguration configuration) + { + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) { services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs index 87fb2f456..bdc6cd87f 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs @@ -65,14 +65,15 @@ namespace LY.MicroService.LocalizationManagement var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); + ConfigureLocalization(); ConfigureJsonSerializer(); ConfigreExceptionHandling(); - ConfigureAuditing(configuration); - ConfigureCaching(configuration); ConfigureVirtualFileSystem(); - ConfigureMultiTenancy(configuration); - ConfigureLocalization(); + ConfigureCaching(configuration); + ConfigureAuditing(configuration); ConfigureSwagger(context.Services); + ConfigureMultiTenancy(configuration); + ConfigureCors(context.Services, configuration); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); } @@ -85,8 +86,10 @@ namespace LY.MicroService.LocalizationManagement app.UseCorrelationId(); // 虚拟文件系统 app.UseStaticFiles(); - //路由 + // 路由 app.UseRouting(); + // 跨域 + app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); // jwt diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json index e0f8327fd..fbb5e23e9 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json @@ -8,7 +8,8 @@ "tag": "Localization" }, "App": { - "TrackingEntitiesChanged": true + "TrackingEntitiesChanged": true, + "CorsOrigins": "http://localhost:3100" }, "ConnectionStrings": { "Default": "Server=localhost;Database=Platform;User Id=root;Password=123456", diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs index 5211cdf38..274e49bc7 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs @@ -4,6 +4,7 @@ using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -13,6 +14,7 @@ using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; using System.IO; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Unicode; using System.Threading.Tasks; @@ -32,6 +34,8 @@ namespace LY.MicroService.PlatformManagement; public partial class PlatformManagementHttpApiHostModule { + protected const string DefaultCorsPolicyName = "Default"; + private void PreConfigureApp() { AbpSerilogEnrichersConsts.ApplicationName = "Platform"; @@ -251,6 +255,30 @@ public partial class PlatformManagementHttpApiHostModule }); } + private void ConfigureCors(IServiceCollection services, IConfiguration configuration) + { + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) { services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs index 88cf8df07..b7e4e1bbb 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs @@ -92,16 +92,17 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); - ConfigureJsonSerializer(); - ConfigureKestrelServer(); ConfigureBlobStoring(); + ConfigureLocalization(); + ConfigureKestrelServer(); + ConfigureJsonSerializer(); ConfigreExceptionHandling(); - ConfigureCaching(configuration); ConfigureVirtualFileSystem(); - ConfigureMultiTenancy(configuration); + ConfigureCaching(configuration); ConfigureAuditing(configuration); ConfigureSwagger(context.Services); - ConfigureLocalization(); + ConfigureMultiTenancy(configuration); + ConfigureCors(context.Services, configuration); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); } @@ -113,8 +114,10 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule app.UseCorrelationId(); // 虚拟文件系统 app.UseStaticFiles(); - //路由 + // 路由 app.UseRouting(); + // 跨域 + app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); // jwt diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json index 090b239ce..c35347b98 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json @@ -13,7 +13,8 @@ "KnownProxies": [ "localhost" ] - } + }, + "CorsOrigins": "http://localhost:3100" }, "RemoteServices": { "AbpIdentity": { diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs index 2a25e7457..365820866 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs @@ -230,6 +230,8 @@ public partial class RealtimeMessageHttpApiHostModule .ToArray() ) .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") .SetIsOriginAllowedToAllowWildcardSubdomains() .AllowAnyHeader() .AllowAnyMethod() diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index f6a8fc264..5976629b5 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -88,16 +88,16 @@ namespace LY.MicroService.RealtimeMessage var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); + ConfigureLocalization(); ConfigureJsonSerializer(); ConfigreExceptionHandling(); ConfigureVirtualFileSystem(); - ConfigureMultiTenancy(configuration); ConfigureCaching(configuration); - ConfigureSwagger(context.Services); - ConfigureCors(context.Services, configuration); - ConfigureLocalization(); ConfigureAuditing(configuration); + ConfigureSwagger(context.Services); + ConfigureMultiTenancy(configuration); ConfigureHangfireServer(context.Services); + ConfigureCors(context.Services, configuration); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); } @@ -108,7 +108,7 @@ namespace LY.MicroService.RealtimeMessage app.UseCorrelationId(); // 虚拟文件系统 app.UseStaticFiles(); - //路由 + // 路由 app.UseRouting(); // 跨域 app.UseCors(DefaultCorsPolicyName); diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json index ae590fb5f..d8cd5a3d3 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json @@ -8,7 +8,7 @@ "tag": "Message" }, "App": { - "CorsOrigins": "http://localhost:9527,http://localhost:30000,http://localhost:3100", + "CorsOrigins": "http://localhost:3100", "Forwarded": { "ForwardedHeaders": 5, "KnownProxies": [ diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs index f08cc4ad6..45f838445 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs @@ -4,6 +4,7 @@ using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -12,6 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Unicode; using Volo.Abp; @@ -32,6 +34,8 @@ namespace LY.MicroService.IdentityServer; public partial class IdentityServerHttpApiHostModule { + protected const string DefaultCorsPolicyName = "Default"; + private void PreConfigureApp() { AbpSerilogEnrichersConsts.ApplicationName = "Identity-Server-Admin"; @@ -251,6 +255,30 @@ public partial class IdentityServerHttpApiHostModule }); } + private void ConfigureCors(IServiceCollection services, IConfiguration configuration) + { + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) { services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs index ee2317c2a..78d5812ad 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs @@ -72,15 +72,16 @@ public partial class IdentityServerHttpApiHostModule : AbpModule var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); + ConfigureLocalization(); ConfigureJsonSerializer(); - ConfigurePermissionManagement(); ConfigreExceptionHandling(); - ConfigureAuditing(configuration); - ConfigureCaching(configuration); ConfigureVirtualFileSystem(); - ConfigureMultiTenancy(configuration); + ConfigurePermissionManagement(); + ConfigureCaching(configuration); + ConfigureAuditing(configuration); ConfigureSwagger(context.Services); - ConfigureLocalization(); + ConfigureMultiTenancy(configuration); + ConfigureCors(context.Services, configuration); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); } @@ -91,8 +92,10 @@ public partial class IdentityServerHttpApiHostModule : AbpModule app.UseCorrelationId(); // 虚拟文件系统 app.UseStaticFiles(); - //路由 + // 路由 app.UseRouting(); + // 跨域 + app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); app.UseAbpClaimsMap(); diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json index 82973b8e2..b5e8b15e6 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json @@ -10,7 +10,7 @@ "App": { "TrackingEntitiesChanged": true, "SelfUrl": "http://localhost:30015/", - "CorsOrigins": "http://localhost:4200,http://localhost:9527,http://localhost:3100" + "CorsOrigins": "http://localhost:3100" }, "ConnectionStrings": { "Default": "Server=localhost;Database=IdentityServer;User Id=root;Password=123456", diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs index 6e5dec54e..30580cfb2 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs @@ -246,6 +246,8 @@ public partial class IdentityServerModule .ToArray() ) .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") .SetIsOriginAllowedToAllowWildcardSubdomains() .AllowAnyHeader() .AllowAnyMethod() diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json index 0f9f92842..50f6a344c 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json @@ -10,7 +10,7 @@ "App": { "TrackingEntitiesChanged": true, "SelfUrl": "http://localhost:44385/", - "CorsOrigins": "http://localhost:4200,http://localhost:9527,http://localhost:3100" + "CorsOrigins": "http://localhost:3100" }, "AppSelfUrl": "http://localhost:44385/", "ConnectionStrings": { diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs index 4148d9578..3f9c7216d 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs @@ -3,6 +3,7 @@ using LINGYUN.MicroService.Internal.ApiGateway.Localization; using LINGYUN.MicroService.Internal.ApiGateway.Ocelot.Configuration.Repository; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Routing; @@ -17,6 +18,7 @@ using Ocelot.Multiplexer; using Ocelot.Provider.Polly; using StackExchange.Redis; using System; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Unicode; using Volo.Abp.Caching; @@ -29,6 +31,8 @@ namespace LINGYUN.MicroService.Internal.ApiGateway { public partial class InternalApiGatewayModule { + protected const string DefaultCorsPolicyName = "Default"; + private void PreConfigureApp() { AbpSerilogEnrichersConsts.ApplicationName = "Internal-ApiGateWay"; @@ -178,6 +182,30 @@ namespace LINGYUN.MicroService.Internal.ApiGateway }); } + private void ConfigureCors(IServiceCollection services, IConfiguration configuration) + { + services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders + .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult") + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + } + private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) { services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs index 42bd70aa6..31cc54a87 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs @@ -47,6 +47,7 @@ namespace LINGYUN.MicroService.Internal.ApiGateway ConfigureMvc(context.Services); ConfigureSwagger(context.Services); + ConfigureCors(context.Services, configuration); ConfigureOcelot(context.Services, configuration); } @@ -56,6 +57,7 @@ namespace LINGYUN.MicroService.Internal.ApiGateway app.UseAuditing(); app.UseStaticFiles(); app.UseRouting(); + app.UseCors(DefaultCorsPolicyName); app.UseAuthentication(); app.UseAbpClaimsMap(); app.MapWhen( diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json index 836e80b3f..881e00207 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json @@ -7,6 +7,9 @@ "name": "ApiGateway", "tag": "ApiGateway" }, + "App": { + "CorsOrigins": "http://localhost:3100" + }, "ApiGateway": { "AppId": "TEST-APP", "DownstreamOpenApis": [