diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN/Abp/Tencent/Settings/TencentCloudSettingNames.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN/Abp/Tencent/Settings/TencentCloudSettingNames.cs index 16de75c0d..524f2d425 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN/Abp/Tencent/Settings/TencentCloudSettingNames.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN/Abp/Tencent/Settings/TencentCloudSettingNames.cs @@ -52,7 +52,7 @@ public static class TencentCloudSettingNames /// 短信 SdkAppId /// 在 短信控制台 添加应用后生成的实际 SdkAppId,示例如1400006666。 /// - public const string AppId = Prefix + ".Domain"; + public const string AppId = Prefix + ".AppId"; /// /// 短信签名内容 /// diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json index 30efeb7e6..5f87c26c2 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json @@ -40,6 +40,7 @@ "DisplayName:FileManagement": "File Management", "Description:FileManagement": "File Management", "DisplayName:FileManagement.FileSystem": "File System", - "Description:FileManagement.FileSystem": "File System" + "Description:FileManagement.FileSystem": "File System", + "TenantCannotChangeGlobalSetting": "Tenant cannot change the global settings" } } \ No newline at end of file diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json index 34fbdafc2..2b0774255 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json @@ -40,6 +40,7 @@ "DisplayName:FileManagement": "文件管理", "Description:FileManagement": "文件管理", "DisplayName:FileManagement.FileSystem": "文件系统", - "Description:FileManagement.FileSystem": "文件系统" + "Description:FileManagement.FileSystem": "文件系统", + "TenantCannotChangeGlobalSetting": "租户不能变更公共配置" } } \ No newline at end of file diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs index 12f3461c6..3a31a9b0d 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.Options; using System.Linq; using System.Threading.Tasks; +using Volo.Abp; using Volo.Abp.Account.Settings; using Volo.Abp.Application.Services; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; @@ -48,6 +49,11 @@ namespace LINGYUN.Abp.SettingManagement [Authorize(AbpSettingManagementPermissions.Settings.Manager)] public virtual async Task SetGlobalAsync(UpdateSettingsDto input) { + if (CurrentTenant.IsAvailable) + { + throw new UserFriendlyException(L["TenantCannotChangeGlobalSetting"]); + } + // 增加特性检查 await CheckFeatureAsync();