From cb32e89f0205e4b6cd91275e2eda338c0e4f2788 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sun, 21 Feb 2021 16:40:31 +0800 Subject: [PATCH] Fixed part of AliCloud API namespace name --- aspnet-core/LINGYUN.MicroService.All.sln | 7 + ...INGYUN.Abp.Aliyun.SettingManagement.csproj | 28 ++++ .../AbpAliyunSettingManagementModule.cs | 42 +++++ .../AliyunSettingAppService.cs | 146 ++++++++++++++++++ .../AliyunSettingController.cs | 37 +++++ ...iyunSettingPermissionDefinitionProvider.cs | 24 +++ .../AliyunSettingPermissionNames.cs | 9 ++ .../IAliyunSettingAppService.cs | 13 ++ .../Localization/Resources/en.json | 9 ++ .../Localization/Resources/zh-Hans.json | 9 ++ .../LINGYUN.Abp.Aliyun.csproj | 8 +- .../Abp/Aliyun/AbpAliyunException.cs | 2 +- .../Abp/Aliyun/AbpAliyunModule.cs | 4 +- .../Abp/Aliyun/AcsClientFactory.cs | 2 +- .../AliyunBasicSessionCredentialsCacheItem.cs | 2 +- .../Abp/Aliyun/AliyunClientFactory.cs | 4 +- .../Abp/Aliyun/IAcsClientFactory.cs | 2 +- .../Abp/Aliyun/Localization/AliyunResource.cs | 2 +- .../Abp/Aliyun/Localization/Resources/en.json | 2 + .../Localization/Resources/zh-Hans.json | 2 + .../Abp/Aliyun/Settings/AliyunSettingNames.cs | 2 +- .../Aliyun/Settings/AliyunSettingProvider.cs | 6 +- .../BlobStoring/Aliyun/OssClientFactory.cs | 2 +- .../LINGYUN.Abp.EventBus.CAP.xml | 2 +- .../LINGYUN.Abp.Sms.Aliyun.csproj | 8 +- .../Abp/Sms/Aliyun/AbpAliyunSmsModule.cs | 10 +- .../Abp/Sms/Aliyun/AliyunSmsException.cs | 4 +- .../Abp/Sms/Aliyun/AliyunSmsResponse.cs | 125 +++++++++++++++ .../Abp/Sms/Aliyun/AliyunSmsSender.cs | 7 +- .../Sms/Aliyun/AliyunSmsSuccessResponse.cs | 2 +- .../Sms/Aliyun/Localization/Resources/en.json | 16 ++ .../Localization/Resources/zh-Hans.json | 28 ++-- .../Aliyun/Settings/AliyunSmsSettingNames.cs | 4 +- .../Settings/AliyunSmsSettingProvider.cs | 4 +- .../Abp/Sms/Aliyun/AliyunSmsResponse.cs | 125 --------------- .../Aliyun/Localization/AliyunSmsResource.cs | 9 -- .../Volo/Abp/Sms/AliyunSmsSenderExtensions.cs | 2 +- .../BackendAdminHostModule.cs | 4 +- ...NGYUN.Abp.BackendAdmin.HttpApi.Host.csproj | 1 + .../LINGYUN.ApiGateway.Host/event-bus-cap.db | Bin 40960 -> 40960 bytes .../Aliyun/AbpBlobStoringAliyunTestModule.cs | 2 +- .../settings/components/SettingEditForm.vue | 4 +- 42 files changed, 529 insertions(+), 192 deletions(-) create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionDefinitionProvider.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionNames.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/en.json create mode 100644 aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/zh-Hans.json rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/AbpAliyunException.cs (94%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/AbpAliyunModule.cs (86%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/AcsClientFactory.cs (97%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs (96%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/AliyunClientFactory.cs (99%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/IAcsClientFactory.cs (92%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/Localization/AliyunResource.cs (74%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/Localization/Resources/en.json (92%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/Localization/Resources/zh-Hans.json (92%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/Settings/AliyunSettingNames.cs (97%) rename aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/{LINYUN => LINGYUN}/Abp/Aliyun/Settings/AliyunSettingProvider.cs (96%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs (68%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/AliyunSmsException.cs (75%) create mode 100644 aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/AliyunSmsSender.cs (97%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs (76%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/Localization/Resources/en.json (83%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json (77%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs (94%) rename aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/{LINYUN => LINGYUN}/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs (97%) delete mode 100644 aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs delete mode 100644 aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index 21a4ff369..5e3dc6ef8 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -269,6 +269,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Tencent", "modu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Notifications.Sms", "modules\common\LINGYUN.Abp.Notifications.Sms\LINGYUN.Abp.Notifications.Sms.csproj", "{8C3312E7-F51E-4780-A893-CE0E0B80B579}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Aliyun.SettingManagement", "modules\cloud-aliyun\LINGYUN.Abp.Aliyun.SettingManagement\LINGYUN.Abp.Aliyun.SettingManagement.csproj", "{FE0F0889-C4AF-43C5-B851-B8CCC873BA2C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -707,6 +709,10 @@ Global {8C3312E7-F51E-4780-A893-CE0E0B80B579}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C3312E7-F51E-4780-A893-CE0E0B80B579}.Release|Any CPU.ActiveCfg = Release|Any CPU {8C3312E7-F51E-4780-A893-CE0E0B80B579}.Release|Any CPU.Build.0 = Release|Any CPU + {FE0F0889-C4AF-43C5-B851-B8CCC873BA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE0F0889-C4AF-43C5-B851-B8CCC873BA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE0F0889-C4AF-43C5-B851-B8CCC873BA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE0F0889-C4AF-43C5-B851-B8CCC873BA2C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -842,6 +848,7 @@ Global {FCFAF1AF-B3F6-45F3-85AB-8249EB8432CC} = {14CDBAD1-10C8-464A-B445-1F727C988010} {97B4A37E-B93E-48C9-95D5-689CB9495D8B} = {3B96F4D8-4993-419B-BCEB-AFE4ED39449F} {8C3312E7-F51E-4780-A893-CE0E0B80B579} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E} + {FE0F0889-C4AF-43C5-B851-B8CCC873BA2C} = {14CDBAD1-10C8-464A-B445-1F727C988010} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj new file mode 100644 index 000000000..42635f0d0 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj @@ -0,0 +1,28 @@ + + + + net5.0 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs new file mode 100644 index 000000000..4bfd73992 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs @@ -0,0 +1,42 @@ +using LINGYUN.Abp.Aliyun.Localization; +using LINGYUN.Abp.Sms.Aliyun; +using Localization.Resources.AbpUi; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Localization; +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + [DependsOn( + typeof(AbpAliyunModule), + typeof(AbpAliyunSmsModule), + typeof(AbpAspNetCoreMvcModule))] + public class AbpAliyunSettingManagementModule : AbpModule + { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(mvcBuilder => + { + mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpAliyunSettingManagementModule).Assembly); + }); + } + + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes(typeof(AbpUiResource)) + .AddVirtualJson("/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources"); + }); + } + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs new file mode 100644 index 000000000..585d659f0 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs @@ -0,0 +1,146 @@ +using LINGYUN.Abp.Aliyun.Localization; +using LINGYUN.Abp.Aliyun.Settings; +using LINGYUN.Abp.SettingManagement; +using LINGYUN.Abp.Sms.Aliyun.Settings; +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.MultiTenancy; +using Volo.Abp.SettingManagement; +using Volo.Abp.Settings; +using ValueType = LINGYUN.Abp.SettingManagement.ValueType; + +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + public class AliyunSettingAppService : ApplicationService, IAliyunSettingAppService + { + protected ISettingManager SettingManager { get; } + protected IPermissionChecker PermissionChecker { get; } + protected ISettingDefinitionManager SettingDefinitionManager { get; } + + public AliyunSettingAppService( + ISettingManager settingManager, + IPermissionChecker permissionChecker, + ISettingDefinitionManager settingDefinitionManager) + { + SettingManager = settingManager; + PermissionChecker = permissionChecker; + SettingDefinitionManager = settingDefinitionManager; + LocalizationResource = typeof(AliyunResource); + } + + public virtual async Task> GetAllForCurrentTenantAsync() + { + return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString()); + } + + public virtual async Task> GetAllForGlobalAsync() + { + return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null); + } + + protected virtual async Task> GetAllForProviderAsync(string providerName, string providerKey) + { + var settingGroups = new List(); + + // 无权限返回空结果,直接报错的话,网关聚合会抛出异常 + if (await PermissionChecker.IsGrantedAsync(AliyunSettingPermissionNames.Settings)) + { + var aliyunSettingGroup = new SettingGroupDto(L["DisplayName:Aliyun"], L["Description:Aliyun"]); + #region 访问控制 + + var ramSetting = aliyunSettingGroup.AddSetting(L["DisplayName:Aliyun.RAM"], L["Description:Aliyun.RAM"]); + + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RegionId), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RegionId, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.AccessKeyId), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeyId, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.AccessKeySecret), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeySecret, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RamRoleArn), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RamRoleArn, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RoleSessionName), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RoleSessionName, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.Policy), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.Policy, providerName, providerKey), + ValueType.String); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.UseSecurityTokenService), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.UseSecurityTokenService, providerName, providerKey), + ValueType.Boolean); + ramSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSettingNames.Authorization.DurationSeconds), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.DurationSeconds, providerName, providerKey), + ValueType.Number); + + #endregion + + #region 短信 + + var smsSetting = aliyunSettingGroup.AddSetting(L["DisplayName:Aliyun.Sms"], L["Description:Aliyun.Sms"]); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.Domain), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.Domain, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.Version), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.Version, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.ActionName), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.ActionName, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultPhoneNumber), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultPhoneNumber, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultSignName), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultSignName, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultTemplateCode), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultTemplateCode, providerName, providerKey), + ValueType.String); + smsSetting.AddDetail( + SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.VisableErrorToClient), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.VisableErrorToClient, providerName, providerKey), + ValueType.Boolean); + + #endregion + + settingGroups.Add(aliyunSettingGroup); + } + + return new ListResultDto(settingGroups); + } + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs new file mode 100644 index 000000000..a811fbdc3 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs @@ -0,0 +1,37 @@ +using LINGYUN.Abp.SettingManagement; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc; + +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)] + [Area("settingManagement")] + [Route("api/setting-management/aliyun")] + public class AliyunSettingController : AbpController, IAliyunSettingAppService + { + protected IAliyunSettingAppService AppService { get; } + + public AliyunSettingController( + IAliyunSettingAppService appService) + { + AppService = appService; + } + + [HttpGet] + [Route("by-current-tenant")] + public virtual async Task> GetAllForCurrentTenantAsync() + { + return await AppService.GetAllForCurrentTenantAsync(); + } + + [HttpGet] + [Route("by-global")] + public virtual async Task> GetAllForGlobalAsync() + { + return await AppService.GetAllForGlobalAsync(); + } + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionDefinitionProvider.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionDefinitionProvider.cs new file mode 100644 index 000000000..8ac602476 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionDefinitionProvider.cs @@ -0,0 +1,24 @@ +using LINGYUN.Abp.Aliyun.Localization; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Localization; + +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + public class AliyunSettingPermissionDefinitionProvider : PermissionDefinitionProvider + { + public override void Define(IPermissionDefinitionContext context) + { + var wechatGroup = context.AddGroup( + AliyunSettingPermissionNames.GroupName, + L("Permission:Aliyun")); + + wechatGroup.AddPermission( + AliyunSettingPermissionNames.Settings, L("Permission:Aliyun.Settings")); + } + + protected LocalizableString L(string name) + { + return LocalizableString.Create(name); + } + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionNames.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionNames.cs new file mode 100644 index 000000000..4a277157a --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionNames.cs @@ -0,0 +1,9 @@ +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + public class AliyunSettingPermissionNames + { + public const string GroupName = "Abp.Aliyun"; + + public const string Settings = GroupName + ".Settings"; + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs new file mode 100644 index 000000000..d312249be --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs @@ -0,0 +1,13 @@ +using LINGYUN.Abp.SettingManagement; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace LINGYUN.Abp.Aliyun.SettingManagement +{ + public interface IAliyunSettingAppService + { + Task> GetAllForGlobalAsync(); + + Task> GetAllForCurrentTenantAsync(); + } +} diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/en.json b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/en.json new file mode 100644 index 000000000..c8c4e0443 --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/en.json @@ -0,0 +1,9 @@ +{ + "culture": "en", + "texts": { + "Permission:Aliyun": "Aliyun", + "Permission:Aliyun.Settings": "Settings", + "DisplayName:Aliyun": "Aliyun", + "Description:Aliyun": "Aliyun" + } +} \ No newline at end of file diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/zh-Hans.json b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/zh-Hans.json new file mode 100644 index 000000000..594d5542a --- /dev/null +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/zh-Hans.json @@ -0,0 +1,9 @@ +{ + "culture": "zh-Hans", + "texts": { + "Permission:Aliyun": "阿里云服务", + "Permission:Aliyun.Settings": "配置阿里云", + "DisplayName:Aliyun": "阿里云服务", + "Description:Aliyun": "阿里云服务" + } +} \ No newline at end of file diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj index 8ed96f7d2..ac2fd5fea 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj @@ -10,13 +10,13 @@ - - + + - - + + diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunException.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunException.cs similarity index 94% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunException.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunException.cs index 510c5a040..0ea3920d0 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunException.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunException.cs @@ -3,7 +3,7 @@ using Volo.Abp; using Volo.Abp.ExceptionHandling; using Volo.Abp.Logging; -namespace LINYUN.Abp.Aliyun +namespace LINGYUN.Abp.Aliyun { public class AbpAliyunException : AbpException, IHasErrorCode, IHasLogLevel { diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunModule.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunModule.cs similarity index 86% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunModule.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunModule.cs index ed462d06a..603401ae3 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunModule.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunModule.cs @@ -1,4 +1,4 @@ -using LINYUN.Abp.Aliyun.Localization; +using LINGYUN.Abp.Aliyun.Localization; using Volo.Abp.Caching; using Volo.Abp.Json; using Volo.Abp.Localization; @@ -25,7 +25,7 @@ namespace LINGYUN.Abp.Aliyun Configure(options => { options.Resources - .Add() + .Add("zh-Hans") // 中国区云服务,默认使用简体中文 .AddVirtualJson("/LINGYUN/Abp/Aliyun/Localization/Resources"); }); } diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AcsClientFactory.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AcsClientFactory.cs similarity index 97% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AcsClientFactory.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AcsClientFactory.cs index 277732303..9517c87b2 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AcsClientFactory.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AcsClientFactory.cs @@ -5,7 +5,7 @@ using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Settings; -namespace LINYUN.Abp.Aliyun +namespace LINGYUN.Abp.Aliyun { public class AcsClientFactory : AliyunClientFactory, IAcsClientFactory, ITransientDependency { diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs similarity index 96% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs index 7d135ce34..bcb58b284 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs @@ -1,6 +1,6 @@ using System; -namespace LINYUN.Abp.Aliyun +namespace LINGYUN.Abp.Aliyun { [Serializable] public class AliyunBasicSessionCredentialsCacheItem diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunClientFactory.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunClientFactory.cs similarity index 99% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunClientFactory.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunClientFactory.cs index 95912462c..9faf7d575 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunClientFactory.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunClientFactory.cs @@ -2,7 +2,7 @@ using Aliyun.Acs.Core.Auth.Sts; using Aliyun.Acs.Core.Http; using Aliyun.Acs.Core.Profile; -using LINYUN.Abp.Aliyun.Settings; +using LINGYUN.Abp.Aliyun.Settings; using Microsoft.Extensions.Caching.Distributed; using System; using System.Threading.Tasks; @@ -10,7 +10,7 @@ using Volo.Abp; using Volo.Abp.Caching; using Volo.Abp.Settings; -namespace LINYUN.Abp.Aliyun +namespace LINGYUN.Abp.Aliyun { /// /// 阿里云通用客户端构建工厂 diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/IAcsClientFactory.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/IAcsClientFactory.cs similarity index 92% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/IAcsClientFactory.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/IAcsClientFactory.cs index fd2b84838..4b552d879 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/IAcsClientFactory.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/IAcsClientFactory.cs @@ -1,7 +1,7 @@ using Aliyun.Acs.Core; using System.Threading.Tasks; -namespace LINYUN.Abp.Aliyun +namespace LINGYUN.Abp.Aliyun { public interface IAcsClientFactory { diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/AliyunResource.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/AliyunResource.cs similarity index 74% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/AliyunResource.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/AliyunResource.cs index 943765dbb..c340d2e4a 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/AliyunResource.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/AliyunResource.cs @@ -1,6 +1,6 @@ using Volo.Abp.Localization; -namespace LINYUN.Abp.Aliyun.Localization +namespace LINGYUN.Abp.Aliyun.Localization { [LocalizationResourceName("Aliyun")] public class AliyunResource diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/en.json b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/en.json similarity index 92% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/en.json rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/en.json index 19cf0fdf0..c2ec27158 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/en.json +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/en.json @@ -1,6 +1,8 @@ { "culture": "en", "texts": { + "DisplayName:Aliyun.RAM": "RAM", + "Description:Aliyun.RAM": "RAM", "DisplayName:Authorization": "Authorization", "Description:Authorization": "Authorization", "DisplayName:RegionId": "Region Id", diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json similarity index 92% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json index 20e7c54e4..0554c335c 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json @@ -1,6 +1,8 @@ { "culture": "zh-Hans", "texts": { + "DisplayName:Aliyun.RAM": "访问控制", + "Description:Aliyun.RAM": "阿里云服务访问控制", "DisplayName:Authorization": "阿里云身份认证凭据", "Description:Authorization": "阿里云身份认证凭据", "DisplayName:RegionId": "地域ID", diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs similarity index 97% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs index edc985e08..9bbd67fb2 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs @@ -1,4 +1,4 @@ -namespace LINYUN.Abp.Aliyun.Settings +namespace LINGYUN.Abp.Aliyun.Settings { public static class AliyunSettingNames { diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs similarity index 96% rename from aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs rename to aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs index 2e4f081b4..d4f06b6d4 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs @@ -1,8 +1,8 @@ -using LINYUN.Abp.Aliyun.Localization; +using LINGYUN.Abp.Aliyun.Localization; using Volo.Abp.Localization; using Volo.Abp.Settings; -namespace LINYUN.Abp.Aliyun.Settings +namespace LINGYUN.Abp.Aliyun.Settings { public class AliyunSettingProvider : SettingDefinitionProvider { @@ -31,7 +31,7 @@ namespace LINYUN.Abp.Aliyun.Settings ), new SettingDefinition( AliyunSettingNames.Authorization.DurationSeconds, - defaultValue: "3000", + defaultValue: "3600", displayName: L("DisplayName:DurationSeconds"), description: L("Description:DurationSeconds"), isVisibleToClients: false diff --git a/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs b/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs index 2446c3269..aed9f2321 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs @@ -1,5 +1,5 @@ using Aliyun.OSS; -using LINYUN.Abp.Aliyun; +using LINGYUN.Abp.Aliyun; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Settings; diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml index e8a019a89..cca96b655 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml @@ -59,7 +59,7 @@ Storage - + 创建过期消息清理任务 diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj index 8c5ee9c87..3fcef314d 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj @@ -9,13 +9,13 @@ - - + + - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs similarity index 68% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs index fa606577f..87daa4203 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs @@ -1,12 +1,11 @@ using LINGYUN.Abp.Aliyun; -using LINYUN.Abp.Aliyun.Localization; -using LINYUN.Abp.Sms.Aliyun.Localization; +using LINGYUN.Abp.Aliyun.Localization; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.Sms; using Volo.Abp.VirtualFileSystem; -namespace LINYUN.Abp.Sms.Aliyun +namespace LINGYUN.Abp.Sms.Aliyun { [DependsOn( typeof(AbpSmsModule), @@ -23,9 +22,8 @@ namespace LINYUN.Abp.Sms.Aliyun Configure(options => { options.Resources - .Add("en") - .AddBaseTypes(typeof(AliyunResource)) - .AddVirtualJson("/LINYUN/Abp/Sms/Aliyun/Localization/Resources"); + .Get() + .AddVirtualJson("/LINGYUN/Abp/Sms/Aliyun/Localization/Resources"); }); } } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsException.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsException.cs similarity index 75% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsException.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsException.cs index 7e80ff3bd..1ffb34058 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsException.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsException.cs @@ -1,6 +1,6 @@ -using LINYUN.Abp.Aliyun; +using LINGYUN.Abp.Aliyun; -namespace LINYUN.Abp.Sms.Aliyun +namespace LINGYUN.Abp.Sms.Aliyun { public class AliyunSmsException : AbpAliyunException { diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs new file mode 100644 index 000000000..40e92d186 --- /dev/null +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs @@ -0,0 +1,125 @@ +using LINGYUN.Abp.Aliyun.Localization; +using System; +using Volo.Abp; +using Volo.Abp.Localization; + +namespace LINGYUN.Abp.Sms.Aliyun +{ + public class AliyunSmsResponse + { + public string Code { get; set; } + public string Message { get; set; } + public string RequestId { get; set; } + + public bool IsSuccess() + { + return "ok".Equals(Code, StringComparison.CurrentCultureIgnoreCase); + } + + public static ILocalizableString GetErrorMessage(string code, string message) + { + // TODO: 把前缀写入本地化文档里面? + Check.NotNullOrWhiteSpace(code, nameof(code)); + switch (code) + { + case "isv.SMS_SIGNATURE_SCENE_ILLEGAL": + return LocalizableString.Create("SMS_SIGNATURE_SCENE_ILLEGAL"); + case "isv.DENY_IP_RANGE": + return LocalizableString.Create("DENY_IP_RANGE"); + case "isv.MOBILE_COUNT_OVER_LIMIT": + return LocalizableString.Create("MOBILE_COUNT_OVER_LIMIT"); + case "isv.BUSINESS_LIMIT_CONTROL": + return LocalizableString.Create("BUSINESS_LIMIT_CONTROL"); + case "SignatureDoesNotMatch": + return LocalizableString.Create("SignatureDoesNotMatch"); + case "InvalidTimeStamp.Expired": + return LocalizableString.Create("InvalidTimeStampExpired"); + case "SignatureNonceUsed": + return LocalizableString.Create("SignatureNonceUsed"); + case "InvalidVersion": + return LocalizableString.Create("InvalidVersion"); + case "InvalidAction.NotFound": + return LocalizableString.Create("InvalidActionNotFound"); + case "isv.SIGN_COUNT_OVER_LIMIT": + return LocalizableString.Create("SIGN_COUNT_OVER_LIMIT"); + case "isv.TEMPLATE_COUNT_OVER_LIMIT": + return LocalizableString.Create("TEMPLATE_COUNT_OVER_LIMIT"); + case "isv.SIGN_NAME_ILLEGAL": + return LocalizableString.Create("SIGN_NAME_ILLEGAL"); + case "isv.SIGN_FILE_LIMIT": + return LocalizableString.Create("SIGN_FILE_LIMIT"); + case "isv.SIGN_OVER_LIMIT": + return LocalizableString.Create("SIGN_OVER_LIMIT"); + case "isv.TEMPLATE_OVER_LIMIT": + return LocalizableString.Create("TEMPLATE_OVER_LIMIT"); + case "SIGNATURE_BLACKLIST": + return LocalizableString.Create("SIGNATURE_BLACKLIST"); + case "isv.SHORTURL_OVER_LIMIT": + return LocalizableString.Create("SHORTURL_OVER_LIMIT"); + case "isv.NO_AVAILABLE_SHORT_URL": + return LocalizableString.Create("NO_AVAILABLE_SHORT_URL"); + case "isv.SHORTURL_NAME_ILLEGAL": + return LocalizableString.Create("SHORTURL_NAME_ILLEGAL"); + case "isv.SOURCEURL_OVER_LIMIT": + return LocalizableString.Create("SOURCEURL_OVER_LIMIT"); + case "isv.SHORTURL_TIME_ILLEGAL": + return LocalizableString.Create("SHORTURL_TIME_ILLEGAL"); + case "isv.PHONENUMBERS_OVER_LIMIT": + return LocalizableString.Create("PHONENUMBERS_OVER_LIMIT"); + case "isv.SHORTURL_STILL_AVAILABLE": + return LocalizableString.Create("SHORTURL_STILL_AVAILABLE"); + case "isv.SHORTURL_NOT_FOUND": + return LocalizableString.Create("SHORTURL_NOT_FOUND"); + case "isv.SMS_TEMPLATE_ILLEGAL": + return LocalizableString.Create("SMS_TEMPLATE_ILLEGAL"); + case "isv.SMS_SIGNATURE_ILLEGAL": + return LocalizableString.Create("SMS_SIGNATURE_ILLEGAL"); + case "isv.MOBILE_NUMBER_ILLEGAL": + return LocalizableString.Create("MOBILE_NUMBER_ILLEGAL"); + case "isv.TEMPLATE_MISSING_PARAMETERS": + return LocalizableString.Create("TEMPLATE_MISSING_PARAMETERS"); + case "isv.EXTEND_CODE_ERROR": + return LocalizableString.Create("EXTEND_CODE_ERROR"); + case "isv.DOMESTIC_NUMBER_NOT_SUPPORTED": + return LocalizableString.Create("DOMESTIC_NUMBER_NOT_SUPPORTED"); + case "isv.DAY_LIMIT_CONTROL": + return LocalizableString.Create("DAY_LIMIT_CONTROL"); + case "isv.SMS_CONTENT_ILLEGAL": + return LocalizableString.Create("SMS_CONTENT_ILLEGAL"); + case "isv.SMS_SIGN_ILLEGAL": + return LocalizableString.Create("SMS_SIGN_ILLEGAL"); + case "isp.RAM_PERMISSION_DENY": + return LocalizableString.Create("RAM_PERMISSION_DENY"); + case "isp.OUT_OF_SERVICE": + return LocalizableString.Create("OUT_OF_SERVICE"); + case "isv.PRODUCT_UN_SUBSCRIPT": + return LocalizableString.Create("PRODUCT_UN_SUBSCRIPT"); + case "isv.PRODUCT_UNSUBSCRIBE": + return LocalizableString.Create("PRODUCT_UNSUBSCRIBE"); + case "isv.ACCOUNT_NOT_EXISTS": + return LocalizableString.Create("ACCOUNT_NOT_EXISTS"); + case "isv.ACCOUNT_ABNORMAL": + return LocalizableString.Create("ACCOUNT_ABNORMAL"); + case "isv.INVALID_PARAMETERS": + return LocalizableString.Create("INVALID_PARAMETERS"); + case "isv.SYSTEM_ERROR": + return LocalizableString.Create("SYSTEM_ERROR"); + case "isv.INVALID_JSON_PARAM": + return LocalizableString.Create("INVALID_JSON_PARAM"); + case "isv.BLACK_KEY_CONTROL_LIMIT": + return LocalizableString.Create("BLACK_KEY_CONTROL_LIMIT"); + case "isv.PARAM_LENGTH_LIMIT": + return LocalizableString.Create("PARAM_LENGTH_LIMIT"); + case "isv.PARAM_NOT_SUPPORT_URL": + return LocalizableString.Create("PARAM_NOT_SUPPORT_URL"); + case "isv.AMOUNT_NOT_ENOUGH": + return LocalizableString.Create("AMOUNT_NOT_ENOUGH"); + case "isv.TEMPLATE_PARAMS_ILLEGAL": + return LocalizableString.Create("TEMPLATE_PARAMS_ILLEGAL"); + default: + throw new AbpException($"no error code: {code} define, message: {message}"); + + } + } + } +} diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs similarity index 97% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs index 695eb9d80..34d1d9c90 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs @@ -1,10 +1,9 @@ using Aliyun.Acs.Core; using Aliyun.Acs.Core.Exceptions; using Aliyun.Acs.Core.Http; -using LINYUN.Abp.Aliyun; -using LINYUN.Abp.Sms.Aliyun.Settings; +using LINGYUN.Abp.Aliyun; +using LINGYUN.Abp.Sms.Aliyun.Settings; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using System; using System.Text; using System.Threading.Tasks; @@ -14,7 +13,7 @@ using Volo.Abp.Json; using Volo.Abp.Settings; using Volo.Abp.Sms; -namespace LINYUN.Abp.Sms.Aliyun +namespace LINGYUN.Abp.Sms.Aliyun { [Dependency(ServiceLifetime.Singleton)] [ExposeServices(typeof(ISmsSender), typeof(AliyunSmsSender))] diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs similarity index 76% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs index 4d0ad74c7..57a20e4f2 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs @@ -1,4 +1,4 @@ -namespace LINYUN.Abp.Sms.Aliyun +namespace LINGYUN.Abp.Sms.Aliyun { public class AliyunSmsSuccessResponse : AliyunSmsResponse { diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/en.json b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/en.json similarity index 83% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/en.json rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/en.json index 5ef98e5a2..8e9508511 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/en.json +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/en.json @@ -1,6 +1,22 @@ { "culture": "en", "texts": { + "DisplayName:Aliyun.Sms": "Sms", + "Description:Aliyun.Sms": "Sms", + "DisplayName:ActionName": "Action Name", + "Description:ActionName": "Action Name", + "DisplayName:DefaultSignName": "Default Sign Name", + "Description:DefaultSignName": "Default Sign Name", + "DisplayName:DefaultTemplateCode": "Default Template Code", + "Description:DefaultTemplateCode": "Default Template Code", + "DisplayName:DefaultPhoneNumber": "Default Phone Number", + "Description:DefaultPhoneNumber": "Default Phone Number", + "DisplayName:Domain": "Domain", + "Description:Domain": "Domain", + "DisplayName:Version": "Version", + "Description:Version": "Version", + "DisplayName:VisableErrorToClient": "Visable Error To Client", + "Description:VisableErrorToClient": "Visable Error To Client", "SendMessageFailed": "Text message sending failed:{0}", "SMS_SIGNATURE_SCENE_ILLEGAL": "Signature scene used by SMS is illegal", "DENY_IP_RANGE": "Region where source IP address is disabled", diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json similarity index 77% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json index 61a23fb63..64b5e3304 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json @@ -1,20 +1,22 @@ { "culture": "zh-Hans", "texts": { - "DisplayName:ActionName": "阿里云身份认证凭据", - "Description:ActionName": "阿里云身份认证凭据", - "DisplayName:DefaultSignName": "地域ID", - "Description:DefaultSignName": "正在使用的地域ID", - "DisplayName:DefaultTemplateCode": "AccessKey Id", - "Description:DefaultTemplateCode": "访问密钥标识", - "DisplayName:DeveloperPhoneNumber": "AccessKey Secret", - "Description:DeveloperPhoneNumber": "访问密钥", + "DisplayName:Aliyun.Sms": "短信服务", + "Description:Aliyun.Sms": "阿里云短信服务", + "DisplayName:ActionName": "发送短信方法", + "Description:ActionName": "发送短信方法名称,详情见阿里云Sms服务", + "DisplayName:DefaultSignName": "默认短信签名", + "Description:DefaultSignName": "当用户未指定短信签名时的默认签名名称", + "DisplayName:DefaultTemplateCode": "默认短信模板号", + "Description:DefaultTemplateCode": "当用户未指定短信签名时的默认短信模板号", + "DisplayName:DefaultPhoneNumber": "默认接收短信手机号", + "Description:DefaultPhoneNumber": "当用户未指定短信接收方时的默认接收手机号码", "DisplayName:Domain": "阿里云sms服务域名", - "Description:Domain": "使用STS Token访问", - "DisplayName:Version": "角色全局资源描述符", - "Description:Version": "格式：acs:ram::$accountID:role/$roleName/$RoleSessionName,详情见阿里云访问控制API", - "DisplayName:RoleSessionName": "角色全局资源描述符", - "Description:RoleSessionName": "格式：acs:ram::$accountID:role/$roleName/$RoleSessionName,详情见阿里云访问控制API", + "Description:Domain": "阿里云sms服务域名", + "DisplayName:Version": "阿里云sms服务版本号", + "Description:Version": "阿里云sms服务版本号", + "DisplayName:VisableErrorToClient": "发送错误到客户端", + "Description:VisableErrorToClient": "当短信服务发送出现错误时是否发送错误详情到客户端", "SendMessageFailed": "发送短信错误:{0}", "SMS_SIGNATURE_SCENE_ILLEGAL": "短信所使用签名场景非法", "DENY_IP_RANGE": "源IP地址所在的地区被禁用", diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs similarity index 94% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs index 8496a3c75..5781114fd 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs @@ -1,6 +1,6 @@ -using LINYUN.Abp.Aliyun.Settings; +using LINGYUN.Abp.Aliyun.Settings; -namespace LINYUN.Abp.Sms.Aliyun.Settings +namespace LINGYUN.Abp.Sms.Aliyun.Settings { public static class AliyunSmsSettingNames { diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs similarity index 97% rename from aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs rename to aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs index f575101f1..f7aff8d6e 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs @@ -1,8 +1,8 @@ -using LINYUN.Abp.Aliyun.Localization; +using LINGYUN.Abp.Aliyun.Localization; using Volo.Abp.Localization; using Volo.Abp.Settings; -namespace LINYUN.Abp.Sms.Aliyun.Settings +namespace LINGYUN.Abp.Sms.Aliyun.Settings { public class AliyunSmsSettingProvider : SettingDefinitionProvider { diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs deleted file mode 100644 index 28ca1b510..000000000 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs +++ /dev/null @@ -1,125 +0,0 @@ -using LINYUN.Abp.Sms.Aliyun.Localization; -using System; -using Volo.Abp; -using Volo.Abp.Localization; - -namespace LINYUN.Abp.Sms.Aliyun -{ - public class AliyunSmsResponse - { - public string Code { get; set; } - public string Message { get; set; } - public string RequestId { get; set; } - - public bool IsSuccess() - { - return "ok".Equals(Code, StringComparison.CurrentCultureIgnoreCase); - } - - public static ILocalizableString GetErrorMessage(string code, string message) - { - // TODO: 把前缀写入本地化文档里面? - Check.NotNullOrWhiteSpace(code, nameof(code)); - switch (code) - { - case "isv.SMS_SIGNATURE_SCENE_ILLEGAL": - return LocalizableString.Create("SMS_SIGNATURE_SCENE_ILLEGAL"); - case "isv.DENY_IP_RANGE": - return LocalizableString.Create("DENY_IP_RANGE"); - case "isv.MOBILE_COUNT_OVER_LIMIT": - return LocalizableString.Create("MOBILE_COUNT_OVER_LIMIT"); - case "isv.BUSINESS_LIMIT_CONTROL": - return LocalizableString.Create("BUSINESS_LIMIT_CONTROL"); - case "SignatureDoesNotMatch": - return LocalizableString.Create("SignatureDoesNotMatch"); - case "InvalidTimeStamp.Expired": - return LocalizableString.Create("InvalidTimeStampExpired"); - case "SignatureNonceUsed": - return LocalizableString.Create("SignatureNonceUsed"); - case "InvalidVersion": - return LocalizableString.Create("InvalidVersion"); - case "InvalidAction.NotFound": - return LocalizableString.Create("InvalidActionNotFound"); - case "isv.SIGN_COUNT_OVER_LIMIT": - return LocalizableString.Create("SIGN_COUNT_OVER_LIMIT"); - case "isv.TEMPLATE_COUNT_OVER_LIMIT": - return LocalizableString.Create("TEMPLATE_COUNT_OVER_LIMIT"); - case "isv.SIGN_NAME_ILLEGAL": - return LocalizableString.Create("SIGN_NAME_ILLEGAL"); - case "isv.SIGN_FILE_LIMIT": - return LocalizableString.Create("SIGN_FILE_LIMIT"); - case "isv.SIGN_OVER_LIMIT": - return LocalizableString.Create("SIGN_OVER_LIMIT"); - case "isv.TEMPLATE_OVER_LIMIT": - return LocalizableString.Create("TEMPLATE_OVER_LIMIT"); - case "SIGNATURE_BLACKLIST": - return LocalizableString.Create("SIGNATURE_BLACKLIST"); - case "isv.SHORTURL_OVER_LIMIT": - return LocalizableString.Create("SHORTURL_OVER_LIMIT"); - case "isv.NO_AVAILABLE_SHORT_URL": - return LocalizableString.Create("NO_AVAILABLE_SHORT_URL"); - case "isv.SHORTURL_NAME_ILLEGAL": - return LocalizableString.Create("SHORTURL_NAME_ILLEGAL"); - case "isv.SOURCEURL_OVER_LIMIT": - return LocalizableString.Create("SOURCEURL_OVER_LIMIT"); - case "isv.SHORTURL_TIME_ILLEGAL": - return LocalizableString.Create("SHORTURL_TIME_ILLEGAL"); - case "isv.PHONENUMBERS_OVER_LIMIT": - return LocalizableString.Create("PHONENUMBERS_OVER_LIMIT"); - case "isv.SHORTURL_STILL_AVAILABLE": - return LocalizableString.Create("SHORTURL_STILL_AVAILABLE"); - case "isv.SHORTURL_NOT_FOUND": - return LocalizableString.Create("SHORTURL_NOT_FOUND"); - case "isv.SMS_TEMPLATE_ILLEGAL": - return LocalizableString.Create("SMS_TEMPLATE_ILLEGAL"); - case "isv.SMS_SIGNATURE_ILLEGAL": - return LocalizableString.Create("SMS_SIGNATURE_ILLEGAL"); - case "isv.MOBILE_NUMBER_ILLEGAL": - return LocalizableString.Create("MOBILE_NUMBER_ILLEGAL"); - case "isv.TEMPLATE_MISSING_PARAMETERS": - return LocalizableString.Create("TEMPLATE_MISSING_PARAMETERS"); - case "isv.EXTEND_CODE_ERROR": - return LocalizableString.Create("EXTEND_CODE_ERROR"); - case "isv.DOMESTIC_NUMBER_NOT_SUPPORTED": - return LocalizableString.Create("DOMESTIC_NUMBER_NOT_SUPPORTED"); - case "isv.DAY_LIMIT_CONTROL": - return LocalizableString.Create("DAY_LIMIT_CONTROL"); - case "isv.SMS_CONTENT_ILLEGAL": - return LocalizableString.Create("SMS_CONTENT_ILLEGAL"); - case "isv.SMS_SIGN_ILLEGAL": - return LocalizableString.Create("SMS_SIGN_ILLEGAL"); - case "isp.RAM_PERMISSION_DENY": - return LocalizableString.Create("RAM_PERMISSION_DENY"); - case "isp.OUT_OF_SERVICE": - return LocalizableString.Create("OUT_OF_SERVICE"); - case "isv.PRODUCT_UN_SUBSCRIPT": - return LocalizableString.Create("PRODUCT_UN_SUBSCRIPT"); - case "isv.PRODUCT_UNSUBSCRIBE": - return LocalizableString.Create("PRODUCT_UNSUBSCRIBE"); - case "isv.ACCOUNT_NOT_EXISTS": - return LocalizableString.Create("ACCOUNT_NOT_EXISTS"); - case "isv.ACCOUNT_ABNORMAL": - return LocalizableString.Create("ACCOUNT_ABNORMAL"); - case "isv.INVALID_PARAMETERS": - return LocalizableString.Create("INVALID_PARAMETERS"); - case "isv.SYSTEM_ERROR": - return LocalizableString.Create("SYSTEM_ERROR"); - case "isv.INVALID_JSON_PARAM": - return LocalizableString.Create("INVALID_JSON_PARAM"); - case "isv.BLACK_KEY_CONTROL_LIMIT": - return LocalizableString.Create("BLACK_KEY_CONTROL_LIMIT"); - case "isv.PARAM_LENGTH_LIMIT": - return LocalizableString.Create("PARAM_LENGTH_LIMIT"); - case "isv.PARAM_NOT_SUPPORT_URL": - return LocalizableString.Create("PARAM_NOT_SUPPORT_URL"); - case "isv.AMOUNT_NOT_ENOUGH": - return LocalizableString.Create("AMOUNT_NOT_ENOUGH"); - case "isv.TEMPLATE_PARAMS_ILLEGAL": - return LocalizableString.Create("TEMPLATE_PARAMS_ILLEGAL"); - default: - throw new AbpException($"no error code: {code} define, message: {message}"); - - } - } - } -} diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs deleted file mode 100644 index b1220263e..000000000 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.Localization; - -namespace LINYUN.Abp.Sms.Aliyun.Localization -{ - [LocalizationResourceName("AliyunSms")] - public class AliyunSmsResource - { - } -} diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/Volo/Abp/Sms/AliyunSmsSenderExtensions.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/Volo/Abp/Sms/AliyunSmsSenderExtensions.cs index c2aefd8da..1319e7d79 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/Volo/Abp/Sms/AliyunSmsSenderExtensions.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/Volo/Abp/Sms/AliyunSmsSenderExtensions.cs @@ -1,4 +1,4 @@ -using LINYUN.Abp.Sms.Aliyun; +using LINGYUN.Abp.Sms.Aliyun; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs index 4bfe96097..5c1558e1b 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs @@ -1,4 +1,5 @@ using DotNetCore.CAP; +using LINGYUN.Abp.Aliyun.SettingManagement; using LINGYUN.Abp.Auditing; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling; @@ -12,7 +13,7 @@ using LINGYUN.Abp.TenantManagement; using LINGYUN.Abp.WeChat.SettingManagement; using LINGYUN.ApiGateway; using LINGYUN.Platform; -using LINYUN.Abp.Sms.Aliyun; +using LINGYUN.Abp.Sms.Aliyun; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; @@ -84,6 +85,7 @@ namespace LINGYUN.Abp.BackendAdmin typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementHttpApiModule), typeof(AbpWeChatSettingManagementModule),// 微信配置管理模块 + typeof(AbpAliyunSettingManagementModule),// 阿里云配置管理模块 typeof(AbpEntityFrameworkCoreMySQLModule), typeof(AbpIdentityEntityFrameworkCoreModule),// 用户角色权限需要引用包 typeof(AbpIdentityServerEntityFrameworkCoreModule), // 客户端权限需要引用包 diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj index 89587183d..b343bbe67 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj @@ -63,6 +63,7 @@ + diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db index 2a350111e61673c8286a7bfd60f161f5ad07f42b..0a09e642588d0bde7b7dac3cc6a87d9ecc6695c1 100644 GIT binary patch delta 2165 zcmeH}KTH!*9LHa;e`smpI9d=x;L4!5P~P9Wca4J$qKOKrSd57Y|5+iDI2jE!)ffzk zTlZ*bylv$QZc0* zMvrIXg(0A!CsGH0|$g#N0J*7~>5ZClM6LcFhl2v@*8(& zXXoeV=I1ISQICDdW`Fa$f78c~4X#ltw!lHP~nW;Xt*AUK6a#WMlcf(joR#OPThT3b81CB7G29T zYNKcT=yoy(88p8u!{Z(wa%$^p8stc0p5&I@k(dB6xF0>-fWG};$w8MLNT?AF>Kt-t zR>wQsqStc}nzf=Ujb}zPd(|s}1Eb}!k%QPUbOV{?$&2UxC3i$|HVtt)k8q3cF#@@v zW3S}aME6FdM|43f)+~PmF?k)xJMss4OSa@!^16LlUD>icnF_~3q7gpL;3A0Eg6*Zv zB50}wc8h?R8#reUL~DWlBZ5dRu*(9%V#CwzFDCBo-iJUELCV@6Ok~r^2@sJ~kZ5%q zQc@+=>MN$Cj+2Hw-cL>%QaI@U){qzer6B=`ytHPzN2CY<(sj$~8Ie*gqC=$Q7-)H& z9IKWuB|9snc+G9@#2u4&`qCRv1QWyzL@8&wGoT#531*Kqd6I`H4;y9_bCWp+iEh{f zPdQ^=T|HZOdT#+X5JQIFc3g?)ASDe)`E)YR|-wwKs1;CMPgnpm$3r$?GOtz=w& zU()l-;EWagFwanM#tH^InL~ys2^53F<*yIf!v$FQCJ}@2aQ+IrKa@0r2qf0eMWs!# V{mTAF5wAU)tL43rm3a88=MNS9Go1hc delta 1609 zcmZWpU1(cn82)mSoi$D3Nz-;tYnx253QfO?u^(7s4(E!ccJD`F`i5NmB`jtlr(gwP;dS-1`~pI51wt%a|Hkph%nZXOlB&&_9_%B*MBy{I`e+# z5E%&^5n-=ieX_WpXBRf!9wpNhzqv~bwbn!{VIK}XYlGU;FF3UOC!xViC`>4(c$xr2 zb|D!uBe+Gx5y6xYf^(&@w#|v<0TRD~N&EVz6UBW5Y)@^xHA+EgW@0*uXM%(KhaES?d9g?*=;lm1&887v$~B&95h)<&X3ahw4W+{ zGhcgf34i+JDfm+F7d?b}bbV)JP$rn|)y?5n)btvK0DwE-u})J6;&;QJv=2V$H90HOCAN zX;;wy{=~cR1OFVSCF_-V3e_`ORz1+H*BU~6GG*e*7&hRrLVu@1lrGVAdW%L~2 zC?PkT3*s^jE2%YgBEBiG#1yR5Z%TkT>;NW&?DeuSo9l_1DVNsrf8L8lVXz~-TS+GD z!saRn!ZL1MENBl(-KKGt%sEP^!S+VlBOgyXJ;#!JS`tG#eWKHykN~7YNw8p~J6gB! xGyV=L{E+)FTlROh>OcGKoiD4|TT2IvL$E621>!b}57*#U{b8z|{p_Fd{{Z$?lfeK0 diff --git a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs index ee777eede..7fa0456e7 100644 --- a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs +++ b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs @@ -1,6 +1,6 @@ using Aliyun.OSS; using LINGYUN.Abp.Aliyun; -using LINYUN.Abp.Aliyun.Settings; +using LINGYUN.Abp.Aliyun.Settings; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; diff --git a/vueJs/src/views/admin/settings/components/SettingEditForm.vue b/vueJs/src/views/admin/settings/components/SettingEditForm.vue index bde1c6f9d..ab830e5ce 100644 --- a/vueJs/src/views/admin/settings/components/SettingEditForm.vue +++ b/vueJs/src/views/admin/settings/components/SettingEditForm.vue @@ -116,10 +116,10 @@ export default class extends Vue { if (isUndefined(setting)) { const setting = new SettingUpdate() setting.name = key - setting.value = value + setting.value = String(value) // 配置项必须为文本类型 this.changeSetting.settings.push(setting) } else { - setting.value = value + setting.value = String(value) // 配置项必须为文本类型 } }