diff --git a/aspnet-core/.gitignore b/aspnet-core/.gitignore index 796eb0ca8..3bd3c27ef 100644 --- a/aspnet-core/.gitignore +++ b/aspnet-core/.gitignore @@ -5,4 +5,5 @@ Publish **/*.csproj.user nupkg consoles -*.configs.cache \ No newline at end of file +*.configs.cache +appsettings.Staging.json diff --git a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln index f102b0e95..ec0e352d9 100644 --- a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln +++ b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln @@ -158,6 +158,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Claims.Mapping", "framework\security\LINGYUN.Abp.Claims.Mapping\LINGYUN.Abp.Claims.Mapping.csproj", "{34042B8E-B896-4E5E-A243-31E2802264CE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platform", "platform", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.Domain.Shared", "modules\platform\LINGYUN.Platform.Domain.Shared\LINGYUN.Platform.Domain.Shared.csproj", "{FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.Application.Contracts", "modules\platform\LINGYUN.Platform.Application.Contracts\LINGYUN.Platform.Application.Contracts.csproj", "{16C5E2EC-7A8F-2697-F611-0F2C22087192}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.HttpApi.Client", "modules\platform\LINGYUN.Platform.HttpApi.Client\LINGYUN.Platform.HttpApi.Client.csproj", "{0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Emailing.Platform", "modules\platform\LINGYUN.Abp.Emailing.Platform\LINGYUN.Abp.Emailing.Platform.csproj", "{8BAB6A91-865C-A599-BE2A-7C487129D83A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Sms.Platform", "modules\platform\LINGYUN.Abp.Sms.Platform\LINGYUN.Abp.Sms.Platform.csproj", "{8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -404,6 +416,26 @@ Global {34042B8E-B896-4E5E-A243-31E2802264CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {34042B8E-B896-4E5E-A243-31E2802264CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {34042B8E-B896-4E5E-A243-31E2802264CE}.Release|Any CPU.Build.0 = Release|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Release|Any CPU.Build.0 = Release|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Release|Any CPU.Build.0 = Release|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Release|Any CPU.Build.0 = Release|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Release|Any CPU.Build.0 = Release|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -469,6 +501,11 @@ Global {6CC06BD8-FA30-45E0-BD3A-25FF39906EF5} = {77341F31-F54C-436A-AF8D-F78D91303C45} {3EBB4CA4-82C2-41C6-94C5-CB0D4D2B6D07} = {77341F31-F54C-436A-AF8D-F78D91303C45} {34042B8E-B896-4E5E-A243-31E2802264CE} = {5A41C31A-B966-418B-B446-5BA1D7E61A62} + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {16C5E2EC-7A8F-2697-F611-0F2C22087192} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {8BAB6A91-865C-A599-BE2A-7C487129D83A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E1FD1F4C-D344-408B-97CF-B6F1F6D7D293} diff --git a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln index e29bffbc2..3978ea819 100644 --- a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln +++ b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln @@ -153,6 +153,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Identity.Sessio EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Identity.Session.AspNetCore", "modules\identity\LINGYUN.Abp.Identity.Session.AspNetCore\LINGYUN.Abp.Identity.Session.AspNetCore.csproj", "{BE58649C-EA57-4DFC-8D25-54FDCB1943A1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platform", "platform", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.Domain.Shared", "modules\platform\LINGYUN.Platform.Domain.Shared\LINGYUN.Platform.Domain.Shared.csproj", "{FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.Application.Contracts", "modules\platform\LINGYUN.Platform.Application.Contracts\LINGYUN.Platform.Application.Contracts.csproj", "{16C5E2EC-7A8F-2697-F611-0F2C22087192}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Platform.HttpApi.Client", "modules\platform\LINGYUN.Platform.HttpApi.Client\LINGYUN.Platform.HttpApi.Client.csproj", "{0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Sms.Platform", "modules\platform\LINGYUN.Abp.Sms.Platform\LINGYUN.Abp.Sms.Platform.csproj", "{8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Emailing.Platform", "modules\platform\LINGYUN.Abp.Emailing.Platform\LINGYUN.Abp.Emailing.Platform.csproj", "{8BAB6A91-865C-A599-BE2A-7C487129D83A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -395,6 +407,26 @@ Global {BE58649C-EA57-4DFC-8D25-54FDCB1943A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE58649C-EA57-4DFC-8D25-54FDCB1943A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE58649C-EA57-4DFC-8D25-54FDCB1943A1}.Release|Any CPU.Build.0 = Release|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F}.Release|Any CPU.Build.0 = Release|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16C5E2EC-7A8F-2697-F611-0F2C22087192}.Release|Any CPU.Build.0 = Release|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B}.Release|Any CPU.Build.0 = Release|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0}.Release|Any CPU.Build.0 = Release|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BAB6A91-865C-A599-BE2A-7C487129D83A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -471,6 +503,12 @@ Global {23E99204-F7C1-47BA-84CD-3C9D05210F4F} = {03B4B0AA-83CE-4E4B-9CE2-47369BF88B97} {BF298DF5-BC1D-4DDD-A51E-8E9020D2C5F1} = {23E99204-F7C1-47BA-84CD-3C9D05210F4F} {BE58649C-EA57-4DFC-8D25-54FDCB1943A1} = {23E99204-F7C1-47BA-84CD-3C9D05210F4F} + {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {03B4B0AA-83CE-4E4B-9CE2-47369BF88B97} + {FDEF1FD1-574D-AF6E-5CBB-46FA0CE5633F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {16C5E2EC-7A8F-2697-F611-0F2C22087192} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {0EA7605E-3364-6EDC-3AC1-F21A9A984B9B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {8298C4A6-5275-D7A2-9A5C-99B5F2D0E7A0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {8BAB6A91-865C-A599-BE2A-7C487129D83A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {80ED12A5-C899-459F-A181-ADCC9D680DE5} diff --git a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj index ecb2f4f80..07a0cab5c 100644 --- a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj +++ b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj @@ -24,8 +24,8 @@ - + diff --git a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs index 184b40aea..94b3523dc 100644 --- a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs +++ b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs @@ -1,5 +1,4 @@ using LINGYUN.Abp.Aliyun.Localization; -using LINGYUN.Abp.Sms.Aliyun; using Localization.Resources.AbpUi; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc; @@ -11,7 +10,6 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement; [DependsOn( typeof(AbpAliyunModule), - typeof(AbpAliyunSmsModule), typeof(AbpAspNetCoreMvcModule))] public class AbpAliyunSettingManagementModule : AbpModule { diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json b/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json index 72508643d..05c826ae1 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json @@ -48,6 +48,9 @@ "Password": "123456", "ExchangeName": "LINGYUN.Abp.Application", "VirtualHost": "/" + }, + "Redis": { + "Configuration": "127.0.0.1" } }, "DistributedCache": { diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs index 5e49108c7..295d86437 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs @@ -1,6 +1,7 @@ using DotNetCore.CAP; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; +using LINGYUN.Abp.Gdpr.Localization; using LINGYUN.Abp.Identity.Session; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.OpenIddict.Permissions; @@ -33,6 +34,7 @@ using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Auditing; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Caching; +using Volo.Abp.Data; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.FeatureManagement; @@ -127,6 +129,36 @@ public partial class AuthServerHttpApiHostModule mysql.TranslateParameterizedCollectionsToConstants(); }); }); + + Configure(options => + { + options.Databases.Configure("Platform", database => + { + database.MapConnection("AbpSaas"); + database.MapConnection("Workflow"); + database.MapConnection("AppPlatform"); + database.MapConnection("TaskManagement"); + database.MapConnection("AbpAuditLogging"); + database.MapConnection("AbpTextTemplating"); + database.MapConnection("AbpSettingManagement"); + database.MapConnection("AbpFeatureManagement"); + database.MapConnection("AbpPermissionManagement"); + database.MapConnection("AbpLocalizationManagement"); + database.MapConnection("AbpDataProtectionManagement"); + }); + options.Databases.Configure("Identity", database => + { + database.MapConnection("AbpGdpr"); + database.MapConnection("AbpIdentity"); + database.MapConnection("AbpOpenIddict"); + database.MapConnection("AbpIdentityServer"); + }); + options.Databases.Configure("Realtime", database => + { + database.MapConnection("Notifications"); + database.MapConnection("MessageService"); + }); + }); } private void ConfigureJsonSerializer(IConfiguration configuration) @@ -406,6 +438,7 @@ public partial class AuthServerHttpApiHostModule options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); options.UsePersistences( + typeof(GdprResource), typeof(IdentityResource), typeof(AbpOpenIddictResource)); }); diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs index e381b8e98..5893145dc 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs @@ -5,8 +5,13 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.Claims.Mapping; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; +using LINGYUN.Abp.Exporter.MiniExcel; +using LINGYUN.Abp.Gdpr; +using LINGYUN.Abp.Gdpr.EntityFrameworkCore; +using LINGYUN.Abp.Gdpr.Identity; using LINGYUN.Abp.Identity; using LINGYUN.Abp.Identity.EntityFrameworkCore; using LINGYUN.Abp.Identity.Session.AspNetCore; @@ -16,7 +21,7 @@ using LINGYUN.Abp.OpenIddict; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; -using LINGYUN.Abp.Sms.Aliyun; +using LINGYUN.Abp.Sms.Platform; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -30,7 +35,6 @@ using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.EntityFrameworkCore.MySQL; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; @@ -52,6 +56,10 @@ namespace LY.MicroService.AuthServer; typeof(AbpOpenIddictApplicationModule), typeof(AbpOpenIddictHttpApiModule), typeof(AbpOpenIddictEntityFrameworkCoreModule), + typeof(AbpGdprApplicationModule), + typeof(AbpGdprHttpApiModule), + typeof(AbpGdprDomainIdentityModule), + typeof(AbpGdprEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreMySQLModule), typeof(AbpSaasEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule), @@ -63,14 +71,15 @@ namespace LY.MicroService.AuthServer; typeof(AbpEmailingExceptionHandlingModule), typeof(AbpCAPEventBusModule), typeof(AbpHttpClientModule), - typeof(AbpAliyunSmsModule), - typeof(AbpMailKitModule), + typeof(AbpSmsPlatformModule), + typeof(AbpEmailingPlatformModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpIdentitySessionAspNetCoreModule), typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpAspNetCoreMvcWrapperModule), + typeof(AbpExporterMiniExcelModule), typeof(AbpClaimsMappingModule), typeof(AbpAutofacModule) )] diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj index 3d6e80a9d..84143c4f1 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -48,7 +48,6 @@ - @@ -63,7 +62,7 @@ - + @@ -75,6 +74,10 @@ + + + + @@ -82,6 +85,8 @@ + + diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json index 75ea7083a..686ffb482 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "AuthServer.Admin", - "tag": "AuthServer.Admin" + "tag": "AuthServer.Admin", + "configCacheEncrypt": true }, "App": { "ShowPii": true, @@ -45,15 +46,10 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentity": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", - "OpenIddict": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None" + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "CAP": { "EventBus": { @@ -86,6 +82,12 @@ "Configuration": "127.0.0.1,defaultDatabase=10", "InstanceName": "LINGYUN.Abp.Application" }, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "AuthServer": { "Authority": "http://127.0.0.1:44385", "Audience": "lingyun-abp-application", 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 98c554fdd..cabb6e104 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs @@ -9,6 +9,7 @@ using LINGYUN.Abp.CachingManagement.StackExchangeRedis; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.DataProtectionManagement; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.FeatureManagement; @@ -27,7 +28,7 @@ using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.SettingManagement; -using LINGYUN.Abp.Sms.Aliyun; +using LINGYUN.Abp.Sms.Platform; using LINGYUN.Abp.Tencent.SettingManagement; using LINGYUN.Abp.TextTemplating; using LINGYUN.Abp.TextTemplating.EntityFrameworkCore; @@ -44,11 +45,9 @@ using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; -using Volo.Abp.EntityFrameworkCore.MySQL; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; using Volo.Abp.IdentityServer.EntityFrameworkCore; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.Identity; @@ -114,8 +113,8 @@ namespace LY.MicroService.BackendAdmin; typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpEmailingExceptionHandlingModule), typeof(AbpHttpClientModule), - typeof(AbpMailKitModule), - typeof(AbpAliyunSmsModule), + typeof(AbpSmsPlatformModule), + typeof(AbpEmailingPlatformModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpAspNetCoreMvcWrapperModule), diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj index 911141e45..9f59d4959 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj @@ -51,7 +51,6 @@ - @@ -75,7 +74,6 @@ - @@ -101,6 +99,8 @@ + + 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 099a28f3f..4a878629e 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 @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "BackendAdmin", - "tag": "BackendAdmin" + "tag": "BackendAdmin", + "configCacheEncrypt": true }, "App": { "CorsOrigins": "http://127.0.0.1:3100", @@ -26,14 +27,9 @@ }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "CAP": { "EventBus": { @@ -72,6 +68,12 @@ "MapInboundClaims": false, "RequireHttpsMetadata": false }, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "Logging": { "Serilog": { "Elasticsearch": { 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 a6bc0c37e..1610ea5f7 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 @@ -33,6 +33,7 @@ using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Auditing; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Caching; +using Volo.Abp.Data; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.FeatureManagement; @@ -126,6 +127,36 @@ public partial class IdentityServerHttpApiHostModule mysql.TranslateParameterizedCollectionsToConstants(); }); }); + + Configure(options => + { + options.Databases.Configure("Platform", database => + { + database.MapConnection("AbpSaas"); + database.MapConnection("Workflow"); + database.MapConnection("AppPlatform"); + database.MapConnection("TaskManagement"); + database.MapConnection("AbpAuditLogging"); + database.MapConnection("AbpTextTemplating"); + database.MapConnection("AbpSettingManagement"); + database.MapConnection("AbpFeatureManagement"); + database.MapConnection("AbpPermissionManagement"); + database.MapConnection("AbpLocalizationManagement"); + database.MapConnection("AbpDataProtectionManagement"); + }); + options.Databases.Configure("Identity", database => + { + database.MapConnection("AbpGdpr"); + database.MapConnection("AbpIdentity"); + database.MapConnection("AbpOpenIddict"); + database.MapConnection("AbpIdentityServer"); + }); + options.Databases.Configure("Realtime", database => + { + database.MapConnection("Notifications"); + database.MapConnection("MessageService"); + }); + }); } private void ConfigureJsonSerializer(IConfiguration configuration) 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 f49e7f647..6c9189f00 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs @@ -4,15 +4,20 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.Claims.Mapping; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; +using LINGYUN.Abp.Exporter.MiniExcel; +using LINGYUN.Abp.Gdpr.EntityFrameworkCore; +using LINGYUN.Abp.Gdpr.Identity; +using LINGYUN.Abp.Gdpr; using LINGYUN.Abp.Identity.Session.AspNetCore; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; -using LINGYUN.Abp.Sms.Aliyun; +using LINGYUN.Abp.Sms.Platform; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -26,7 +31,6 @@ using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.EntityFrameworkCore.MySQL; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -39,6 +43,10 @@ namespace LY.MicroService.IdentityServer; typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreMultiTenancyModule), typeof(AbpAspNetCoreMvcLocalizationModule), + typeof(AbpGdprApplicationModule), + typeof(AbpGdprHttpApiModule), + typeof(AbpGdprDomainIdentityModule), + typeof(AbpGdprEntityFrameworkCoreModule), typeof(LINGYUN.Abp.Account.AbpAccountApplicationModule), typeof(LINGYUN.Abp.Account.AbpAccountHttpApiModule), typeof(LINGYUN.Abp.Identity.AbpIdentityApplicationModule), @@ -57,16 +65,17 @@ namespace LY.MicroService.IdentityServer; typeof(AbpAuthorizationOrganizationUnitsModule), typeof(AbpAuditLoggingElasticsearchModule), typeof(AbpEmailingExceptionHandlingModule), + typeof(AbpEmailingPlatformModule), + typeof(AbpSmsPlatformModule), typeof(AbpCAPEventBusModule), typeof(AbpHttpClientModule), - typeof(AbpAliyunSmsModule), - typeof(AbpMailKitModule), typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpIdentitySessionAspNetCoreModule), typeof(AbpAspNetCoreMvcWrapperModule), + typeof(AbpExporterMiniExcelModule), typeof(AbpClaimsMappingModule), - typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpAutofacModule) )] public partial class IdentityServerHttpApiHostModule : AbpModule diff --git a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj index bb477b54f..491b2ea05 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -69,7 +69,7 @@ - + @@ -81,6 +81,10 @@ + + + + @@ -89,6 +93,8 @@ + + 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 7db7bc633..14e25e590 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 @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "IdentityServer.Admin", - "tag": "IdentityServer.Admin" + "tag": "IdentityServer.Admin", + "configCacheEncrypt": true }, "App": { "ShowPii": true, @@ -45,15 +46,10 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "CAP": { "EventBus": { @@ -86,6 +82,12 @@ "Configuration": "127.0.0.1,defaultDatabase=10", "InstanceName": "LINGYUN.Abp.Application" }, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "AuthServer": { "Authority": "http://127.0.0.1:44385/", "Audience": "lingyun-abp-application", diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj index 6c21fd2c3..9e9911a73 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj @@ -44,7 +44,6 @@ - @@ -70,6 +69,8 @@ + + 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 c3c7fbfbc..effcfd0e4 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs @@ -3,6 +3,7 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.Data.DbMigrator; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Identity.Session.AspNetCore; @@ -12,6 +13,7 @@ using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Platform; using LY.MicroService.LocalizationManagement.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -24,7 +26,6 @@ using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -54,7 +55,8 @@ namespace LY.MicroService.LocalizationManagement; typeof(AbpLocalizationCultureMapModule), typeof(AbpIdentitySessionAspNetCoreModule), typeof(AbpHttpClientModule), - typeof(AbpMailKitModule), + typeof(AbpSmsPlatformModule), + typeof(AbpEmailingPlatformModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpAutofacModule) 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 f8a28558a..459f8c07e 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 @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "Localization", - "tag": "Localization" + "tag": "Localization", + "configCacheEncrypt": true }, "App": { "CorsOrigins": "http://127.0.0.1:3100", @@ -26,12 +27,9 @@ }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None" + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "CAP": { "EventBus": { @@ -64,6 +62,12 @@ "Configuration": "127.0.0.1,defaultDatabase=10", "InstanceName": "LINGYUN.Abp.Application" }, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "AuthServer": { "Authority": "http://127.0.0.1:44385/", "Audience": "lingyun-abp-application", diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj index 4531072de..7f1cecc3a 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj @@ -43,9 +43,9 @@ + - @@ -61,6 +61,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailMessageManager.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailMessageManager.cs new file mode 100644 index 000000000..18b2bb180 --- /dev/null +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailMessageManager.cs @@ -0,0 +1,26 @@ +using LINGYUN.Platform.Messages; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.BlobStoring; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Emailing; +using Volo.Abp.Settings; + +namespace LY.MicroService.PlatformManagement.Messages; + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(IEmailMessageManager), typeof(EmailMessageManager))] +public class PlatformEmailMessageManager : EmailMessageManager +{ + public PlatformEmailMessageManager( + ISettingProvider settingProvider, + IEmailMessageRepository repository, + IBlobContainer blobContainer) + : base(settingProvider, repository, blobContainer) + { + } + + protected override IEmailSender GetEmailSender() + { + return LazyServiceProvider.GetRequiredKeyedService("DefaultEmailSender"); + } +} diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailSender.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailSender.cs new file mode 100644 index 000000000..3ff9bcb17 --- /dev/null +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformEmailSender.cs @@ -0,0 +1,127 @@ +using LINGYUN.Platform.Messages; +using LINGYUN.Platform.Messages.Integration; +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Mail; +using System.Threading.Tasks; +using Volo.Abp.Content; +using Volo.Abp.Data; +using Volo.Abp.Emailing; + +namespace LY.MicroService.PlatformManagement.Messages; + +public class PlatformEmailSender : IEmailSender +{ + private readonly IEmailMessageIntegrationService _service; + public PlatformEmailSender(IEmailMessageIntegrationService service) + { + _service = service; + } + + public virtual Task QueueAsync(string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs additionalEmailSendingArgs = null) + { + return SendAsync(from: null, to, subject, body, isBodyHtml, additionalEmailSendingArgs); + } + + public virtual Task QueueAsync(string from, string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs additionalEmailSendingArgs = null) + { + return SendAsync(from, to, subject, body, isBodyHtml, additionalEmailSendingArgs); + } + + public virtual Task SendAsync(string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs additionalEmailSendingArgs = null) + { + return SendAsync(from: null, to, subject, body, isBodyHtml, additionalEmailSendingArgs); + } + + public async virtual Task SendAsync(string from, string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs additionalEmailSendingArgs = null) + { + var createInput = new EmailMessageCreateDto( + to, + body, + from, + subject, + isBodyHtml, + additionalEmailSendingArgs?.CC?.JoinAsString(",")) + { + Normalize = true + }; + + if (additionalEmailSendingArgs?.Attachments != null) + { + var attachments = new List(); + + foreach (var attachment in additionalEmailSendingArgs.Attachments) + { + var stream = new MemoryStream(attachment.File.Length); + + await stream.WriteAsync(attachment.File, 0, attachment.File.Length); + + stream.Seek(0, SeekOrigin.Begin); + + attachments.Add(new RemoteStreamContent(stream, attachment.Name)); + } + + createInput.Attachments = attachments.ToArray(); + } + if (additionalEmailSendingArgs?.ExtraProperties != null) + { + createInput.ExtraProperties = new ExtraPropertyDictionary(); + foreach (var prop in additionalEmailSendingArgs.ExtraProperties) + { + createInput.ExtraProperties.Add(prop.Key, prop.Value); + } + } + + await _service.CreateAsync(createInput); + } + + public async virtual Task SendAsync(MailMessage mail, bool normalize = true) + { + var createInput = new EmailMessageCreateDto( + mail.To.ToString(), + mail.Body, + mail.From?.ToString(), + mail.Subject, + mail.IsBodyHtml, + mail.CC?.ToString()) + { + Normalize = normalize, + Priority = mail.Priority, + BodyTransferEncoding = mail.BodyTransferEncoding, + DeliveryNotificationOptions = mail.DeliveryNotificationOptions + }; + + if (mail.Attachments != null) + { + var attachments = new List(); + + foreach (var attachment in mail.Attachments) + { + attachments.Add( + new RemoteStreamContent( + attachment.ContentStream, + attachment.Name, + attachment.ContentType?.ToString())); + } + + createInput.Attachments = attachments.ToArray(); + } + + if (mail.Headers != null) + { + var headers = new List(); + foreach (var key in mail.Headers.AllKeys) + { + var value = mail.Headers.Get(key); + if (!value.IsNullOrWhiteSpace()) + { + headers.Add(new EmailMessageHeaderDto(key, value)); + } + } + createInput.Headers = headers; + } + + await _service.CreateAsync(createInput); + } +} diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsMessageManager.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsMessageManager.cs new file mode 100644 index 000000000..e78395416 --- /dev/null +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsMessageManager.cs @@ -0,0 +1,22 @@ +using LINGYUN.Platform.Messages; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Sms; + +namespace LY.MicroService.PlatformManagement.Messages; + + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(ISmsMessageManager), typeof(SmsMessageManager))] +public class PlatformSmsMessageManager : SmsMessageManager +{ + public PlatformSmsMessageManager( + ISmsMessageRepository repository) : base(repository) + { + } + + protected override ISmsSender GetSmsSender() + { + return LazyServiceProvider.GetRequiredKeyedService("DefaultSmsSender"); + } +} diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsSender.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsSender.cs new file mode 100644 index 000000000..7637a3986 --- /dev/null +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Messages/PlatformSmsSender.cs @@ -0,0 +1,35 @@ +using LINGYUN.Platform.Messages; +using LINGYUN.Platform.Messages.Integration; +using System.Threading.Tasks; +using Volo.Abp.Data; +using Volo.Abp.Sms; +using SmsMessage = Volo.Abp.Sms.SmsMessage; + +namespace LY.MicroService.PlatformManagement.Messages; + +public class PlatformSmsSender : ISmsSender +{ + private readonly ISmsMessageIntegrationService _service; + public PlatformSmsSender(ISmsMessageIntegrationService service) + { + _service = service; + } + + public async virtual Task SendAsync(SmsMessage smsMessage) + { + var createInput = new SmsMessageCreateDto( + smsMessage.PhoneNumber, + smsMessage.Text); + + if (smsMessage.Properties != null) + { + createInput.ExtraProperties = new ExtraPropertyDictionary(); + foreach (var property in smsMessage.Properties) + { + createInput.ExtraProperties[property.Key] = property.Value; + } + } + + await _service.CreateAsync(createInput); + } +} 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 e38f32952..c590fb34a 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 @@ -1,11 +1,14 @@ using DotNetCore.CAP; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; +using LINGYUN.Abp.Identity.Session.AspNetCore; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Aliyun; using LINGYUN.Abp.Wrapper; using LINGYUN.Platform.Localization; +using LY.MicroService.PlatformManagement.Messages; using Medallion.Threading; using Medallion.Threading.Redis; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -17,6 +20,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using OpenTelemetry.Metrics; @@ -42,8 +46,10 @@ using Volo.Abp.Http.Client; using Volo.Abp.Json; using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Localization; +using Volo.Abp.MailKit; using Volo.Abp.MultiTenancy; using Volo.Abp.Security.Claims; +using Volo.Abp.Sms; using Volo.Abp.Threading; using Volo.Abp.Timing; using Volo.Abp.VirtualFileSystem; @@ -473,4 +479,21 @@ public partial class PlatformManagementHttpApiHostModule }); }); } + + private void ConfigurePlatformModule(IServiceCollection services) + { + Configure(options => + { + // 允许第三方调用集成服务 + options.ExposeIntegrationServices = true; + }); + // 用于消息中心邮件集中发送 + services.Replace(ServiceDescriptor.Transient()); + + services.AddKeyedTransient("DefaultEmailSender"); + + // 用于消息中心短信集中发送 + services.Replace(ServiceDescriptor.Transient()); + services.AddKeyedSingleton("DefaultSmsSender"); + } } 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 8ff1df6ed..bca6da0c3 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs @@ -19,6 +19,7 @@ using LINGYUN.Abp.OssManagement.SettingManagement; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Aliyun; using LINGYUN.Abp.UI.Navigation.VueVbenAdmin; using LINGYUN.Platform; using LINGYUN.Platform.EntityFrameworkCore; @@ -94,6 +95,7 @@ namespace LY.MicroService.PlatformManagement; typeof(AbpIdentitySessionAspNetCoreModule), typeof(AbpHttpClientModule), typeof(AbpMailKitModule), + typeof(AbpAliyunSmsModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpClaimsMappingModule), typeof(AbpAspNetCoreHttpOverridesModule), @@ -137,6 +139,8 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule ConfigureDistributedLocking(context.Services, configuration); ConfigureSeedWorker(context.Services, hostingEnvironment.IsDevelopment()); ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment()); + + ConfigurePlatformModule(context.Services); } public override void OnPostApplicationInitialization(ApplicationInitializationContext context) 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 e0923ca6e..6d9489113 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 @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "Platform", - "tag": "Platform" + "tag": "Platform", + "configCacheEncrypt": true }, "App": { "TrackingEntitiesChanged": true, @@ -49,13 +50,9 @@ }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AppPlatform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None" + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "Features": { "Validation": { @@ -112,11 +109,11 @@ }, "Serilog": { "MinimumLevel": { - "Default": "Debug", + "Default": "Information", "Override": { "System": "Warning", "Microsoft": "Warning", - "DotNetCore": "Debug" + "DotNetCore": "Warning" } }, "WriteTo": [ diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.json index 4b4a8bdad..6aafcdcf1 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.json +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.json @@ -20,12 +20,11 @@ }, "Serilog": { "MinimumLevel": { - "Default": "Debug", + "Default": "Information", "Override": { "System": "Warning", - "Microsoft.EntityFramework.Core": "Debug", - "Microsoft": "Information", - "DotNetCore": "Information" + "Microsoft": "Warning", + "DotNetCore": "Warning" } }, "Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName", "WithUniqueId" ], diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj index 9eaf9a789..6ac987822 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj @@ -50,7 +50,6 @@ - @@ -81,6 +80,8 @@ + + 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 5165184fc..95199210f 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -8,6 +8,7 @@ using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Data.DbMigrator; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Notifications; using LINGYUN.Abp.Features.LimitValidation.Redis; @@ -34,6 +35,7 @@ using LINGYUN.Abp.Notifications.WxPusher; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Platform; using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using LINGYUN.Abp.TextTemplating.EntityFrameworkCore; using LINGYUN.Abp.TextTemplating.Scriban; @@ -53,7 +55,6 @@ using Volo.Abp.BackgroundWorkers; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -113,8 +114,9 @@ namespace LY.MicroService.RealtimeMessage; typeof(AbpCachingStackExchangeRedisModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpIdentitySessionAspNetCoreModule), + typeof(AbpEmailingPlatformModule), + typeof(AbpSmsPlatformModule), typeof(AbpHttpClientModule), - typeof(AbpMailKitModule), typeof(AbpClaimsMappingModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpAspNetCoreHttpOverridesModule), 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 c010b794d..b7f830b01 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 @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "Message", - "tag": "Message" + "tag": "Message", + "configCacheEncrypt": true }, "App": { "CorsOrigins": "http://127.0.0.1:3100", @@ -37,17 +38,10 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Messages-v70;User Id=root;Password=123456;SslMode=None", - "MessageService": "Server=127.0.0.1;Database=Messages-v70;User Id=root;Password=123456;SslMode=None", - "Notifications": "Server=127.0.0.1;Database=Messages-v70;User Id=root;Password=123456;SslMode=None", - "TaskManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "DistributedLock": { "IsEnabled": true, @@ -68,6 +62,12 @@ "Configuration": "127.0.0.1,defaultDatabase=8", "InstanceName": "LINGYUN.Abp.Application" }, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "SignalR": { "Redis": { "IsEnabled": true, diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj index 3f96d6a43..eb1230ece 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj @@ -42,7 +42,6 @@ - @@ -67,6 +66,8 @@ + + diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs index 897b0d130..aaa6fddbd 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs @@ -10,6 +10,7 @@ using LINGYUN.Abp.BackgroundTasks.Notifications; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Data.DbMigrator; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; @@ -18,6 +19,7 @@ using LINGYUN.Abp.OssManagement; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Platform; using LINGYUN.Abp.TaskManagement; using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using LY.MicroService.TaskManagement.EntityFrameworkCore; @@ -35,7 +37,6 @@ using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.DistributedLocking; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client.IdentityModel.Web; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -72,9 +73,10 @@ namespace LY.MicroService.TaskManagement; typeof(TaskManagementMigrationsEntityFrameworkCoreModule), typeof(AbpDataDbMigratorModule), typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpEmailingPlatformModule), + typeof(AbpSmsPlatformModule), typeof(AbpAspNetCoreMvcModule), typeof(AbpSwashbuckleModule), - typeof(AbpMailKitModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpAspNetCoreHttpOverridesModule), diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json index ee4a07124..b48c6cdc4 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "LINGYUN.Abp.TaskManagement", - "tag": "LINGYUN.Abp.TaskManagement" + "tag": "LINGYUN.Abp.TaskManagement", + "configCacheEncrypt": true }, "App": { "ShowPii": true, @@ -59,18 +60,19 @@ }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "TaskManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "RemoteServices": { "AbpOssManagement": { "BaseUrl": "http://127.0.0.1:30025", "IdentityClient": "InternalServiceClient", "UseCurrentAccessToken": false + }, + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false } }, "IdentityClients": { diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj index bfde4d225..ef24803a7 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj @@ -38,7 +38,6 @@ - @@ -66,6 +65,8 @@ + + diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs index 1b85af13d..3a9b1119f 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs @@ -8,6 +8,7 @@ using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Dapr.Client.Wrapper; +using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Http.Client.Wrapper; @@ -16,6 +17,7 @@ using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.Sms.Platform; using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using LINGYUN.Abp.Webhooks.EventBus; using LINGYUN.Abp.Webhooks.Identity; @@ -36,7 +38,6 @@ using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.DistributedLocking; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client.IdentityModel.Web; -using Volo.Abp.MailKit; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -78,7 +79,8 @@ namespace LY.MicroService.WebhooksManagement; typeof(AbpHttpClientWrapperModule), typeof(AbpDaprClientWrapperModule), typeof(AbpClaimsMappingModule), - typeof(AbpMailKitModule), + typeof(AbpEmailingPlatformModule), + typeof(AbpSmsPlatformModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpIdentitySessionAspNetCoreModule), diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index a65910887..a540decce 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -6,7 +6,8 @@ "secret": "1q2w3E*", "nodes": "http://127.0.0.1:5000", "name": "LINGYUN.Abp.WebhooksManagement", - "tag": "LINGYUN.Abp.WebhooksManagement" + "tag": "LINGYUN.Abp.WebhooksManagement", + "configCacheEncrypt": true }, "App": { "ShowPii": true, @@ -24,14 +25,10 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "WebhooksManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "TaskManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Platform": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "Identity": "Server=127.0.0.1;Database=AuthServer-V70;User Id=root;Password=123456;SslMode=None", + "Realtime": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None" }, "DistributedLock": { "IsEnabled": true, @@ -45,7 +42,12 @@ "Endpoint": "http://127.0.0.1:9411/api/v2/spans" } }, - "RemoteServices": {}, + "RemoteServices": { + "Platform": { + "BaseUrl": "http://127.0.0.1:30025", + "UseCurrentAccessToken": false + } + }, "IdentityClients": { "InternalServiceClient": { "Authority": "http://127.0.0.1:44385", @@ -66,7 +68,7 @@ }, "MySql": { "TableNamePrefix": "wkm", - "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" + "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" }, "RabbitMQ": { "HostName": "127.0.0.1",