diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITenantCloudSettingAppService.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITencentCloudSettingAppService.cs similarity index 53% rename from aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITenantCloudSettingAppService.cs rename to aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITencentCloudSettingAppService.cs index ca935832e..fa4def33d 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITenantCloudSettingAppService.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/ITencentCloudSettingAppService.cs @@ -2,6 +2,6 @@ namespace LINGYUN.Abp.Tencent.SettingManagement; -public interface ITenantCloudSettingAppService : IReadonlySettingAppService +public interface ITencentCloudSettingAppService : IReadonlySettingAppService { } diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingAppService.cs similarity index 95% rename from aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs rename to aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingAppService.cs index 1fec8cb73..4a42e4695 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingAppService.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingAppService.cs @@ -13,13 +13,13 @@ using ValueType = LINGYUN.Abp.SettingManagement.ValueType; namespace LINGYUN.Abp.Tencent.SettingManagement; -public class TenantCloudSettingAppService : ApplicationService, ITenantCloudSettingAppService +public class TencentCloudSettingAppService : ApplicationService, ITencentCloudSettingAppService { protected ISettingManager SettingManager { get; } protected IPermissionChecker PermissionChecker { get; } protected ISettingDefinitionManager SettingDefinitionManager { get; } - public TenantCloudSettingAppService( + public TencentCloudSettingAppService( ISettingManager settingManager, IPermissionChecker permissionChecker, ISettingDefinitionManager settingDefinitionManager) @@ -46,7 +46,7 @@ public class TenantCloudSettingAppService : ApplicationService, ITenantCloudSett var settingGroups = new SettingGroupResult(); // 无权限返回空结果,直接报错的话,网关聚合会抛出异常 - if (await PermissionChecker.IsGrantedAsync(TenantCloudSettingPermissionNames.Settings)) + if (await PermissionChecker.IsGrantedAsync(TencentCloudSettingPermissionNames.Settings)) { var settingGroup = new SettingGroupDto(L["DisplayName:TenantCloud"], L["DisplayName:TenantCloud"]); diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingController.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingController.cs similarity index 73% rename from aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingController.cs rename to aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingController.cs index 9e70c663d..9bc2cbbe1 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingController.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingController.cs @@ -9,11 +9,11 @@ namespace LINGYUN.Abp.Tencent.SettingManagement; [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)] [Area("settingManagement")] [Route("api/setting-management/tencent-cloud")] -public class TenantCloudSettingController : AbpControllerBase, ITenantCloudSettingAppService +public class TencentCloudSettingController : AbpControllerBase, ITencentCloudSettingAppService { - protected ITenantCloudSettingAppService Service { get; } + protected ITencentCloudSettingAppService Service { get; } - public TenantCloudSettingController(ITenantCloudSettingAppService service) + public TencentCloudSettingController(ITencentCloudSettingAppService service) { Service = service; } diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionDefinitionProvider.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionDefinitionProvider.cs similarity index 65% rename from aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionDefinitionProvider.cs rename to aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionDefinitionProvider.cs index 4fa39af5c..38d927d9d 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionDefinitionProvider.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionDefinitionProvider.cs @@ -4,16 +4,16 @@ using Volo.Abp.Localization; namespace LINGYUN.Abp.Tencent.SettingManagement; -public class TenantCloudSettingPermissionDefinitionProvider : PermissionDefinitionProvider +public class TencentCloudSettingPermissionDefinitionProvider : PermissionDefinitionProvider { public override void Define(IPermissionDefinitionContext context) { var wechatGroup = context.AddGroup( - TenantCloudSettingPermissionNames.GroupName, + TencentCloudSettingPermissionNames.GroupName, L("Permission:TencentCloud")); wechatGroup.AddPermission( - TenantCloudSettingPermissionNames.Settings, L("Permission:TencentCloud.Settings")); + TencentCloudSettingPermissionNames.Settings, L("Permission:TencentCloud.Settings")); } protected LocalizableString L(string name) diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionNames.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionNames.cs similarity index 78% rename from aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionNames.cs rename to aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionNames.cs index 9e2f09e80..5964c7326 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TenantCloudSettingPermissionNames.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingPermissionNames.cs @@ -1,6 +1,6 @@ namespace LINGYUN.Abp.Tencent.SettingManagement { - public class TenantCloudSettingPermissionNames + public class TencentCloudSettingPermissionNames { public const string GroupName = "Abp.Tencent"; diff --git a/aspnet-core/services/LY.MicroService.identityServer/DataSeeder/IdentityServerDataSeedContributor.cs b/aspnet-core/services/LY.MicroService.identityServer/DataSeeder/IdentityServerDataSeedContributor.cs index ec4826af7..a23f7e0c3 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/DataSeeder/IdentityServerDataSeedContributor.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/DataSeeder/IdentityServerDataSeedContributor.cs @@ -202,26 +202,6 @@ public class IdentityServerDataSeedContributor : IDataSeedContributor, ITransien ); } - //ApiGateway - var apigatewayClientId = configurationSection["AuthApiGateway:ClientId"]; - if (!apigatewayClientId.IsNullOrWhiteSpace()) - { - var apigatewayPermissions = new string[8] - { - "ApiGateway.Global", "ApiGateway.Global.Export", - "ApiGateway.Route", "ApiGateway.Route.Export", - "ApiGateway.DynamicRoute", "ApiGateway.DynamicRoute.Export", - "ApiGateway.AggregateRoute", "ApiGateway.AggregateRoute.Export", - }; - await CreateClientAsync( - apigatewayClientId, - commonScopes.Union(new[] { "lingyun-abp-application" }), - new[] { "client_credentials" }, - commonSecret, - permissions: apigatewayPermissions - ); - } - // InternalService 内部服务间通讯客户端,必要的话需要在前端指定它拥有所有权限,当前项目仅预置用户查询权限 var internalServiceClientId = configurationSection["InternalService:ClientId"]; if (!internalServiceClientId.IsNullOrWhiteSpace()) diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json index 4cad7396c..9115acc9d 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json @@ -58,10 +58,7 @@ "RootUrl": "http://127.0.0.1:44313/" }, "AuthVueAdmin": { - "ClientId": "vue-admin-element" - }, - "AuthApiGateway": { - "ClientId": "ApigatewayHostClient" + "ClientId": "vue-admin-client" }, "InternalService": { "ClientId": "InternalServiceClient"