Browse Source

Merge pull request #201 from colinin/4.2

Fixed part of AliCloud API namespace name
pull/252/head
cKey 5 years ago
committed by GitHub
parent
commit
9483a7c501
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      aspnet-core/LINGYUN.MicroService.All.sln
  2. 28
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj
  3. 42
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AbpAliyunSettingManagementModule.cs
  4. 146
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs
  5. 37
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
  6. 24
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionDefinitionProvider.cs
  7. 9
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingPermissionNames.cs
  8. 13
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs
  9. 9
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/en.json
  10. 9
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources/zh-Hans.json
  11. 8
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj
  12. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunException.cs
  13. 4
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AbpAliyunModule.cs
  14. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AcsClientFactory.cs
  15. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs
  16. 4
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunClientFactory.cs
  17. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/IAcsClientFactory.cs
  18. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/AliyunResource.cs
  19. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/en.json
  20. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json
  21. 2
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs
  22. 6
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs
  23. 2
      aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs
  24. 2
      aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
  25. 8
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj
  26. 10
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs
  27. 4
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsException.cs
  28. 125
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs
  29. 7
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs
  30. 2
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs
  31. 16
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/en.json
  32. 28
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json
  33. 4
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs
  34. 4
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs
  35. 125
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs
  36. 9
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs
  37. 2
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/Volo/Abp/Sms/AliyunSmsSenderExtensions.cs
  38. 4
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs
  39. 1
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj
  40. BIN
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db
  41. 2
      aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs
  42. 4
      vueJs/src/views/admin/settings/components/SettingEditForm.vue

7
aspnet-core/LINGYUN.MicroService.All.sln

@ -269,6 +269,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Tencent", "modu
EndProject 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}" 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 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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}.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.ActiveCfg = Release|Any CPU
{8C3312E7-F51E-4780-A893-CE0E0B80B579}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -842,6 +848,7 @@ Global
{FCFAF1AF-B3F6-45F3-85AB-8249EB8432CC} = {14CDBAD1-10C8-464A-B445-1F727C988010} {FCFAF1AF-B3F6-45F3-85AB-8249EB8432CC} = {14CDBAD1-10C8-464A-B445-1F727C988010}
{97B4A37E-B93E-48C9-95D5-689CB9495D8B} = {3B96F4D8-4993-419B-BCEB-AFE4ED39449F} {97B4A37E-B93E-48C9-95D5-689CB9495D8B} = {3B96F4D8-4993-419B-BCEB-AFE4ED39449F}
{8C3312E7-F51E-4780-A893-CE0E0B80B579} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E} {8C3312E7-F51E-4780-A893-CE0E0B80B579} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E}
{FE0F0889-C4AF-43C5-B851-B8CCC873BA2C} = {14CDBAD1-10C8-464A-B445-1F727C988010}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718}

28
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj

@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<None Remove="LINGYUN\Abp\Aliyun\SettingManagement\Localization\Resources\en.json" />
<None Remove="LINGYUN\Abp\Aliyun\SettingManagement\Localization\Resources\zh-Hans.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="LINGYUN\Abp\Aliyun\SettingManagement\Localization\Resources\en.json" />
<EmbeddedResource Include="LINGYUN\Abp\Aliyun\SettingManagement\Localization\Resources\zh-Hans.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\common\LINGYUN.Abp.Sms.Aliyun\LINGYUN.Abp.Sms.Aliyun.csproj" />
<ProjectReference Include="..\..\settings\LINGYUN.Abp.SettingManagement.Application.Contracts\LINGYUN.Abp.SettingManagement.Application.Contracts.csproj" />
</ItemGroup>
</Project>

42
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<IMvcBuilder>(mvcBuilder =>
{
mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpAliyunSettingManagementModule).Assembly);
});
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<AbpAliyunSettingManagementModule>();
});
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Get<AliyunResource>()
.AddBaseTypes(typeof(AbpUiResource))
.AddVirtualJson("/LINGYUN/Abp/Aliyun/SettingManagement/Localization/Resources");
});
}
}
}

146
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<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
{
return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
}
public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
{
return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
}
protected virtual async Task<ListResultDto<SettingGroupDto>> GetAllForProviderAsync(string providerName, string providerKey)
{
var settingGroups = new List<SettingGroupDto>();
// 无权限返回空结果,直接报错的话,网关聚合会抛出异常
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<SettingGroupDto>(settingGroups);
}
}
}

37
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<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
{
return await AppService.GetAllForCurrentTenantAsync();
}
[HttpGet]
[Route("by-global")]
public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
{
return await AppService.GetAllForGlobalAsync();
}
}
}

24
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<AliyunResource>(name);
}
}
}

9
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";
}
}

13
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<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync();
Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync();
}
}

9
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"
}
}

9
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": "阿里云服务"
}
}

8
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj

@ -10,13 +10,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="LINYUN\Abp\Aliyun\Localization\Resources\en.json" /> <None Remove="LINGYUN\Abp\Aliyun\Localization\Resources\en.json" />
<None Remove="LINYUN\Abp\Aliyun\Localization\Resources\zh-Hans.json" /> <None Remove="LINGYUN\Abp\Aliyun\Localization\Resources\zh-Hans.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="LINYUN\Abp\Aliyun\Localization\Resources\en.json" /> <EmbeddedResource Include="LINGYUN\Abp\Aliyun\Localization\Resources\en.json" />
<EmbeddedResource Include="LINYUN\Abp\Aliyun\Localization\Resources\zh-Hans.json" /> <EmbeddedResource Include="LINGYUN\Abp\Aliyun\Localization\Resources\zh-Hans.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunException.cs → 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.ExceptionHandling;
using Volo.Abp.Logging; using Volo.Abp.Logging;
namespace LINYUN.Abp.Aliyun namespace LINGYUN.Abp.Aliyun
{ {
public class AbpAliyunException : AbpException, IHasErrorCode, IHasLogLevel public class AbpAliyunException : AbpException, IHasErrorCode, IHasLogLevel
{ {

4
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AbpAliyunModule.cs → 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.Caching;
using Volo.Abp.Json; using Volo.Abp.Json;
using Volo.Abp.Localization; using Volo.Abp.Localization;
@ -25,7 +25,7 @@ namespace LINGYUN.Abp.Aliyun
Configure<AbpLocalizationOptions>(options => Configure<AbpLocalizationOptions>(options =>
{ {
options.Resources options.Resources
.Add<AliyunResource>() .Add<AliyunResource>("zh-Hans") // 中国区云服务,默认使用简体中文
.AddVirtualJson("/LINGYUN/Abp/Aliyun/Localization/Resources"); .AddVirtualJson("/LINGYUN/Abp/Aliyun/Localization/Resources");
}); });
} }

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AcsClientFactory.cs → 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.DependencyInjection;
using Volo.Abp.Settings; using Volo.Abp.Settings;
namespace LINYUN.Abp.Aliyun namespace LINGYUN.Abp.Aliyun
{ {
public class AcsClientFactory : AliyunClientFactory<IAcsClient>, IAcsClientFactory, ITransientDependency public class AcsClientFactory : AliyunClientFactory<IAcsClient>, IAcsClientFactory, ITransientDependency
{ {

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs → aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunBasicSessionCredentialsCacheItem.cs

@ -1,6 +1,6 @@
using System; using System;
namespace LINYUN.Abp.Aliyun namespace LINGYUN.Abp.Aliyun
{ {
[Serializable] [Serializable]
public class AliyunBasicSessionCredentialsCacheItem public class AliyunBasicSessionCredentialsCacheItem

4
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/AliyunClientFactory.cs → 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.Auth.Sts;
using Aliyun.Acs.Core.Http; using Aliyun.Acs.Core.Http;
using Aliyun.Acs.Core.Profile; using Aliyun.Acs.Core.Profile;
using LINYUN.Abp.Aliyun.Settings; using LINGYUN.Abp.Aliyun.Settings;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -10,7 +10,7 @@ using Volo.Abp;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.Settings; using Volo.Abp.Settings;
namespace LINYUN.Abp.Aliyun namespace LINGYUN.Abp.Aliyun
{ {
/// <summary> /// <summary>
/// 阿里云通用客户端构建工厂 /// 阿里云通用客户端构建工厂

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/IAcsClientFactory.cs → aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/IAcsClientFactory.cs

@ -1,7 +1,7 @@
using Aliyun.Acs.Core; using Aliyun.Acs.Core;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace LINYUN.Abp.Aliyun namespace LINGYUN.Abp.Aliyun
{ {
public interface IAcsClientFactory public interface IAcsClientFactory
{ {

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/AliyunResource.cs → aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/AliyunResource.cs

@ -1,6 +1,6 @@
using Volo.Abp.Localization; using Volo.Abp.Localization;
namespace LINYUN.Abp.Aliyun.Localization namespace LINGYUN.Abp.Aliyun.Localization
{ {
[LocalizationResourceName("Aliyun")] [LocalizationResourceName("Aliyun")]
public class AliyunResource public class AliyunResource

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/en.json → aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/en.json

@ -1,6 +1,8 @@
{ {
"culture": "en", "culture": "en",
"texts": { "texts": {
"DisplayName:Aliyun.RAM": "RAM",
"Description:Aliyun.RAM": "RAM",
"DisplayName:Authorization": "Authorization", "DisplayName:Authorization": "Authorization",
"Description:Authorization": "Authorization", "Description:Authorization": "Authorization",
"DisplayName:RegionId": "Region Id", "DisplayName:RegionId": "Region Id",

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json → aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Localization/Resources/zh-Hans.json

@ -1,6 +1,8 @@
{ {
"culture": "zh-Hans", "culture": "zh-Hans",
"texts": { "texts": {
"DisplayName:Aliyun.RAM": "访问控制",
"Description:Aliyun.RAM": "阿里云服务访问控制",
"DisplayName:Authorization": "阿里云身份认证凭据", "DisplayName:Authorization": "阿里云身份认证凭据",
"Description:Authorization": "阿里云身份认证凭据", "Description:Authorization": "阿里云身份认证凭据",
"DisplayName:RegionId": "地域ID", "DisplayName:RegionId": "地域ID",

2
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingNames.cs → 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 public static class AliyunSettingNames
{ {

6
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs → 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.Localization;
using Volo.Abp.Settings; using Volo.Abp.Settings;
namespace LINYUN.Abp.Aliyun.Settings namespace LINGYUN.Abp.Aliyun.Settings
{ {
public class AliyunSettingProvider : SettingDefinitionProvider public class AliyunSettingProvider : SettingDefinitionProvider
{ {
@ -31,7 +31,7 @@ namespace LINYUN.Abp.Aliyun.Settings
), ),
new SettingDefinition( new SettingDefinition(
AliyunSettingNames.Authorization.DurationSeconds, AliyunSettingNames.Authorization.DurationSeconds,
defaultValue: "3000", defaultValue: "3600",
displayName: L("DisplayName:DurationSeconds"), displayName: L("DisplayName:DurationSeconds"),
description: L("Description:DurationSeconds"), description: L("Description:DurationSeconds"),
isVisibleToClients: false isVisibleToClients: false

2
aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs

@ -1,5 +1,5 @@
using Aliyun.OSS; using Aliyun.OSS;
using LINYUN.Abp.Aliyun; using LINGYUN.Abp.Aliyun;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Settings; using Volo.Abp.Settings;

2
aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml

@ -59,7 +59,7 @@
Storage Storage
</summary> </summary>
</member> </member>
<member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.#ctor(Volo.Abp.Threading.AbpTimer,DotNetCore.CAP.Persistence.IDataStorage,DotNetCore.CAP.Persistence.IStorageInitializer,Microsoft.Extensions.Options.IOptions{LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)"> <member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.#ctor(Volo.Abp.Threading.AbpAsyncTimer,DotNetCore.CAP.Persistence.IDataStorage,DotNetCore.CAP.Persistence.IStorageInitializer,Microsoft.Extensions.Options.IOptions{LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)">
<summary> <summary>
创建过期消息清理任务 创建过期消息清理任务
</summary> </summary>

8
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="LINYUN\Abp\Sms\Aliyun\Localization\Resources\en.json" /> <None Remove="LINGYUN\Abp\Sms\Aliyun\Localization\Resources\en.json" />
<None Remove="LINYUN\Abp\Sms\Aliyun\Localization\Resources\zh-Hans.json" /> <None Remove="LINGYUN\Abp\Sms\Aliyun\Localization\Resources\zh-Hans.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="LINYUN\Abp\Sms\Aliyun\Localization\Resources\en.json" /> <EmbeddedResource Include="LINGYUN\Abp\Sms\Aliyun\Localization\Resources\en.json" />
<EmbeddedResource Include="LINYUN\Abp\Sms\Aliyun\Localization\Resources\zh-Hans.json" /> <EmbeddedResource Include="LINGYUN\Abp\Sms\Aliyun\Localization\Resources\zh-Hans.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs → aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AbpAliyunSmsModule.cs

@ -1,12 +1,11 @@
using LINGYUN.Abp.Aliyun; using LINGYUN.Abp.Aliyun;
using LINYUN.Abp.Aliyun.Localization; using LINGYUN.Abp.Aliyun.Localization;
using LINYUN.Abp.Sms.Aliyun.Localization;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.Sms; using Volo.Abp.Sms;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
namespace LINYUN.Abp.Sms.Aliyun namespace LINGYUN.Abp.Sms.Aliyun
{ {
[DependsOn( [DependsOn(
typeof(AbpSmsModule), typeof(AbpSmsModule),
@ -23,9 +22,8 @@ namespace LINYUN.Abp.Sms.Aliyun
Configure<AbpLocalizationOptions>(options => Configure<AbpLocalizationOptions>(options =>
{ {
options.Resources options.Resources
.Add<AliyunSmsResource>("en") .Get<AliyunResource>()
.AddBaseTypes(typeof(AliyunResource)) .AddVirtualJson("/LINGYUN/Abp/Sms/Aliyun/Localization/Resources");
.AddVirtualJson("/LINYUN/Abp/Sms/Aliyun/Localization/Resources");
}); });
} }
} }

4
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsException.cs → 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 public class AliyunSmsException : AbpAliyunException
{ {

125
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<AliyunResource>("SMS_SIGNATURE_SCENE_ILLEGAL");
case "isv.DENY_IP_RANGE":
return LocalizableString.Create<AliyunResource>("DENY_IP_RANGE");
case "isv.MOBILE_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("MOBILE_COUNT_OVER_LIMIT");
case "isv.BUSINESS_LIMIT_CONTROL":
return LocalizableString.Create<AliyunResource>("BUSINESS_LIMIT_CONTROL");
case "SignatureDoesNotMatch":
return LocalizableString.Create<AliyunResource>("SignatureDoesNotMatch");
case "InvalidTimeStamp.Expired":
return LocalizableString.Create<AliyunResource>("InvalidTimeStampExpired");
case "SignatureNonceUsed":
return LocalizableString.Create<AliyunResource>("SignatureNonceUsed");
case "InvalidVersion":
return LocalizableString.Create<AliyunResource>("InvalidVersion");
case "InvalidAction.NotFound":
return LocalizableString.Create<AliyunResource>("InvalidActionNotFound");
case "isv.SIGN_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("SIGN_COUNT_OVER_LIMIT");
case "isv.TEMPLATE_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("TEMPLATE_COUNT_OVER_LIMIT");
case "isv.SIGN_NAME_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SIGN_NAME_ILLEGAL");
case "isv.SIGN_FILE_LIMIT":
return LocalizableString.Create<AliyunResource>("SIGN_FILE_LIMIT");
case "isv.SIGN_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("SIGN_OVER_LIMIT");
case "isv.TEMPLATE_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("TEMPLATE_OVER_LIMIT");
case "SIGNATURE_BLACKLIST":
return LocalizableString.Create<AliyunResource>("SIGNATURE_BLACKLIST");
case "isv.SHORTURL_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("SHORTURL_OVER_LIMIT");
case "isv.NO_AVAILABLE_SHORT_URL":
return LocalizableString.Create<AliyunResource>("NO_AVAILABLE_SHORT_URL");
case "isv.SHORTURL_NAME_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SHORTURL_NAME_ILLEGAL");
case "isv.SOURCEURL_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("SOURCEURL_OVER_LIMIT");
case "isv.SHORTURL_TIME_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SHORTURL_TIME_ILLEGAL");
case "isv.PHONENUMBERS_OVER_LIMIT":
return LocalizableString.Create<AliyunResource>("PHONENUMBERS_OVER_LIMIT");
case "isv.SHORTURL_STILL_AVAILABLE":
return LocalizableString.Create<AliyunResource>("SHORTURL_STILL_AVAILABLE");
case "isv.SHORTURL_NOT_FOUND":
return LocalizableString.Create<AliyunResource>("SHORTURL_NOT_FOUND");
case "isv.SMS_TEMPLATE_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SMS_TEMPLATE_ILLEGAL");
case "isv.SMS_SIGNATURE_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SMS_SIGNATURE_ILLEGAL");
case "isv.MOBILE_NUMBER_ILLEGAL":
return LocalizableString.Create<AliyunResource>("MOBILE_NUMBER_ILLEGAL");
case "isv.TEMPLATE_MISSING_PARAMETERS":
return LocalizableString.Create<AliyunResource>("TEMPLATE_MISSING_PARAMETERS");
case "isv.EXTEND_CODE_ERROR":
return LocalizableString.Create<AliyunResource>("EXTEND_CODE_ERROR");
case "isv.DOMESTIC_NUMBER_NOT_SUPPORTED":
return LocalizableString.Create<AliyunResource>("DOMESTIC_NUMBER_NOT_SUPPORTED");
case "isv.DAY_LIMIT_CONTROL":
return LocalizableString.Create<AliyunResource>("DAY_LIMIT_CONTROL");
case "isv.SMS_CONTENT_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SMS_CONTENT_ILLEGAL");
case "isv.SMS_SIGN_ILLEGAL":
return LocalizableString.Create<AliyunResource>("SMS_SIGN_ILLEGAL");
case "isp.RAM_PERMISSION_DENY":
return LocalizableString.Create<AliyunResource>("RAM_PERMISSION_DENY");
case "isp.OUT_OF_SERVICE":
return LocalizableString.Create<AliyunResource>("OUT_OF_SERVICE");
case "isv.PRODUCT_UN_SUBSCRIPT":
return LocalizableString.Create<AliyunResource>("PRODUCT_UN_SUBSCRIPT");
case "isv.PRODUCT_UNSUBSCRIBE":
return LocalizableString.Create<AliyunResource>("PRODUCT_UNSUBSCRIBE");
case "isv.ACCOUNT_NOT_EXISTS":
return LocalizableString.Create<AliyunResource>("ACCOUNT_NOT_EXISTS");
case "isv.ACCOUNT_ABNORMAL":
return LocalizableString.Create<AliyunResource>("ACCOUNT_ABNORMAL");
case "isv.INVALID_PARAMETERS":
return LocalizableString.Create<AliyunResource>("INVALID_PARAMETERS");
case "isv.SYSTEM_ERROR":
return LocalizableString.Create<AliyunResource>("SYSTEM_ERROR");
case "isv.INVALID_JSON_PARAM":
return LocalizableString.Create<AliyunResource>("INVALID_JSON_PARAM");
case "isv.BLACK_KEY_CONTROL_LIMIT":
return LocalizableString.Create<AliyunResource>("BLACK_KEY_CONTROL_LIMIT");
case "isv.PARAM_LENGTH_LIMIT":
return LocalizableString.Create<AliyunResource>("PARAM_LENGTH_LIMIT");
case "isv.PARAM_NOT_SUPPORT_URL":
return LocalizableString.Create<AliyunResource>("PARAM_NOT_SUPPORT_URL");
case "isv.AMOUNT_NOT_ENOUGH":
return LocalizableString.Create<AliyunResource>("AMOUNT_NOT_ENOUGH");
case "isv.TEMPLATE_PARAMS_ILLEGAL":
return LocalizableString.Create<AliyunResource>("TEMPLATE_PARAMS_ILLEGAL");
default:
throw new AbpException($"no error code: {code} define, message: {message}");
}
}
}
}

7
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs → 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;
using Aliyun.Acs.Core.Exceptions; using Aliyun.Acs.Core.Exceptions;
using Aliyun.Acs.Core.Http; using Aliyun.Acs.Core.Http;
using LINYUN.Abp.Aliyun; using LINGYUN.Abp.Aliyun;
using LINYUN.Abp.Sms.Aliyun.Settings; using LINGYUN.Abp.Sms.Aliyun.Settings;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System; using System;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -14,7 +13,7 @@ using Volo.Abp.Json;
using Volo.Abp.Settings; using Volo.Abp.Settings;
using Volo.Abp.Sms; using Volo.Abp.Sms;
namespace LINYUN.Abp.Sms.Aliyun namespace LINGYUN.Abp.Sms.Aliyun
{ {
[Dependency(ServiceLifetime.Singleton)] [Dependency(ServiceLifetime.Singleton)]
[ExposeServices(typeof(ISmsSender), typeof(AliyunSmsSender))] [ExposeServices(typeof(ISmsSender), typeof(AliyunSmsSender))]

2
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSuccessResponse.cs → 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 public class AliyunSmsSuccessResponse : AliyunSmsResponse
{ {

16
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/en.json → aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/en.json

@ -1,6 +1,22 @@
{ {
"culture": "en", "culture": "en",
"texts": { "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}", "SendMessageFailed": "Text message sending failed:{0}",
"SMS_SIGNATURE_SCENE_ILLEGAL": "Signature scene used by SMS is illegal", "SMS_SIGNATURE_SCENE_ILLEGAL": "Signature scene used by SMS is illegal",
"DENY_IP_RANGE": "Region where source IP address is disabled", "DENY_IP_RANGE": "Region where source IP address is disabled",

28
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json → aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Localization/Resources/zh-Hans.json

@ -1,20 +1,22 @@
{ {
"culture": "zh-Hans", "culture": "zh-Hans",
"texts": { "texts": {
"DisplayName:ActionName": "阿里云身份认证凭据", "DisplayName:Aliyun.Sms": "短信服务",
"Description:ActionName": "阿里云身份认证凭据", "Description:Aliyun.Sms": "阿里云短信服务",
"DisplayName:DefaultSignName": "地域ID", "DisplayName:ActionName": "发送短信方法",
"Description:DefaultSignName": "正在使用的地域ID", "Description:ActionName": "发送短信方法名称,详情见阿里云Sms服务",
"DisplayName:DefaultTemplateCode": "AccessKey Id", "DisplayName:DefaultSignName": "默认短信签名",
"Description:DefaultTemplateCode": "访问密钥标识", "Description:DefaultSignName": "当用户未指定短信签名时的默认签名名称",
"DisplayName:DeveloperPhoneNumber": "AccessKey Secret", "DisplayName:DefaultTemplateCode": "默认短信模板号",
"Description:DeveloperPhoneNumber": "访问密钥", "Description:DefaultTemplateCode": "当用户未指定短信签名时的默认短信模板号",
"DisplayName:DefaultPhoneNumber": "默认接收短信手机号",
"Description:DefaultPhoneNumber": "当用户未指定短信接收方时的默认接收手机号码",
"DisplayName:Domain": "阿里云sms服务域名", "DisplayName:Domain": "阿里云sms服务域名",
"Description:Domain": "使用STS Token访问", "Description:Domain": "阿里云sms服务域名",
"DisplayName:Version": "角色全局资源描述符", "DisplayName:Version": "阿里云sms服务版本号",
"Description:Version": "格式:acs:ram::$accountID:role/$roleName/$RoleSessionName,详情见阿里云访问控制API", "Description:Version": "阿里云sms服务版本号",
"DisplayName:RoleSessionName": "角色全局资源描述符", "DisplayName:VisableErrorToClient": "发送错误到客户端",
"Description:RoleSessionName": "格式:acs:ram::$accountID:role/$roleName/$RoleSessionName,详情见阿里云访问控制API", "Description:VisableErrorToClient": "当短信服务发送出现错误时是否发送错误详情到客户端",
"SendMessageFailed": "发送短信错误:{0}", "SendMessageFailed": "发送短信错误:{0}",
"SMS_SIGNATURE_SCENE_ILLEGAL": "短信所使用签名场景非法", "SMS_SIGNATURE_SCENE_ILLEGAL": "短信所使用签名场景非法",
"DENY_IP_RANGE": "源IP地址所在的地区被禁用", "DENY_IP_RANGE": "源IP地址所在的地区被禁用",

4
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingNames.cs → 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 public static class AliyunSmsSettingNames
{ {

4
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs → 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.Localization;
using Volo.Abp.Settings; using Volo.Abp.Settings;
namespace LINYUN.Abp.Sms.Aliyun.Settings namespace LINGYUN.Abp.Sms.Aliyun.Settings
{ {
public class AliyunSmsSettingProvider : SettingDefinitionProvider public class AliyunSmsSettingProvider : SettingDefinitionProvider
{ {

125
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsResponse.cs

@ -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<AliyunSmsResource>("SMS_SIGNATURE_SCENE_ILLEGAL");
case "isv.DENY_IP_RANGE":
return LocalizableString.Create<AliyunSmsResource>("DENY_IP_RANGE");
case "isv.MOBILE_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("MOBILE_COUNT_OVER_LIMIT");
case "isv.BUSINESS_LIMIT_CONTROL":
return LocalizableString.Create<AliyunSmsResource>("BUSINESS_LIMIT_CONTROL");
case "SignatureDoesNotMatch":
return LocalizableString.Create<AliyunSmsResource>("SignatureDoesNotMatch");
case "InvalidTimeStamp.Expired":
return LocalizableString.Create<AliyunSmsResource>("InvalidTimeStampExpired");
case "SignatureNonceUsed":
return LocalizableString.Create<AliyunSmsResource>("SignatureNonceUsed");
case "InvalidVersion":
return LocalizableString.Create<AliyunSmsResource>("InvalidVersion");
case "InvalidAction.NotFound":
return LocalizableString.Create<AliyunSmsResource>("InvalidActionNotFound");
case "isv.SIGN_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("SIGN_COUNT_OVER_LIMIT");
case "isv.TEMPLATE_COUNT_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("TEMPLATE_COUNT_OVER_LIMIT");
case "isv.SIGN_NAME_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SIGN_NAME_ILLEGAL");
case "isv.SIGN_FILE_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("SIGN_FILE_LIMIT");
case "isv.SIGN_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("SIGN_OVER_LIMIT");
case "isv.TEMPLATE_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("TEMPLATE_OVER_LIMIT");
case "SIGNATURE_BLACKLIST":
return LocalizableString.Create<AliyunSmsResource>("SIGNATURE_BLACKLIST");
case "isv.SHORTURL_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("SHORTURL_OVER_LIMIT");
case "isv.NO_AVAILABLE_SHORT_URL":
return LocalizableString.Create<AliyunSmsResource>("NO_AVAILABLE_SHORT_URL");
case "isv.SHORTURL_NAME_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SHORTURL_NAME_ILLEGAL");
case "isv.SOURCEURL_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("SOURCEURL_OVER_LIMIT");
case "isv.SHORTURL_TIME_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SHORTURL_TIME_ILLEGAL");
case "isv.PHONENUMBERS_OVER_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("PHONENUMBERS_OVER_LIMIT");
case "isv.SHORTURL_STILL_AVAILABLE":
return LocalizableString.Create<AliyunSmsResource>("SHORTURL_STILL_AVAILABLE");
case "isv.SHORTURL_NOT_FOUND":
return LocalizableString.Create<AliyunSmsResource>("SHORTURL_NOT_FOUND");
case "isv.SMS_TEMPLATE_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SMS_TEMPLATE_ILLEGAL");
case "isv.SMS_SIGNATURE_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SMS_SIGNATURE_ILLEGAL");
case "isv.MOBILE_NUMBER_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("MOBILE_NUMBER_ILLEGAL");
case "isv.TEMPLATE_MISSING_PARAMETERS":
return LocalizableString.Create<AliyunSmsResource>("TEMPLATE_MISSING_PARAMETERS");
case "isv.EXTEND_CODE_ERROR":
return LocalizableString.Create<AliyunSmsResource>("EXTEND_CODE_ERROR");
case "isv.DOMESTIC_NUMBER_NOT_SUPPORTED":
return LocalizableString.Create<AliyunSmsResource>("DOMESTIC_NUMBER_NOT_SUPPORTED");
case "isv.DAY_LIMIT_CONTROL":
return LocalizableString.Create<AliyunSmsResource>("DAY_LIMIT_CONTROL");
case "isv.SMS_CONTENT_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SMS_CONTENT_ILLEGAL");
case "isv.SMS_SIGN_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("SMS_SIGN_ILLEGAL");
case "isp.RAM_PERMISSION_DENY":
return LocalizableString.Create<AliyunSmsResource>("RAM_PERMISSION_DENY");
case "isp.OUT_OF_SERVICE":
return LocalizableString.Create<AliyunSmsResource>("OUT_OF_SERVICE");
case "isv.PRODUCT_UN_SUBSCRIPT":
return LocalizableString.Create<AliyunSmsResource>("PRODUCT_UN_SUBSCRIPT");
case "isv.PRODUCT_UNSUBSCRIBE":
return LocalizableString.Create<AliyunSmsResource>("PRODUCT_UNSUBSCRIBE");
case "isv.ACCOUNT_NOT_EXISTS":
return LocalizableString.Create<AliyunSmsResource>("ACCOUNT_NOT_EXISTS");
case "isv.ACCOUNT_ABNORMAL":
return LocalizableString.Create<AliyunSmsResource>("ACCOUNT_ABNORMAL");
case "isv.INVALID_PARAMETERS":
return LocalizableString.Create<AliyunSmsResource>("INVALID_PARAMETERS");
case "isv.SYSTEM_ERROR":
return LocalizableString.Create<AliyunSmsResource>("SYSTEM_ERROR");
case "isv.INVALID_JSON_PARAM":
return LocalizableString.Create<AliyunSmsResource>("INVALID_JSON_PARAM");
case "isv.BLACK_KEY_CONTROL_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("BLACK_KEY_CONTROL_LIMIT");
case "isv.PARAM_LENGTH_LIMIT":
return LocalizableString.Create<AliyunSmsResource>("PARAM_LENGTH_LIMIT");
case "isv.PARAM_NOT_SUPPORT_URL":
return LocalizableString.Create<AliyunSmsResource>("PARAM_NOT_SUPPORT_URL");
case "isv.AMOUNT_NOT_ENOUGH":
return LocalizableString.Create<AliyunSmsResource>("AMOUNT_NOT_ENOUGH");
case "isv.TEMPLATE_PARAMS_ILLEGAL":
return LocalizableString.Create<AliyunSmsResource>("TEMPLATE_PARAMS_ILLEGAL");
default:
throw new AbpException($"no error code: {code} define, message: {message}");
}
}
}
}

9
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/Localization/AliyunSmsResource.cs

@ -1,9 +0,0 @@
using Volo.Abp.Localization;
namespace LINYUN.Abp.Sms.Aliyun.Localization
{
[LocalizationResourceName("AliyunSms")]
public class AliyunSmsResource
{
}
}

2
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.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;

4
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs

@ -1,4 +1,5 @@
using DotNetCore.CAP; using DotNetCore.CAP;
using LINGYUN.Abp.Aliyun.SettingManagement;
using LINGYUN.Abp.Auditing; using LINGYUN.Abp.Auditing;
using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling;
@ -12,7 +13,7 @@ using LINGYUN.Abp.TenantManagement;
using LINGYUN.Abp.WeChat.SettingManagement; using LINGYUN.Abp.WeChat.SettingManagement;
using LINGYUN.ApiGateway; using LINGYUN.ApiGateway;
using LINGYUN.Platform; using LINGYUN.Platform;
using LINYUN.Abp.Sms.Aliyun; using LINGYUN.Abp.Sms.Aliyun;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
@ -84,6 +85,7 @@ namespace LINGYUN.Abp.BackendAdmin
typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementApplicationModule),
typeof(AbpTenantManagementHttpApiModule), typeof(AbpTenantManagementHttpApiModule),
typeof(AbpWeChatSettingManagementModule),// 微信配置管理模块 typeof(AbpWeChatSettingManagementModule),// 微信配置管理模块
typeof(AbpAliyunSettingManagementModule),// 阿里云配置管理模块
typeof(AbpEntityFrameworkCoreMySQLModule), typeof(AbpEntityFrameworkCoreMySQLModule),
typeof(AbpIdentityEntityFrameworkCoreModule),// 用户角色权限需要引用包 typeof(AbpIdentityEntityFrameworkCoreModule),// 用户角色权限需要引用包
typeof(AbpIdentityServerEntityFrameworkCoreModule), // 客户端权限需要引用包 typeof(AbpIdentityServerEntityFrameworkCoreModule), // 客户端权限需要引用包

1
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj

@ -63,6 +63,7 @@
<ProjectReference Include="..\..\..\modules\apigateway\LINGYUN.ApiGateway.Application.Contracts\LINGYUN.ApiGateway.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\modules\apigateway\LINGYUN.ApiGateway.Application.Contracts\LINGYUN.ApiGateway.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\modules\auditing\LINGYUN.Abp.Auditing.Application\LINGYUN.Abp.Auditing.Application.csproj" /> <ProjectReference Include="..\..\..\modules\auditing\LINGYUN.Abp.Auditing.Application\LINGYUN.Abp.Auditing.Application.csproj" />
<ProjectReference Include="..\..\..\modules\auditing\LINGYUN.Abp.Auditing.HttpApi\LINGYUN.Abp.Auditing.HttpApi.csproj" /> <ProjectReference Include="..\..\..\modules\auditing\LINGYUN.Abp.Auditing.HttpApi\LINGYUN.Abp.Auditing.HttpApi.csproj" />
<ProjectReference Include="..\..\..\modules\cloud-aliyun\LINGYUN.Abp.Aliyun.SettingManagement\LINGYUN.Abp.Aliyun.SettingManagement.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" /> <ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" /> <ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" />
<ProjectReference Include="..\..\..\modules\file-management\LINGYUN.Abp.FileManagement.Application.Contracts\LINGYUN.Abp.FileManagement.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\modules\file-management\LINGYUN.Abp.FileManagement.Application.Contracts\LINGYUN.Abp.FileManagement.Application.Contracts.csproj" />

BIN
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db

Binary file not shown.

2
aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN/Abp/BlobStoring/Aliyun/AbpBlobStoringAliyunTestModule.cs

@ -1,6 +1,6 @@
using Aliyun.OSS; using Aliyun.OSS;
using LINGYUN.Abp.Aliyun; using LINGYUN.Abp.Aliyun;
using LINYUN.Abp.Aliyun.Settings; using LINGYUN.Abp.Aliyun.Settings;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp; using Volo.Abp;

4
vueJs/src/views/admin/settings/components/SettingEditForm.vue

@ -116,10 +116,10 @@ export default class extends Vue {
if (isUndefined(setting)) { if (isUndefined(setting)) {
const setting = new SettingUpdate() const setting = new SettingUpdate()
setting.name = key setting.name = key
setting.value = value setting.value = String(value) //
this.changeSetting.settings.push(setting) this.changeSetting.settings.push(setting)
} else { } else {
setting.value = value setting.value = String(value) //
} }
} }

Loading…
Cancel
Save