diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 26d8355b..33d0788c 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -8,7 +8,6 @@ 5.0.0 5.0.0 5.0.0 - 1.5.0 2.10.0 3.0.1 1.4.0 diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs index c2321d37..d263e3bc 100644 --- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs +++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs @@ -217,6 +217,7 @@ namespace CompanyName.ProjectName currentContext.Token = accessToken; } + currentContext.Request.Headers.Remove("Authorization"); currentContext.Request.Headers.Add("Authorization", $"Bearer {accessToken}"); diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj index c61dd555..1ff92aab 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj @@ -13,7 +13,7 @@ - + @@ -35,8 +35,4 @@ - - - - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissionDefinitionProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissionDefinitionProvider.cs index 10458cb0..170103bc 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissionDefinitionProvider.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissionDefinitionProvider.cs @@ -17,6 +17,7 @@ namespace CompanyName.ProjectName.Permissions var auditManagement = abpIdentityGroup.AddPermission(ProjectNamePermissions.SystemManagement.AuditLog, L("Permission:AuditLogManagement")); var esManagement = abpIdentityGroup.AddPermission(ProjectNamePermissions.SystemManagement.ES, L("Permission:ESManagement")); + var settingManagement = abpIdentityGroup.AddPermission(ProjectNamePermissions.SystemManagement.Setting, L("Permission:SettingManagement")); #region IdentityServer diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissions.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissions.cs index 94742ce0..2e908ff7 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissions.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Permissions/ProjectNamePermissions.cs @@ -20,6 +20,7 @@ namespace CompanyName.ProjectName.Permissions public const string UserEnable = Default + ".Users.Enable"; public const string AuditLog = Default + ".AuditLog"; public const string ES = Default + ".ES"; + public const string Setting = Default + ".Setting"; } diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ProjectNameApplicationContractsModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ProjectNameApplicationContractsModule.cs index 8015c6ab..dadbbc9b 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ProjectNameApplicationContractsModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/ProjectNameApplicationContractsModule.cs @@ -1,5 +1,4 @@ using CompanyName.ProjectName.DataDictionaryManagement; -using EasyAbp.Abp.SettingUi; using Volo.Abp.Account; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; @@ -20,8 +19,7 @@ namespace CompanyName.ProjectName typeof(AbpSettingManagementApplicationContractsModule), typeof(AbpTenantManagementApplicationContractsModule), typeof(AbpObjectExtendingModule), - typeof(DataDictionaryManagementApplicationContractsModule), - typeof(AbpSettingUiApplicationContractsModule) + typeof(DataDictionaryManagementApplicationContractsModule) )] public class ProjectNameApplicationContractsModule : AbpModule { diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/Dtos/SettingOutput.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/Dtos/SettingOutput.cs new file mode 100644 index 00000000..69fbb8a1 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/Dtos/SettingOutput.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; + +namespace CompanyName.ProjectName.Settings +{ + public class SettingOutput + { + /// + /// 分组 + /// + public string Group { get; set; } + + /// + /// 分组显示名称 + /// + public string GroupDisplayName { get; set; } + + public List SettingItemOutput { get; set; } + + public SettingOutput() + { + SettingItemOutput = new List(); + } + } + + public class SettingItemOutput + { + public SettingItemOutput(string name, string displayName, string value, string type,string description) + { + Name = name; + DisplayName = displayName; + Value = value; + Type = type ?? "Text"; + Description = description; + } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 显示名称 + /// + public string DisplayName { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 值 + /// + public string Value { get; set; } + + /// + /// 前端控件类型 + /// + public string Type { get; set; } + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/ISettingAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/ISettingAppService.cs index 8d34ae08..9b16caf9 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/ISettingAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Settings/ISettingAppService.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Threading.Tasks; -using EasyAbp.Abp.SettingUi.Dto; using Volo.Abp.Application.Services; namespace CompanyName.ProjectName.Settings @@ -11,7 +10,7 @@ namespace CompanyName.ProjectName.Settings /// 获取setting信息 /// /// - Task> GetAsync(); + Task> GetAsync(); /// /// 更新setting diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Tenants/IVoloTenantAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Tenants/IVoloTenantAppService.cs new file mode 100644 index 00000000..6a7772b9 --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/Tenants/IVoloTenantAppService.cs @@ -0,0 +1,29 @@ +using System.Threading.Tasks; +using CompanyName.ProjectName.Extension.Customs.Dtos; +using CompanyName.ProjectName.Tenants.Dtos; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.AspNetCore.Mvc.MultiTenancy; +using Volo.Abp.TenantManagement; + +namespace CompanyName.ProjectName.Tenants +{ + public interface IVoloTenantAppService : IApplicationService + { + Task FindTenantByNameAsync(FindTenantByNameInput input); + + Task> ListAsync(PagingTenantInput input); + + Task CreateAsync(TenantCreateDto input); + + Task UpdateAsync(UpdateTenantInput input); + + Task DeleteAsync(IdInput input); + + Task GetDefaultConnectionStringAsync(IdInput input); + + Task UpdateDefaultConnectionStringAsync(UpdateConnectionStringInput input); + + Task DeleteDefaultConnectionStringAsync(IdInput input); + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj index cfb59ef6..f86290c5 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj @@ -15,8 +15,8 @@ - + diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameAppService.cs index 525f09ee..7e58061b 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameAppService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using CompanyName.ProjectName.Localization; using Volo.Abp.Application.Services; +using Volo.Abp.Localization; namespace CompanyName.ProjectName { diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs index ec546d15..bdb1fd4a 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs @@ -1,7 +1,6 @@ using CompanyName.ProjectName.DataDictionaryManagement; using CompanyName.ProjectName.FreeSqlRepository; using CompanyName.ProjectName.NotificationManagement; -using EasyAbp.Abp.SettingUi; using Volo.Abp.Account; using Volo.Abp.AuditLogging; using Volo.Abp.AutoMapper; @@ -26,7 +25,6 @@ namespace CompanyName.ProjectName typeof(AbpAuditLoggingDomainModule), typeof(DataDictionaryManagementApplicationModule), typeof(NotificationManagementApplicationModule), - typeof(AbpSettingUiApplicationModule), typeof(FreeSqlRepositoryModule) )] public class ProjectNameApplicationModule : AbpModule diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/Roles/RolePermissionAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/Roles/RolePermissionAppService.cs index e969057a..0e1d0b0a 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/Roles/RolePermissionAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/Roles/RolePermissionAppService.cs @@ -61,8 +61,7 @@ namespace CompanyName.ProjectName.Roles "AbpTenantManagement.Tenants.ManageFeatures", // "AbpTenantManagement.Tenants.ManageConnectionStrings", "SettingManagement", - "SettingManagement.Emailing", - "SettingUi" + "SettingManagement.Emailing" }; var permissions = new List(); @@ -99,24 +98,7 @@ namespace CompanyName.ProjectName.Roles } result.Permissions = permissions; - - var settingUIPermisstion = "SettingUi.ShowSettingPage"; - // https://github.com/EasyAbp/Abp.SettingUi/blob/develop/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs - // 因为使用的SettingUI模块，想把权限添加到系统管理下 - result.Permissions.First(e => e.Key == "AbpIdentity").Children.Add( - new PermissionTreeDto() - { - Key = settingUIPermisstion, - Title = L["Permission:SettingUi:ShowSettingPage"] - }); - result.AllGrants.Add(settingUIPermisstion); - - var setting = input.First(e => e.Name == "SettingUi").Permissions - .First(e => e.Name == settingUIPermisstion); - if (setting.IsGranted) - { - result.Grants.Add(settingUIPermisstion); - } + return result; } diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs index 4ef7dc8a..a775f498 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs @@ -1,31 +1,113 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; -using EasyAbp.Abp.SettingUi; -using EasyAbp.Abp.SettingUi.Authorization; -using EasyAbp.Abp.SettingUi.Dto; +using CompanyName.ProjectName.Localization; +using CompanyName.ProjectName.Permissions; using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Localization; +using Volo.Abp.Localization; +using Volo.Abp.SettingManagement; +using Volo.Abp.Settings; namespace CompanyName.ProjectName.Settings { - [Authorize(Policy = SettingUiPermissions.ShowSettingPage)] + [Authorize(policy: ProjectNamePermissions.SystemManagement.Setting)] public class SettingAppService : ProjectNameAppService, ISettingAppService { - private readonly ISettingUiAppService _settingUiAppService; + private readonly ISettingDefinitionManager _settingDefinitionManager; + private readonly ISettingManager _settingManager; + private readonly IStringLocalizer _localizer; + private readonly IStringLocalizerFactory _factory; - public SettingAppService(ISettingUiAppService settingUiAppService) + public SettingAppService( + ISettingDefinitionManager settingDefinitionManager, + ISettingManager settingManager, + IStringLocalizer localizer, + IStringLocalizerFactory factory) { - _settingUiAppService = settingUiAppService; + _settingDefinitionManager = settingDefinitionManager; + _settingManager = settingManager; + _localizer = localizer; + _factory = factory; } - - public async Task> GetAsync() + public async Task> GetAsync() { - return await _settingUiAppService.GroupSettingDefinitions(); + var ss = _localizer.GetAllStrings(); + var s = _localizer["Setting:Group:System"]; + var s2 = _localizer["Volo.Abp.Identity:PasswordRequiresDigit"]; + var allSettings = _settingDefinitionManager.GetAll().ToList(); + var settings = allSettings + .Where(e => e.Properties.ContainsKey(ProjectNameSettings.Group.Defalut)).ToList(); + + var settingOutput = settings + .GroupBy(e => e.Properties[ProjectNameSettings.Group.Defalut].ToString()).Select(s => + new SettingOutput + { + Group = s.Key, + GroupDisplayName = _localizer[s.Key] + }).ToList(); + + foreach (var item in settingOutput) + { + var currentSettings = settings.Where(e => e.Properties.ContainsValue(item.Group)); + foreach (var itemDefinition in currentSettings) + { + + var value = await SettingProvider.GetOrNullAsync(itemDefinition.Name); + var type = itemDefinition.Properties + .FirstOrDefault(f => f.Key == ProjectNameSettings.ControlType.Defalut).Value + .ToString(); + + item.SettingItemOutput.Add(new SettingItemOutput( + itemDefinition.Name, + L["DisplayName:" + itemDefinition.Name], + value, + type, + itemDefinition.Description.Localize(_factory))); + } + } + + return await Task.FromResult(settingOutput); } public async Task UpdateAsync(UpdateSettingInput input) { - await _settingUiAppService.SetSettingValues(input.Values); + foreach (var kv in input.Values) + { + // The key of the settingValues is in camel_Case, like "setting_Abp_Localization_DefaultLanguage", + // change it to "Abp.Localization.DefaultLanguage" form + if (!kv.Key.StartsWith(ProjectNameSettings.Prefix)) + { + continue; + } + + string name = kv.Key.RemovePreFix(ProjectNameSettings.Prefix); + var setting = _settingDefinitionManager.GetOrNull(name); + if (setting == null) + { + continue; + } + + await SetSetting(setting, kv.Value); + } + } + + private Task SetSetting(SettingDefinition setting, string value) + { + if (setting.Providers.Any(p => p == UserSettingValueProvider.ProviderName)) + { + return _settingManager.SetForCurrentUserAsync(setting.Name, value); + } + + if (setting.Providers.Any(p => p == GlobalSettingValueProvider.ProviderName)) + { + return _settingManager.SetGlobalAsync(setting.Name, value); + } + + //Default + return _settingManager.SetForCurrentTenantAsync(setting.Name, value); } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/Tenants/VoloTenantAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/Tenants/VoloTenantAppService.cs new file mode 100644 index 00000000..241f8e3c --- /dev/null +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/Tenants/VoloTenantAppService.cs @@ -0,0 +1,81 @@ +using System.Threading.Tasks; +using CompanyName.ProjectName.Extension.Customs.Dtos; +using CompanyName.ProjectName.Tenants.Dtos; +using Microsoft.AspNetCore.Authorization; +using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc.MultiTenancy; +using Volo.Abp.TenantManagement; + +namespace CompanyName.ProjectName.Tenants +{ + public class VoloTenantAppService : ProjectNameAppService, IVoloTenantAppService + { + private readonly IAbpTenantAppService _abpTenantAppService; + private readonly ITenantAppService _tenantAppService; + + public VoloTenantAppService( + IAbpTenantAppService abpTenantAppService, + ITenantAppService tenantAppService) + { + _abpTenantAppService = abpTenantAppService; + _tenantAppService = tenantAppService; + } + + public async Task FindTenantByNameAsync(FindTenantByNameInput input) + { + return await _abpTenantAppService.FindTenantByNameAsync(input.Name); + } + + + [Authorize(policy:TenantManagementPermissions.Tenants.Default)] + public Task> ListAsync(PagingTenantInput input) + { + var request = new GetTenantsInput + { + Filter = input.Filter, SkipCount = input.SkipCount, MaxResultCount = input.PageSize + }; + return _tenantAppService.GetListAsync(request); + } + + [Authorize(policy:TenantManagementPermissions.Tenants.Create)] + public Task CreateAsync(TenantCreateDto input) + { + return _tenantAppService.CreateAsync(input); + } + + [Authorize(policy:TenantManagementPermissions.Tenants.Update)] + public Task UpdateAsync(UpdateTenantInput input) + { + var request = new TenantUpdateDto() + { + Name = input.Name.Trim() + }; + return _tenantAppService.UpdateAsync(input.Id, request); + } + + [Authorize(policy:TenantManagementPermissions.Tenants.Delete)] + public Task DeleteAsync(IdInput input) + { + return _tenantAppService.DeleteAsync(input.Id); + } + + [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] + public Task GetDefaultConnectionStringAsync(IdInput input) + { + return _tenantAppService.GetDefaultConnectionStringAsync(input.Id); + } + + [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] + public Task UpdateDefaultConnectionStringAsync(UpdateConnectionStringInput input) + { + return _tenantAppService.UpdateDefaultConnectionStringAsync(input.Id, + input.ConnectionString); + } + + [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] + public Task DeleteDefaultConnectionStringAsync(IdInput input) + { + return _tenantAppService.DeleteDefaultConnectionStringAsync(input.Id); + } + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj index 7784a0f0..5c045cdd 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj @@ -9,7 +9,6 @@ - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/en.json b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/en.json index be0f0bd0..1e152a53 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/en.json +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/en.json @@ -15,11 +15,15 @@ "Permission:HangfireManagement": "BackgroundTask", "Permission:CapManagement": "IntegratedEvent", "Permission:ESManagement": "ESManagement", + "Permission:SettingManagement": "SettingManagement", "Permission:IdentityServerManagement": "IdentityServer", "Permission:IdentityServerManagement:Client": "Client", "Permission:IdentityServerManagement:ApiResource": "ApiResource", "Permission:IdentityServerManagement:ApiScope": "ApiScope", "Permission:IdentityServerManagement:IdentityResources": "IdentityResources", - "Permission:SettingUi:ShowSettingPage": "SettingManagement" + "Setting.Group.System": "System", + "Setting.Group.Other": "Other", + "DisplayName:Setting.Group.Other.Github": "Github", + "Description:Setting.Group.Other.Github": "Github" } } diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/zh-Hans.json b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/zh-Hans.json index e1a4a8cc..81830132 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/zh-Hans.json +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/Localization/ProjectName/zh-Hans.json @@ -1,25 +1,29 @@ { - "culture": "zh-Hans", - "texts": { - "Menu:Home": "首页", - "Welcome": "欢迎", - "Test": "测试", - "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io.", - "Permission:Query": "查询", - "Permission:Create": "创建", - "Permission:Update": "编辑", - "Permission:Delete": "删除", - "Permission:Enable": "启用|禁用", - "Permission:AuditLogManagement": "审计日志", - "Permission:SystemManagement": "系统管理", - "Permission:HangfireManagement": "后台任务", - "Permission:CapManagement": "集成事件", - "Permission:ESManagement": "ES日志", - "Permission:IdentityServerManagement": "IdentityServer", - "Permission:IdentityServerManagement:Client": "客户端", - "Permission:IdentityServerManagement:ApiResource": "Api资源", - "Permission:IdentityServerManagement:ApiScope": "ApiScope", - "Permission:IdentityServerManagement:IdentityResources": "Identity资源", - "Permission:SettingUi:ShowSettingPage": "设置管理" - } - } \ No newline at end of file + "culture": "zh-Hans", + "texts": { + "Menu:Home": "首页", + "Welcome": "欢迎", + "Test": "测试", + "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io.", + "Permission:Query": "查询", + "Permission:Create": "创建", + "Permission:Update": "编辑", + "Permission:Delete": "删除", + "Permission:Enable": "启用|禁用", + "Permission:AuditLogManagement": "审计日志", + "Permission:SystemManagement": "系统管理", + "Permission:HangfireManagement": "后台任务", + "Permission:CapManagement": "集成事件", + "Permission:ESManagement": "ES日志", + "Permission:SettingManagement": "设置管理", + "Permission:IdentityServerManagement": "IdentityServer", + "Permission:IdentityServerManagement:Client": "客户端", + "Permission:IdentityServerManagement:ApiResource": "Api资源", + "Permission:IdentityServerManagement:ApiScope": "ApiScope", + "Permission:IdentityServerManagement:IdentityResources": "Identity资源", + "Setting.Group.System": "系统", + "Setting.Group.Other": "其它", + "DisplayName:Setting.Group.Other.Github": "Github", + "Description:Setting.Group.Other.Github": "Github" + } +} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/ProjectNameDomainSharedModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/ProjectNameDomainSharedModule.cs index 17459c3c..bd81509f 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/ProjectNameDomainSharedModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/ProjectNameDomainSharedModule.cs @@ -1,16 +1,19 @@ using CompanyName.ProjectName.Localization; -using EasyAbp.Abp.SettingUi; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; +using Volo.Abp.Identity.Localization; using Volo.Abp.IdentityServer; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; +using Volo.Abp.Localization.Resources.AbpLocalization; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; +using Volo.Abp.Timing.Localization.Resources.AbpTiming; +using Volo.Abp.Validation; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; @@ -24,8 +27,7 @@ namespace CompanyName.ProjectName typeof(AbpIdentityServerDomainSharedModule), typeof(AbpPermissionManagementDomainSharedModule), typeof(AbpSettingManagementDomainSharedModule), - typeof(AbpTenantManagementDomainSharedModule), - typeof(AbpSettingUiDomainSharedModule) + typeof(AbpTenantManagementDomainSharedModule) )] public class ProjectNameDomainSharedModule : AbpModule { @@ -41,12 +43,15 @@ namespace CompanyName.ProjectName { options.FileSets.AddEmbedded("CompanyName.ProjectName"); }); - + Configure(options => { options.Resources .Add("zh-Hans") .AddBaseTypes(typeof(AbpValidationResource)) + .AddBaseTypes(typeof(AbpLocalizationResource)) + .AddBaseTypes(typeof(IdentityResource)) + .AddBaseTypes(typeof(AbpTimingResource)) .AddVirtualJson("/Localization/ProjectName"); options.DefaultResourceType = typeof(ProjectNameResource); diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettingDefinitionProvider.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettingDefinitionProvider.cs index ae274970..756557f3 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettingDefinitionProvider.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettingDefinitionProvider.cs @@ -10,24 +10,65 @@ namespace CompanyName.ProjectName.Settings { //Define your own settings here. Example: //context.Add(new SettingDefinition(ProjectNameSettings.MySetting1)); - Test(context); + OverrideDefalutSettings(context); } /// - /// 测试Setting + /// 重写默认setting添加自定义属性 /// - /// - public void Test(ISettingDefinitionContext context) + private static void OverrideDefalutSettings(ISettingDefinitionContext context) { - // 具体设置请参考 https://github.com/EasyAbp/Abp.SettingUi/blob/develop/docs/README_zh-Hans.md - context.Add( - new SettingDefinition( - name: "Test", - defaultValue: "Test Setting Module", - displayName: L("Test") - ).WithProviders( // 设置级别 - DefaultValueSettingValueProvider.ProviderName, - GlobalSettingValueProvider.ProviderName)); + context.GetOrNull("Abp.Localization.DefaultLanguage") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeText); + + context.GetOrNull("Abp.Identity.Password.RequiredLength") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.GetOrNull("Abp.Identity.Password.RequiredUniqueChars") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.GetOrNull("Abp.Identity.Password.RequireNonAlphanumeric") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.GetOrNull("Abp.Identity.Password.RequireLowercase") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.GetOrNull("Abp.Identity.Password.RequireUppercase") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.GetOrNull("Abp.Identity.Password.RequireDigit") + .WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.SystemManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeCheckBox); + + context.Add(new SettingDefinition( + ProjectNameSettings.Other.Github, + "https://github.com/WangJunZzz/abp-vnext-pro", + L("DisplayName:" + ProjectNameSettings.Other.Github), + L("Description:" + ProjectNameSettings.Other.Github) + ).WithProperty(ProjectNameSettings.Group.Defalut, + ProjectNameSettings.Group.OtherManagement) + .WithProperty(ProjectNameSettings.ControlType.Defalut, + ProjectNameSettings.ControlType.TypeText)); } private static LocalizableString L(string name) diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettings.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettings.cs index 1e08bc8f..76e7ca55 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettings.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Settings/ProjectNameSettings.cs @@ -4,9 +4,33 @@ { public const string Prefix = "setting_"; - //Add your own setting names here. Example: - //public const string MySetting1 = Prefix + ".MySetting1"; + /// + /// 前端控件类型 + /// + public static class ControlType + { + public const string Defalut = "Type"; + public const string TypeText = "Text"; + public const string TypeCheckBox = "CheckBox"; + } - public const string TestGroup = "Test"; + /// + /// 系统控制分组 + /// + public static class Group + { + public const string Defalut = "Setting.Group"; + public const string SystemManagement = Defalut + ".System"; + public const string OtherManagement = Defalut + ".Other"; + } + + /// + /// 其他控制分组 + /// + public static class Other + { + private const string Defalut = "Setting.Group.Other"; + public const string Github = Defalut + ".Github"; + } } } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Systems/SettingController.cs b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Systems/SettingController.cs index 64c6a414..e5b75641 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Systems/SettingController.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Systems/SettingController.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using CompanyName.ProjectName.Settings; -using EasyAbp.Abp.SettingUi; -using EasyAbp.Abp.SettingUi.Dto; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; @@ -20,7 +18,7 @@ namespace CompanyName.ProjectName.Controllers.Systems [HttpPost("all")] [SwaggerOperation(summary: "获取所有Setting", Tags = new[] { "Settings" })] - public async Task> GetAsync() + public async Task> GetAsync() { return await _settingAppService.GetAsync(); } diff --git a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/AbpTenantController.cs b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/AbpTenantController.cs index e3ec939f..e7b49814 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/AbpTenantController.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/AbpTenantController.cs @@ -1,26 +1,28 @@ -using System.Threading.Tasks; -using CompanyName.ProjectName.Tenants.Dtos; -using Microsoft.AspNetCore.Mvc; -using Swashbuckle.AspNetCore.Annotations; -using Volo.Abp.AspNetCore.Mvc.MultiTenancy; - -namespace CompanyName.ProjectName.Controllers.Tenants -{ - [Route("Tenants")] - public class AbpTenantController : ProjectNameController - { - private readonly IAbpTenantAppService _abpTenantAppService; - - public AbpTenantController(IAbpTenantAppService abpTenantAppService) - { - _abpTenantAppService = abpTenantAppService; - } - - [HttpPost("find")] - [SwaggerOperation(summary: "通过名称获取租户信息", Tags = new[] {"Tenants"})] - public async Task FindTenantByNameAsync(FindTenantByNameInput input) - { - return await _abpTenantAppService.FindTenantByNameAsync(input.Name); - } - } -} \ No newline at end of file +// using System; +// using System.Threading.Tasks; +// using CompanyName.ProjectName.Tenants.Dtos; +// using Microsoft.AspNetCore.Mvc; +// using Swashbuckle.AspNetCore.Annotations; +// using Volo.Abp.Application.Services; +// using Volo.Abp.AspNetCore.Mvc.MultiTenancy; +// +// namespace CompanyName.ProjectName.Controllers.Tenants +// { +// [Route("Tenants")] +// public class AbpTenantController : ProjectNameController,IApplicationService +// { +// private readonly IAbpTenantAppService _abpTenantAppService; +// +// public AbpTenantController(IAbpTenantAppService abpTenantAppService) +// { +// _abpTenantAppService = abpTenantAppService; +// } +// +// [HttpPost("find")] +// [SwaggerOperation(summary: "通过名称获取租户信息", Tags = new[] {"Tenants"})] +// public async Task FindTenantByNameAsync(FindTenantByNameInput input) +// { +// return await _abpTenantAppService.FindTenantByNameAsync(input.Name); +// } +// } +// } \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/TenantController.cs b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/TenantController.cs index e6052d8c..e16aaa54 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/TenantController.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/Tenants/TenantController.cs @@ -1,77 +1,83 @@ using System.Threading.Tasks; using CompanyName.ProjectName.Tenants.Dtos; using CompanyName.ProjectName.Extension.Customs.Dtos; -using Microsoft.AspNetCore.Authorization; +using CompanyName.ProjectName.Tenants; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc.MultiTenancy; using Volo.Abp.TenantManagement; namespace CompanyName.ProjectName.Controllers.Tenants { [Route("Tenants")] - public class TenantController : ProjectNameController + public class TenantController : ProjectNameController, IVoloTenantAppService { - private readonly ITenantAppService _tenantAppService; + private readonly IVoloTenantAppService _voloTenantAppService; - public TenantController(ITenantAppService tenantAppService) + public TenantController(IVoloTenantAppService voloTenantAppService) { - _tenantAppService = tenantAppService; + _voloTenantAppService = voloTenantAppService; + } + + [HttpPost("find")] + [SwaggerOperation(summary: "通过名称获取租户信息", Tags = new[] {"Tenants"})] + public Task FindTenantByNameAsync(FindTenantByNameInput input) + { + return _voloTenantAppService.FindTenantByNameAsync(input); } [HttpPost("page")] - [SwaggerOperation(summary: "分页获取租户信息", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "分页获取租户信息", Tags = new[] { "Tenants" })] public Task> ListAsync(PagingTenantInput input) { - var request = new GetTenantsInput {Filter = input.Filter, SkipCount = input.SkipCount, MaxResultCount = input.PageSize}; - return _tenantAppService.GetListAsync(request); + return _voloTenantAppService.ListAsync(input); } [HttpPost("create")] - [SwaggerOperation(summary: "创建租户", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "创建租户", Tags = new[] { "Tenants" })] public Task CreateAsync(TenantCreateDto input) { - return _tenantAppService.CreateAsync(input); + return _voloTenantAppService.CreateAsync(input); } [HttpPost("update")] - [SwaggerOperation(summary: "更新租户", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "更新租户", Tags = new[] { "Tenants" })] public Task UpdateAsync(UpdateTenantInput input) { var request = new TenantUpdateDto() { Name = input.Name.Trim() }; - return _tenantAppService.UpdateAsync(input.Id, request); + return _voloTenantAppService.UpdateAsync(input); } - + [HttpPost("delete")] - [SwaggerOperation(summary: "删除租户", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "删除租户", Tags = new[] { "Tenants" })] public Task DeleteAsync(IdInput input) { - return _tenantAppService.DeleteAsync(input.Id); + return _voloTenantAppService.DeleteAsync(input); } [HttpPost("getConnectionString")] - [SwaggerOperation(summary: "获取租户连接字符串", Tags = new[] {"Tenants"})] - [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] + [SwaggerOperation(summary: "获取租户连接字符串", Tags = new[] { "Tenants" })] public Task GetDefaultConnectionStringAsync(IdInput input) { - return _tenantAppService.GetDefaultConnectionStringAsync(input.Id); + return _voloTenantAppService.GetDefaultConnectionStringAsync(input); } [HttpPost("updateConnectionString")] - [SwaggerOperation(summary: "更新租户连接字符串", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "更新租户连接字符串", Tags = new[] { "Tenants" })] public Task UpdateDefaultConnectionStringAsync(UpdateConnectionStringInput input) { - return _tenantAppService.UpdateDefaultConnectionStringAsync(input.Id, input.ConnectionString); + return _voloTenantAppService.UpdateDefaultConnectionStringAsync(input); } [HttpPost("deleteConnectionString")] - [SwaggerOperation(summary: "删除租户连接字符串", Tags = new[] {"Tenants"})] + [SwaggerOperation(summary: "删除租户连接字符串", Tags = new[] { "Tenants" })] public Task DeleteDefaultConnectionStringAsync(IdInput input) { - return _tenantAppService.DeleteDefaultConnectionStringAsync(input.Id); + return _voloTenantAppService.DeleteDefaultConnectionStringAsync(input); } } } \ No newline at end of file diff --git a/vben271/src/router/routes/modules/admin.ts b/vben271/src/router/routes/modules/admin.ts index e742050a..7ceae6c7 100644 --- a/vben271/src/router/routes/modules/admin.ts +++ b/vben271/src/router/routes/modules/admin.ts @@ -39,7 +39,7 @@ const admin: AppRouteModule = { component: () => import('/@/views/admin/settings/Setting.vue'), meta: { title: t('routes.admin.settingManagement'), - policy: 'SettingUi.ShowSettingPage', + policy: 'System.Setting', icon: 'ant-design:unordered-list-outlined', }, }, @@ -62,7 +62,7 @@ const admin: AppRouteModule = { policy: 'System.ES', icon: 'ant-design:snippets-twotone', }, - } + }, ], }; diff --git a/vben271/src/services/ServiceProxies.ts b/vben271/src/services/ServiceProxies.ts index d08b91f0..d9808c00 100644 --- a/vben271/src/services/ServiceProxies.ts +++ b/vben271/src/services/ServiceProxies.ts @@ -217,7 +217,7 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { } } -export class TenantsServiceProxy extends ServiceProxyBase { +export class AccountServiceProxy extends ServiceProxyBase { private instance: AxiosInstance; private baseUrl: string; protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; @@ -229,12 +229,12 @@ export class TenantsServiceProxy extends ServiceProxyBase { } /** - * 通过名称获取租户信息 + * 登录 * @param body (optional) * @return Success */ - find(body: FindTenantByNameInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/find"; + login(body: LoginInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/app/account/login"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -259,11 +259,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processFind(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processLogin(_response)); }); } - protected processFind(response: AxiosResponse): Promise { + protected processLogin(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -277,7 +277,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = FindTenantResultDto.fromJS(resultData200); + result200 = LoginOutput.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -319,26 +319,26 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 分页获取租户信息 - * @param body (optional) + * 登录 + * @param accessToken (optional) * @return Success */ - page(body: PagingTenantInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/page"; + sts(accessToken: string | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/app/account/login/Sts?"; + if (accessToken === null) + throw new Error("The parameter 'accessToken' cannot be null."); + else if (accessToken !== undefined) + url_ += "accessToken=" + encodeURIComponent("" + accessToken) + "&"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, method: "POST", url: url_, headers: { - "Content-Type": "application/json", "Accept": "text/plain" }, cancelToken @@ -353,11 +353,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processSts(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processSts(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -371,7 +371,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = TenantDtoPagedResultDto.fromJS(resultData200); + result200 = LoginOutput.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -413,16 +413,28 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class ApiResourceServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 创建租户 + * 分页获取ApiResource信息 * @param body (optional) * @return Success */ - create(body: TenantCreateDto | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/create"; + page(body: PagingApiRseourceListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiResource/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -447,11 +459,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -465,7 +477,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = TenantDto.fromJS(resultData200); + result200 = ApiResourceOutputPagedResultDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -507,26 +519,21 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 更新租户 - * @param body (optional) + * 获取ApiResource信息 * @return Success */ - update(body: UpdateTenantInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/update"; + all( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiResource/all"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, method: "POST", url: url_, headers: { - "Content-Type": "application/json", "Accept": "text/plain" }, cancelToken @@ -541,11 +548,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processAll(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -559,7 +566,14 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = TenantDto.fromJS(resultData200); + if (Array.isArray(resultData200)) { + result200 = [] as any; + for (let item of resultData200) + result200!.push(ApiResourceOutput.fromJS(item)); + } + else { + result200 = null; + } return result200; } else if (status === 403) { const _responseText = response.data; @@ -601,16 +615,16 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 删除租户 + * 新增ApiResource * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/delete"; + create(body: CreateApiResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiResource/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -634,11 +648,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -695,12 +709,12 @@ export class TenantsServiceProxy extends ServiceProxyBase { } /** - * 获取租户连接字符串 + * 删除ApiResource * @param body (optional) * @return Success */ - getConnectionString(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/getConnectionString"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiResource/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -711,7 +725,6 @@ export class TenantsServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -725,11 +738,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processGetConnectionString(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processGetConnectionString(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -741,10 +754,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = resultData200 !== undefined ? resultData200 : null; - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -785,16 +795,16 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 更新租户连接字符串 + * 删除ApiResource * @param body (optional) * @return Success */ - updateConnectionString(body: UpdateConnectionStringInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/updateConnectionString"; + update(body: UpdateApiResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiResource/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -818,11 +828,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateConnectionString(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processUpdateConnectionString(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -877,14 +887,26 @@ export class TenantsServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} + +export class ApiScopeServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } /** - * 删除租户连接字符串 + * 分页获取ApiScope信息 * @param body (optional) * @return Success */ - deleteConnectionString(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Tenants/deleteConnectionString"; + page(body: PagingApiScopeListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiScope/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -895,6 +917,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -908,11 +931,11 @@ export class TenantsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDeleteConnectionString(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processDeleteConnectionString(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -924,7 +947,10 @@ export class TenantsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingApiScopeListOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -965,28 +991,16 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class AccountServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 登录 + * 创建ApiScope * @param body (optional) * @return Success */ - login(body: LoginInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/app/account/login"; + create(body: CreateApiScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiScope/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -997,7 +1011,6 @@ export class AccountServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -1011,11 +1024,11 @@ export class AccountServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processLogin(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processLogin(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1027,10 +1040,7 @@ export class AccountServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = LoginOutput.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1071,27 +1081,26 @@ export class AccountServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 登录 - * @param accessToken (optional) + * 更新ApiScope + * @param body (optional) * @return Success */ - sts(accessToken: string | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/app/account/login/Sts?"; - if (accessToken === null) - throw new Error("The parameter 'accessToken' cannot be null."); - else if (accessToken !== undefined) - url_ += "accessToken=" + encodeURIComponent("" + accessToken) + "&"; + update(body: UpdateCreateApiScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiScope/update"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { + data: content_, method: "POST", url: url_, headers: { - "Accept": "text/plain" + "Content-Type": "application/json", }, cancelToken }; @@ -1105,11 +1114,11 @@ export class AccountServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processSts(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processSts(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1121,10 +1130,7 @@ export class AccountServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = LoginOutput.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1165,28 +1171,16 @@ export class AccountServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class ApiResourceServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 分页获取ApiResource信息 + * 删除ApiScope * @param body (optional) * @return Success */ - page(body: PagingApiRseourceListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiResource/page"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiScope/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1197,7 +1191,6 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -1211,11 +1204,11 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1227,10 +1220,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = ApiResourceOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1271,15 +1261,15 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 获取ApiResource信息 + * 获取所有ApiScope * @return Success */ - all( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiResource/all"; + all( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/ApiScope/all"; url_ = url_.replace(/[?&]$/, ""); let options_ = { @@ -1304,7 +1294,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { }); } - protected processAll(response: AxiosResponse): Promise { + protected processAll(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1321,7 +1311,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { if (Array.isArray(resultData200)) { result200 = [] as any; for (let item of resultData200) - result200!.push(ApiResourceOutput.fromJS(item)); + result200!.push(StringStringFromSelector.fromJS(item)); } else { result200 = null; @@ -1367,16 +1357,28 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class AuditLogsServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 新增ApiResource + * 分页获取审计日志信息 * @param body (optional) * @return Success */ - create(body: CreateApiResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiResource/create"; + page(body: PagingAuditLogListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/AuditLogs/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1387,6 +1389,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -1400,11 +1403,11 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1416,7 +1419,10 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = GetAuditLogPageListOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1457,16 +1463,28 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class ClientServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 删除ApiResource + * 分页获取Client信息 * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiResource/delete"; + page(body: PagingClientListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1477,6 +1495,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -1490,11 +1509,11 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1506,7 +1525,10 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingClientListOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1547,16 +1569,16 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 删除ApiResource + * 创建Client * @param body (optional) * @return Success */ - update(body: UpdateApiResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiResource/update"; + create(body: CreateClientInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1580,11 +1602,11 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1639,26 +1661,14 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } -} - -export class ApiScopeServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; - } /** - * 分页获取ApiScope信息 + * 删除client * @param body (optional) * @return Success */ - page(body: PagingApiScopeListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiScope/page"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1669,7 +1679,6 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -1683,11 +1692,11 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1699,10 +1708,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = PagingApiScopeListOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -1743,16 +1749,16 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 创建ApiScope + * 更新基本信息 * @param body (optional) * @return Success */ - create(body: CreateApiScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiScope/create"; + updateBasic(body: UpdataBasicDataInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/updateBasic"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1776,11 +1782,11 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateBasic(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processUpdateBasic(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1837,12 +1843,12 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } /** - * 更新ApiScope + * 更新client scopes * @param body (optional) * @return Success */ - update(body: UpdateCreateApiScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiScope/update"; + updateScopes(body: UpdateScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/updateScopes"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1866,11 +1872,11 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateScopes(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processUpdateScopes(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -1927,12 +1933,12 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } /** - * 删除ApiScope + * 新增回调地址 * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiScope/delete"; + addRedirectUri(body: AddRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/addRedirectUri"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -1956,11 +1962,11 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddRedirectUri(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processAddRedirectUri(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2017,18 +2023,22 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } /** - * 获取所有ApiScope + * 删除回调地址 + * @param body (optional) * @return Success */ - all( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/ApiScope/all"; + removeRedirectUri(body: RemoveRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/removeRedirectUri"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { + data: content_, method: "POST", url: url_, headers: { - "Accept": "text/plain" + "Content-Type": "application/json", }, cancelToken }; @@ -2042,11 +2052,11 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveRedirectUri(_response)); }); } - protected processAll(response: AxiosResponse): Promise { + protected processRemoveRedirectUri(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2058,17 +2068,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - if (Array.isArray(resultData200)) { - result200 = [] as any; - for (let item of resultData200) - result200!.push(StringStringFromSelector.fromJS(item)); - } - else { - result200 = null; - } - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2109,28 +2109,16 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class AuditLogsServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 分页获取用户信息 + * 新增Logout回调地址 * @param body (optional) * @return Success */ - page(body: PagingAuditLogListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/AuditLogs/page"; + addLogoutRedirectUri(body: AddRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/addLogoutRedirectUri"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2141,7 +2129,6 @@ export class AuditLogsServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -2155,11 +2142,11 @@ export class AuditLogsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddLogoutRedirectUri(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processAddLogoutRedirectUri(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2171,10 +2158,7 @@ export class AuditLogsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = GetAuditLogPageListOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2215,28 +2199,16 @@ export class AuditLogsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class ClientServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 分页获取Client信息 + * 删除Logout回调地址 * @param body (optional) * @return Success */ - page(body: PagingClientListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/page"; + removeLogoutRedirectUri(body: RemoveRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/removeLogoutRedirectUri"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2247,7 +2219,6 @@ export class ClientServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -2261,11 +2232,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveLogoutRedirectUri(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processRemoveLogoutRedirectUri(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2277,10 +2248,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = PagingClientListOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2321,16 +2289,16 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 创建Client + * 添加cors * @param body (optional) * @return Success */ - create(body: CreateClientInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/create"; + addCors(body: AddCorsInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/addCors"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2354,11 +2322,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddCors(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processAddCors(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2415,12 +2383,12 @@ export class ClientServiceProxy extends ServiceProxyBase { } /** - * 删除client + * 删除cors * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/delete"; + removeCors(body: RemoveCorsInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/removeCors"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2444,11 +2412,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveCors(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processRemoveCors(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2505,12 +2473,12 @@ export class ClientServiceProxy extends ServiceProxyBase { } /** - * 更新基本信息 + * 禁用client * @param body (optional) * @return Success */ - updateBasic(body: UpdataBasicDataInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/updateBasic"; + enabled(body: EnabledInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/Client/enabled"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2534,11 +2502,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateBasic(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processEnabled(_response)); }); } - protected processUpdateBasic(response: AxiosResponse): Promise { + protected processEnabled(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2593,14 +2561,26 @@ export class ClientServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} - /** - * 更新client scopes +export class EsLogServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } + + /** + * 分页获取Es日志 * @param body (optional) * @return Success */ - updateScopes(body: UpdateScopeInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/updateScopes"; + page(body: PagingElasticSearchLogInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/EsLog/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2611,6 +2591,7 @@ export class ClientServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -2624,11 +2605,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateScopes(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processUpdateScopes(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2640,7 +2621,10 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingElasticSearchLogOutputCustomePagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2681,16 +2665,28 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class DataDictionaryServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 新增回调地址 + * 分页字典类型 * @param body (optional) * @return Success */ - addRedirectUri(body: AddRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/addRedirectUri"; + page(body: PagingDataDictionaryInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/DataDictionary/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2701,6 +2697,7 @@ export class ClientServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -2714,11 +2711,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddRedirectUri(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processAddRedirectUri(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2730,7 +2727,10 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingDataDictionaryOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2771,16 +2771,16 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 删除回调地址 + * 分页字典明细 * @param body (optional) * @return Success */ - removeRedirectUri(body: RemoveRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/removeRedirectUri"; + detail(body: PagingDataDictionaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/DataDictionary/page/detail"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2791,6 +2791,7 @@ export class ClientServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -2804,11 +2805,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveRedirectUri(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDetail(_response)); }); } - protected processRemoveRedirectUri(response: AxiosResponse): Promise { + protected processDetail(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2820,7 +2821,10 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingDataDictionaryDetailOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -2861,16 +2865,16 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 新增Logout回调地址 + * 创建字典类型 * @param body (optional) * @return Success */ - addLogoutRedirectUri(body: AddRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/addLogoutRedirectUri"; + create(body: CreateDataDictinaryInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/DataDictionary/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2894,11 +2898,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddLogoutRedirectUri(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processAddLogoutRedirectUri(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -2955,12 +2959,12 @@ export class ClientServiceProxy extends ServiceProxyBase { } /** - * 删除Logout回调地址 + * 创建字典明细 * @param body (optional) * @return Success */ - removeLogoutRedirectUri(body: RemoveRedirectUriInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/removeLogoutRedirectUri"; + createDetail(body: CreateDataDictinaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/DataDictionary/createDetail"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -2984,11 +2988,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveLogoutRedirectUri(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreateDetail(_response)); }); } - protected processRemoveLogoutRedirectUri(response: AxiosResponse): Promise { + protected processCreateDetail(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3045,12 +3049,12 @@ export class ClientServiceProxy extends ServiceProxyBase { } /** - * 添加cors + * 设置字典明细状态 * @param body (optional) * @return Success */ - addCors(body: AddCorsInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/addCors"; + status(body: SetDataDictinaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/DataDictionary/status"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3074,11 +3078,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAddCors(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processStatus(_response)); }); } - protected processAddCors(response: AxiosResponse): Promise { + protected processStatus(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3133,24 +3137,30 @@ export class ClientServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} + +export class FileConfigurationServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } /** - * 删除cors - * @param body (optional) * @return Success */ - removeCors(body: RemoveCorsInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/removeCors"; + configurationGet( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/configuration"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, - method: "POST", + method: "GET", url: url_, headers: { - "Content-Type": "application/json", }, cancelToken }; @@ -3164,11 +3174,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRemoveCors(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processConfigurationGet(_response)); }); } - protected processRemoveCors(response: AxiosResponse): Promise { + protected processConfigurationGet(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3181,42 +3191,6 @@ export class ClientServiceProxy extends ServiceProxyBase { if (status === 200) { const _responseText = response.data; return Promise.resolve(null); - } else if (status === 403) { - const _responseText = response.data; - let result403: any = null; - let resultData403 = _responseText; - result403 = RemoteServiceErrorResponse.fromJS(resultData403); - return throwException("Forbidden", status, _responseText, _headers, result403); - } else if (status === 401) { - const _responseText = response.data; - let result401: any = null; - let resultData401 = _responseText; - result401 = RemoteServiceErrorResponse.fromJS(resultData401); - return throwException("Unauthorized", status, _responseText, _headers, result401); - } else if (status === 400) { - const _responseText = response.data; - let result400: any = null; - let resultData400 = _responseText; - result400 = RemoteServiceErrorResponse.fromJS(resultData400); - return throwException("Bad Request", status, _responseText, _headers, result400); - } else if (status === 404) { - const _responseText = response.data; - let result404: any = null; - let resultData404 = _responseText; - result404 = RemoteServiceErrorResponse.fromJS(resultData404); - return throwException("Not Found", status, _responseText, _headers, result404); - } else if (status === 501) { - const _responseText = response.data; - let result501: any = null; - let resultData501 = _responseText; - result501 = RemoteServiceErrorResponse.fromJS(resultData501); - return throwException("Server Error", status, _responseText, _headers, result501); - } else if (status === 500) { - const _responseText = response.data; - let result500: any = null; - let resultData500 = _responseText; - result500 = RemoteServiceErrorResponse.fromJS(resultData500); - return throwException("Server Error", status, _responseText, _headers, result500); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); @@ -3225,12 +3199,11 @@ export class ClientServiceProxy extends ServiceProxyBase { } /** - * 禁用client * @param body (optional) * @return Success */ - enabled(body: EnabledInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/Client/enabled"; + configurationPost(body: FileConfiguration | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/configuration"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3254,11 +3227,11 @@ export class ClientServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processEnabled(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processConfigurationPost(_response)); }); } - protected processEnabled(response: AxiosResponse): Promise { + protected processConfigurationPost(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3271,42 +3244,6 @@ export class ClientServiceProxy extends ServiceProxyBase { if (status === 200) { const _responseText = response.data; return Promise.resolve(null); - } else if (status === 403) { - const _responseText = response.data; - let result403: any = null; - let resultData403 = _responseText; - result403 = RemoteServiceErrorResponse.fromJS(resultData403); - return throwException("Forbidden", status, _responseText, _headers, result403); - } else if (status === 401) { - const _responseText = response.data; - let result401: any = null; - let resultData401 = _responseText; - result401 = RemoteServiceErrorResponse.fromJS(resultData401); - return throwException("Unauthorized", status, _responseText, _headers, result401); - } else if (status === 400) { - const _responseText = response.data; - let result400: any = null; - let resultData400 = _responseText; - result400 = RemoteServiceErrorResponse.fromJS(resultData400); - return throwException("Bad Request", status, _responseText, _headers, result400); - } else if (status === 404) { - const _responseText = response.data; - let result404: any = null; - let resultData404 = _responseText; - result404 = RemoteServiceErrorResponse.fromJS(resultData404); - return throwException("Not Found", status, _responseText, _headers, result404); - } else if (status === 501) { - const _responseText = response.data; - let result501: any = null; - let resultData501 = _responseText; - result501 = RemoteServiceErrorResponse.fromJS(resultData501); - return throwException("Server Error", status, _responseText, _headers, result501); - } else if (status === 500) { - const _responseText = response.data; - let result500: any = null; - let resultData500 = _responseText; - result500 = RemoteServiceErrorResponse.fromJS(resultData500); - return throwException("Server Error", status, _responseText, _headers, result500); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); @@ -3315,7 +3252,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } } -export class EsLogServiceProxy extends ServiceProxyBase { +export class IdentityResourceServiceProxy extends ServiceProxyBase { private instance: AxiosInstance; private baseUrl: string; protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; @@ -3327,12 +3264,12 @@ export class EsLogServiceProxy extends ServiceProxyBase { } /** - * 分页获取Es日志 + * 分页获取IdentityResource信息 * @param body (optional) * @return Success */ - page(body: PagingElasticSearchLogInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/EsLog/page"; + page(body: PagingIdentityResourceListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/IdentityResource/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3361,7 +3298,7 @@ export class EsLogServiceProxy extends ServiceProxyBase { }); } - protected processPage(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3375,7 +3312,7 @@ export class EsLogServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = PagingElasticSearchLogOutputCustomePagedResultDto.fromJS(resultData200); + result200 = PagingIdentityResourceListOutputPagedResultDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -3417,38 +3354,21 @@ export class EsLogServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class DataDictionaryServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 分页字典类型 - * @param body (optional) + * 获取所有IdentityResource信息 * @return Success */ - page(body: PagingDataDictionaryInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/DataDictionary/page"; + all( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/IdentityResource/all"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, method: "POST", url: url_, headers: { - "Content-Type": "application/json", "Accept": "text/plain" }, cancelToken @@ -3463,11 +3383,11 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processAll(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3481,7 +3401,14 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = PagingDataDictionaryOutputPagedResultDto.fromJS(resultData200); + if (Array.isArray(resultData200)) { + result200 = [] as any; + for (let item of resultData200) + result200!.push(PagingIdentityResourceListOutput.fromJS(item)); + } + else { + result200 = null; + } return result200; } else if (status === 403) { const _responseText = response.data; @@ -3523,16 +3450,16 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 分页字典明细 + * 创建IdentityResource * @param body (optional) * @return Success */ - detail(body: PagingDataDictionaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/DataDictionary/page/detail"; + create(body: CreateIdentityResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/IdentityResource/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3543,7 +3470,6 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -3557,11 +3483,11 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDetail(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processDetail(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3573,10 +3499,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = PagingDataDictionaryDetailOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -3617,16 +3540,16 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 创建字典类型 + * 更新IdentityResource * @param body (optional) * @return Success */ - create(body: CreateDataDictinaryInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/DataDictionary/create"; + update(body: UpdateIdentityResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/IdentityResource/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3650,11 +3573,11 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3711,12 +3634,12 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } /** - * 创建字典明细 + * 删除IdentityResource * @param body (optional) * @return Success */ - createDetail(body: CreateDataDictinaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/DataDictionary/createDetail"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/IdentityServer/IdentityResource/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3740,11 +3663,11 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreateDetail(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processCreateDetail(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3799,14 +3722,26 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} + +export class NotificationServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } /** - * 设置字典明细状态 + * 分页获取用户普通文本消息 * @param body (optional) * @return Success */ - status(body: SetDataDictinaryDetailInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/DataDictionary/status"; + text(body: PagingNotificationListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Notification/Text"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3817,6 +3752,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -3830,11 +3766,11 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processStatus(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processText(_response)); }); } - protected processStatus(response: AxiosResponse): Promise { + protected processText(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3846,7 +3782,10 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingNotificationListOutputPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -3887,32 +3826,120 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } -} -export class FileConfigurationServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + /** + * 分页获取广播消息 + * @param body (optional) + * @return Success + */ + broadCast(body: PagingNotificationListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Notification/BroadCast"; + url_ = url_.replace(/[?&]$/, ""); - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + const content_ = JSON.stringify(body); + + let options_ = { + data: content_, + method: "POST", + url: url_, + headers: { + "Content-Type": "application/json", + "Accept": "text/plain" + }, + cancelToken + }; + + return this.transformOptions(options_).then(transformedOptions_ => { + return this.instance.request(transformedOptions_); + }).catch((_error: any) => { + if (isAxiosError(_error) && _error.response) { + return _error.response; + } else { + throw _error; + } + }).then((_response: AxiosResponse) => { + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processBroadCast(_response)); + }); + } + + protected processBroadCast(response: AxiosResponse): Promise { + const status = response.status; + let _headers: any = {}; + if (response.headers && typeof response.headers === "object") { + for (let k in response.headers) { + if (response.headers.hasOwnProperty(k)) { + _headers[k] = response.headers[k]; + } + } + } + if (status === 200) { + const _responseText = response.data; + let result200: any = null; + let resultData200 = _responseText; + result200 = PagingNotificationListOutputPagedResultDto.fromJS(resultData200); + return result200; + } else if (status === 403) { + const _responseText = response.data; + let result403: any = null; + let resultData403 = _responseText; + result403 = RemoteServiceErrorResponse.fromJS(resultData403); + return throwException("Forbidden", status, _responseText, _headers, result403); + } else if (status === 401) { + const _responseText = response.data; + let result401: any = null; + let resultData401 = _responseText; + result401 = RemoteServiceErrorResponse.fromJS(resultData401); + return throwException("Unauthorized", status, _responseText, _headers, result401); + } else if (status === 400) { + const _responseText = response.data; + let result400: any = null; + let resultData400 = _responseText; + result400 = RemoteServiceErrorResponse.fromJS(resultData400); + return throwException("Bad Request", status, _responseText, _headers, result400); + } else if (status === 404) { + const _responseText = response.data; + let result404: any = null; + let resultData404 = _responseText; + result404 = RemoteServiceErrorResponse.fromJS(resultData404); + return throwException("Not Found", status, _responseText, _headers, result404); + } else if (status === 501) { + const _responseText = response.data; + let result501: any = null; + let resultData501 = _responseText; + result501 = RemoteServiceErrorResponse.fromJS(resultData501); + return throwException("Server Error", status, _responseText, _headers, result501); + } else if (status === 500) { + const _responseText = response.data; + let result500: any = null; + let resultData500 = _responseText; + result500 = RemoteServiceErrorResponse.fromJS(resultData500); + return throwException("Server Error", status, _responseText, _headers, result500); + } else if (status !== 200 && status !== 204) { + const _responseText = response.data; + return throwException("An unexpected server error occurred.", status, _responseText, _headers); + } + return Promise.resolve(null); } /** + * 消息设置为已读 + * @param body (optional) * @return Success */ - configurationGet( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/configuration"; + read(body: SetReadInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Notification/Read"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { - method: "GET", + data: content_, + method: "POST", url: url_, headers: { + "Content-Type": "application/json", }, cancelToken }; @@ -3926,11 +3953,11 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processConfigurationGet(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRead(_response)); }); } - protected processConfigurationGet(response: AxiosResponse): Promise { + protected processRead(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3943,6 +3970,42 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { if (status === 200) { const _responseText = response.data; return Promise.resolve(null); + } else if (status === 403) { + const _responseText = response.data; + let result403: any = null; + let resultData403 = _responseText; + result403 = RemoteServiceErrorResponse.fromJS(resultData403); + return throwException("Forbidden", status, _responseText, _headers, result403); + } else if (status === 401) { + const _responseText = response.data; + let result401: any = null; + let resultData401 = _responseText; + result401 = RemoteServiceErrorResponse.fromJS(resultData401); + return throwException("Unauthorized", status, _responseText, _headers, result401); + } else if (status === 400) { + const _responseText = response.data; + let result400: any = null; + let resultData400 = _responseText; + result400 = RemoteServiceErrorResponse.fromJS(resultData400); + return throwException("Bad Request", status, _responseText, _headers, result400); + } else if (status === 404) { + const _responseText = response.data; + let result404: any = null; + let resultData404 = _responseText; + result404 = RemoteServiceErrorResponse.fromJS(resultData404); + return throwException("Not Found", status, _responseText, _headers, result404); + } else if (status === 501) { + const _responseText = response.data; + let result501: any = null; + let resultData501 = _responseText; + result501 = RemoteServiceErrorResponse.fromJS(resultData501); + return throwException("Server Error", status, _responseText, _headers, result501); + } else if (status === 500) { + const _responseText = response.data; + let result500: any = null; + let resultData500 = _responseText; + result500 = RemoteServiceErrorResponse.fromJS(resultData500); + return throwException("Server Error", status, _responseText, _headers, result500); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); @@ -3951,11 +4014,12 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { } /** + * 创建消息-测试使用 * @param body (optional) * @return Success */ - configurationPost(body: FileConfiguration | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/configuration"; + create(body: CreateNotificationInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Notification/Create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -3979,11 +4043,11 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processConfigurationPost(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processConfigurationPost(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -3996,32 +4060,71 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { if (status === 200) { const _responseText = response.data; return Promise.resolve(null); + } else if (status === 403) { + const _responseText = response.data; + let result403: any = null; + let resultData403 = _responseText; + result403 = RemoteServiceErrorResponse.fromJS(resultData403); + return throwException("Forbidden", status, _responseText, _headers, result403); + } else if (status === 401) { + const _responseText = response.data; + let result401: any = null; + let resultData401 = _responseText; + result401 = RemoteServiceErrorResponse.fromJS(resultData401); + return throwException("Unauthorized", status, _responseText, _headers, result401); + } else if (status === 400) { + const _responseText = response.data; + let result400: any = null; + let resultData400 = _responseText; + result400 = RemoteServiceErrorResponse.fromJS(resultData400); + return throwException("Bad Request", status, _responseText, _headers, result400); + } else if (status === 404) { + const _responseText = response.data; + let result404: any = null; + let resultData404 = _responseText; + result404 = RemoteServiceErrorResponse.fromJS(resultData404); + return throwException("Not Found", status, _responseText, _headers, result404); + } else if (status === 501) { + const _responseText = response.data; + let result501: any = null; + let resultData501 = _responseText; + result501 = RemoteServiceErrorResponse.fromJS(resultData501); + return throwException("Server Error", status, _responseText, _headers, result501); + } else if (status === 500) { + const _responseText = response.data; + let result500: any = null; + let resultData500 = _responseText; + result500 = RemoteServiceErrorResponse.fromJS(resultData500); + return throwException("Server Error", status, _responseText, _headers, result500); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } return Promise.resolve(null); } -} - -export class IdentityResourceServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; - } /** - * 分页获取IdentityResource信息 + * 发送消息-测试使用 + * @param title (optional) + * @param content (optional) + * @param messageType (optional) * @param body (optional) * @return Success */ - page(body: PagingIdentityResourceListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/IdentityResource/page"; + sendMessage(title: string | undefined, content: string | undefined, messageType: MessageType | undefined, body: string[] | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Notification/SendMessage?"; + if (title === null) + throw new Error("The parameter 'title' cannot be null."); + else if (title !== undefined) + url_ += "title=" + encodeURIComponent("" + title) + "&"; + if (content === null) + throw new Error("The parameter 'content' cannot be null."); + else if (content !== undefined) + url_ += "content=" + encodeURIComponent("" + content) + "&"; + if (messageType === null) + throw new Error("The parameter 'messageType' cannot be null."); + else if (messageType !== undefined) + url_ += "messageType=" + encodeURIComponent("" + messageType) + "&"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4032,7 +4135,6 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -4046,11 +4148,11 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processSendMessage(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processSendMessage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4062,10 +4164,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = PagingIdentityResourceListOutputPagedResultDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -4106,21 +4205,101 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class OutputCacheServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 获取所有IdentityResource信息 * @return Success */ - all( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/IdentityResource/all"; + outputcache(region: string , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/outputcache/{region}"; + if (region === undefined || region === null) + throw new Error("The parameter 'region' must be defined."); + url_ = url_.replace("{region}", encodeURIComponent("" + region)); + url_ = url_.replace(/[?&]$/, ""); + + let options_ = { + method: "DELETE", + url: url_, + headers: { + }, + cancelToken + }; + + return this.transformOptions(options_).then(transformedOptions_ => { + return this.instance.request(transformedOptions_); + }).catch((_error: any) => { + if (isAxiosError(_error) && _error.response) { + return _error.response; + } else { + throw _error; + } + }).then((_response: AxiosResponse) => { + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processOutputcache(_response)); + }); + } + + protected processOutputcache(response: AxiosResponse): Promise { + const status = response.status; + let _headers: any = {}; + if (response.headers && typeof response.headers === "object") { + for (let k in response.headers) { + if (response.headers.hasOwnProperty(k)) { + _headers[k] = response.headers[k]; + } + } + } + if (status === 200) { + const _responseText = response.data; + return Promise.resolve(null); + } else if (status !== 200 && status !== 204) { + const _responseText = response.data; + return throwException("An unexpected server error occurred.", status, _responseText, _headers); + } + return Promise.resolve(null); + } +} + +export class PermissionsServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } + + /** + * 获取角色权限 + * @param body (optional) + * @return Success + */ + tree(body: GetPermissionInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Permissions/tree"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { + data: content_, method: "POST", url: url_, headers: { + "Content-Type": "application/json", "Accept": "text/plain" }, cancelToken @@ -4135,11 +4314,11 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processTree(_response)); }); } - protected processAll(response: AxiosResponse): Promise { + protected processTree(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4153,14 +4332,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - if (Array.isArray(resultData200)) { - result200 = [] as any; - for (let item of resultData200) - result200!.push(PagingIdentityResourceListOutput.fromJS(item)); - } - else { - result200 = null; - } + result200 = PermissionOutput.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -4202,16 +4374,16 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 创建IdentityResource + * 更新角色 * @param body (optional) * @return Success */ - create(body: CreateIdentityResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/IdentityResource/create"; + update(body: UpdateRolePermissionsInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Permissions/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4235,11 +4407,11 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4294,24 +4466,32 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} + +export class RolesServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } /** - * 更新IdentityResource - * @param body (optional) + * 获取所有角色 * @return Success */ - update(body: UpdateIdentityResourceInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/IdentityResource/update"; + all( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Roles/all"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, method: "POST", url: url_, headers: { - "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -4325,11 +4505,11 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processAll(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4341,7 +4521,10 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = IdentityRoleDtoListResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -4382,16 +4565,16 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 删除IdentityResource + * 分页获取角色 * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/IdentityServer/IdentityResource/delete"; + page(body: PagingRoleListInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Roles/page"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4402,6 +4585,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -4415,11 +4599,11 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4431,7 +4615,10 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = IdentityRoleDtoPagedResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -4472,28 +4659,16 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class NotificationServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 分页获取用户普通文本消息 + * 创建角色 * @param body (optional) * @return Success */ - text(body: PagingNotificationListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Notification/Text"; + create(body: IdentityRoleCreateDto | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Roles/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4518,11 +4693,11 @@ export class NotificationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processText(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processText(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4536,7 +4711,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = PagingNotificationListOutputPagedResultDto.fromJS(resultData200); + result200 = IdentityRoleDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -4578,16 +4753,16 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 分页获取广播消息 + * 更新角色 * @param body (optional) * @return Success */ - broadCast(body: PagingNotificationListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Notification/BroadCast"; + update(body: UpdateRoleInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Roles/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4612,11 +4787,11 @@ export class NotificationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processBroadCast(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processBroadCast(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4630,7 +4805,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = PagingNotificationListOutputPagedResultDto.fromJS(resultData200); + result200 = IdentityRoleDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -4672,16 +4847,16 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 消息设置为已读 + * 删除角色 * @param body (optional) * @return Success */ - read(body: SetReadInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Notification/Read"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Roles/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4705,11 +4880,11 @@ export class NotificationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processRead(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processRead(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4764,24 +4939,32 @@ export class NotificationServiceProxy extends ServiceProxyBase { } return Promise.resolve(null); } +} + +export class SettingsServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } /** - * 创建消息-测试使用 - * @param body (optional) + * 获取所有Setting * @return Success */ - create(body: CreateNotificationInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Notification/Create"; + all( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Settings/all"; url_ = url_.replace(/[?&]$/, ""); - const content_ = JSON.stringify(body); - let options_ = { - data: content_, method: "POST", url: url_, headers: { - "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -4795,11 +4978,11 @@ export class NotificationServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processAll(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4811,7 +4994,17 @@ export class NotificationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + if (Array.isArray(resultData200)) { + result200 = [] as any; + for (let item of resultData200) + result200!.push(SettingOutput.fromJS(item)); + } + else { + result200 = null; + } + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -4847,96 +5040,21 @@ export class NotificationServiceProxy extends ServiceProxyBase { let result500: any = null; let resultData500 = _responseText; result500 = RemoteServiceErrorResponse.fromJS(resultData500); - return throwException("Server Error", status, _responseText, _headers, result500); - } else if (status !== 200 && status !== 204) { - const _responseText = response.data; - return throwException("An unexpected server error occurred.", status, _responseText, _headers); - } - return Promise.resolve(null); - } -} - -export class OutputCacheServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; - } - - /** - * @return Success - */ - outputcache(region: string , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/outputcache/{region}"; - if (region === undefined || region === null) - throw new Error("The parameter 'region' must be defined."); - url_ = url_.replace("{region}", encodeURIComponent("" + region)); - url_ = url_.replace(/[?&]$/, ""); - - let options_ = { - method: "DELETE", - url: url_, - headers: { - }, - cancelToken - }; - - return this.transformOptions(options_).then(transformedOptions_ => { - return this.instance.request(transformedOptions_); - }).catch((_error: any) => { - if (isAxiosError(_error) && _error.response) { - return _error.response; - } else { - throw _error; - } - }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processOutputcache(_response)); - }); - } - - protected processOutputcache(response: AxiosResponse): Promise { - const status = response.status; - let _headers: any = {}; - if (response.headers && typeof response.headers === "object") { - for (let k in response.headers) { - if (response.headers.hasOwnProperty(k)) { - _headers[k] = response.headers[k]; - } - } - } - if (status === 200) { - const _responseText = response.data; - return Promise.resolve(null); - } else if (status !== 200 && status !== 204) { - const _responseText = response.data; - return throwException("An unexpected server error occurred.", status, _responseText, _headers); - } - return Promise.resolve(null); - } -} - -export class PermissionsServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return throwException("Server Error", status, _responseText, _headers, result500); + } else if (status !== 200 && status !== 204) { + const _responseText = response.data; + return throwException("An unexpected server error occurred.", status, _responseText, _headers); + } + return Promise.resolve(null); } /** - * 获取角色权限 + * 更新Setting * @param body (optional) * @return Success */ - tree(body: GetPermissionInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Permissions/tree"; + update(body: UpdateSettingInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Settings/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -4947,7 +5065,6 @@ export class PermissionsServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -4961,11 +5078,11 @@ export class PermissionsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processTree(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processTree(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -4977,10 +5094,7 @@ export class PermissionsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = PermissionOutput.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -5021,16 +5135,28 @@ export class PermissionsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); + } +} + +export class TenantsServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; } /** - * 更新角色 + * 通过名称获取租户信息 * @param body (optional) * @return Success */ - update(body: UpdateRolePermissionsInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Permissions/update"; + find(body: FindTenantByNameInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/find"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5041,6 +5167,7 @@ export class PermissionsServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -5054,11 +5181,11 @@ export class PermissionsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processFind(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processFind(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5070,7 +5197,10 @@ export class PermissionsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = FindTenantResultDto.fromJS(resultData200); + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -5111,33 +5241,26 @@ export class PermissionsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class RolesServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 获取所有角色 + * 分页获取租户信息 + * @param body (optional) * @return Success */ - all( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Roles/all"; + page(body: PagingTenantInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/page"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { + data: content_, method: "POST", url: url_, headers: { + "Content-Type": "application/json", "Accept": "text/plain" }, cancelToken @@ -5152,11 +5275,11 @@ export class RolesServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); }); } - protected processAll(response: AxiosResponse): Promise { + protected processPage(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5170,7 +5293,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = IdentityRoleDtoListResultDto.fromJS(resultData200); + result200 = TenantDtoPagedResultDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -5212,16 +5335,16 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 分页获取角色 + * 创建租户 * @param body (optional) * @return Success */ - page(body: PagingRoleListInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Roles/page"; + create(body: TenantCreateDto | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/create"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5246,11 +5369,11 @@ export class RolesServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processPage(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); }); } - protected processPage(response: AxiosResponse): Promise { + protected processCreate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5264,7 +5387,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = IdentityRoleDtoPagedResultDto.fromJS(resultData200); + result200 = TenantDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -5306,16 +5429,16 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 创建角色 + * 更新租户 * @param body (optional) * @return Success */ - create(body: IdentityRoleCreateDto | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Roles/create"; + update(body: UpdateTenantInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/update"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5340,11 +5463,11 @@ export class RolesServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processCreate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); }); } - protected processCreate(response: AxiosResponse): Promise { + protected processUpdate(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5358,7 +5481,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; let result200: any = null; let resultData200 = _responseText; - result200 = IdentityRoleDto.fromJS(resultData200); + result200 = TenantDto.fromJS(resultData200); return result200; } else if (status === 403) { const _responseText = response.data; @@ -5400,16 +5523,16 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 更新角色 + * 删除租户 * @param body (optional) * @return Success */ - update(body: UpdateRoleInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Roles/update"; + delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/delete"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5420,7 +5543,6 @@ export class RolesServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", - "Accept": "text/plain" }, cancelToken }; @@ -5434,11 +5556,11 @@ export class RolesServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processDelete(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5450,10 +5572,7 @@ export class RolesServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = IdentityRoleDto.fromJS(resultData200); - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -5494,16 +5613,16 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 删除角色 + * 获取租户连接字符串 * @param body (optional) * @return Success */ - delete(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Roles/delete"; + getConnectionString(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/getConnectionString"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5514,6 +5633,7 @@ export class RolesServiceProxy extends ServiceProxyBase { url: url_, headers: { "Content-Type": "application/json", + "Accept": "text/plain" }, cancelToken }; @@ -5527,11 +5647,11 @@ export class RolesServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDelete(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processGetConnectionString(_response)); }); } - protected processDelete(response: AxiosResponse): Promise { + protected processGetConnectionString(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5543,7 +5663,10 @@ export class RolesServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null); + let result200: any = null; + let resultData200 = _responseText; + result200 = resultData200 !== undefined ? resultData200 : null; + return result200; } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -5584,34 +5707,26 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); - } -} - -export class SettingsServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + return Promise.resolve(null); } /** - * 获取所有Setting + * 更新租户连接字符串 + * @param body (optional) * @return Success */ - all( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Settings/all"; + updateConnectionString(body: UpdateConnectionStringInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/updateConnectionString"; url_ = url_.replace(/[?&]$/, ""); + const content_ = JSON.stringify(body); + let options_ = { + data: content_, method: "POST", url: url_, headers: { - "Accept": "text/plain" + "Content-Type": "application/json", }, cancelToken }; @@ -5625,11 +5740,11 @@ export class SettingsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processAll(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdateConnectionString(_response)); }); } - protected processAll(response: AxiosResponse): Promise { + protected processUpdateConnectionString(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -5641,17 +5756,7 @@ export class SettingsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - if (Array.isArray(resultData200)) { - result200 = [] as any; - for (let item of resultData200) - result200!.push(SettingGroup.fromJS(item)); - } - else { - result200 = null; - } - return result200; + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -5692,16 +5797,16 @@ export class SettingsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null); + return Promise.resolve(null); } /** - * 更新Setting + * 删除租户连接字符串 * @param body (optional) * @return Success */ - update(body: UpdateSettingInput | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/Settings/update"; + deleteConnectionString(body: IdInput | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/Tenants/deleteConnectionString"; url_ = url_.replace(/[?&]$/, ""); const content_ = JSON.stringify(body); @@ -5725,11 +5830,11 @@ export class SettingsServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processUpdate(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processDeleteConnectionString(_response)); }); } - protected processUpdate(response: AxiosResponse): Promise { + protected processDeleteConnectionString(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -12420,8 +12525,11 @@ export interface IObjectExtensionsDto { } export class PagingApiRseourceListInput implements IPagingApiRseourceListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -12461,15 +12569,21 @@ export class PagingApiRseourceListInput implements IPagingApiRseourceListInput { } export interface IPagingApiRseourceListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } export class PagingApiScopeListInput implements IPagingApiScopeListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -12509,8 +12623,11 @@ export class PagingApiScopeListInput implements IPagingApiScopeListInput { } export interface IPagingApiScopeListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } @@ -12628,8 +12745,11 @@ export interface IPagingApiScopeListOutputPagedResultDto { } export class PagingAuditLogListInput implements IPagingAuditLogListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; sorting!: string | undefined; startTime!: moment.Moment | undefined; @@ -12702,8 +12822,11 @@ export class PagingAuditLogListInput implements IPagingAuditLogListInput { } export interface IPagingAuditLogListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; sorting: string | undefined; startTime: moment.Moment | undefined; @@ -12720,8 +12843,11 @@ export interface IPagingAuditLogListInput { } export class PagingClientListInput implements IPagingClientListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -12761,8 +12887,11 @@ export class PagingClientListInput implements IPagingClientListInput { } export interface IPagingClientListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } @@ -13116,8 +13245,11 @@ export interface IPagingClientListOutputPagedResultDto { } export class PagingDataDictionaryDetailInput implements IPagingDataDictionaryDetailInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; dataDictionaryId!: string; filter!: string | undefined; @@ -13160,8 +13292,11 @@ export class PagingDataDictionaryDetailInput implements IPagingDataDictionaryDet } export interface IPagingDataDictionaryDetailInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; dataDictionaryId: string; filter: string | undefined; @@ -13288,8 +13423,11 @@ export interface IPagingDataDictionaryDetailOutputPagedResultDto { } export class PagingDataDictionaryInput implements IPagingDataDictionaryInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -13329,8 +13467,11 @@ export class PagingDataDictionaryInput implements IPagingDataDictionaryInput { } export interface IPagingDataDictionaryInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } @@ -13438,8 +13579,11 @@ export interface IPagingDataDictionaryOutputPagedResultDto { } export class PagingElasticSearchLogInput implements IPagingElasticSearchLogInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; startCreationTime!: moment.Moment | undefined; @@ -13485,8 +13629,11 @@ export class PagingElasticSearchLogInput implements IPagingElasticSearchLogInput } export interface IPagingElasticSearchLogInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; startCreationTime: moment.Moment | undefined; @@ -13494,8 +13641,11 @@ export interface IPagingElasticSearchLogInput { } export class PagingElasticSearchLogOutput implements IPagingElasticSearchLogOutput { + /** 日志级别 */ level!: string | undefined; + /** 日志内容 */ message!: string | undefined; + /** 创建时间 */ creationTime!: moment.Moment; constructor(data?: IPagingElasticSearchLogOutput) { @@ -13532,8 +13682,11 @@ export class PagingElasticSearchLogOutput implements IPagingElasticSearchLogOutp } export interface IPagingElasticSearchLogOutput { + /** 日志级别 */ level: string | undefined; + /** 日志内容 */ message: string | undefined; + /** 创建时间 */ creationTime: moment.Moment; } @@ -13586,8 +13739,11 @@ export interface IPagingElasticSearchLogOutputCustomePagedResultDto { } export class PagingIdentityResourceListInput implements IPagingIdentityResourceListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -13627,8 +13783,11 @@ export class PagingIdentityResourceListInput implements IPagingIdentityResourceL } export interface IPagingIdentityResourceListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } @@ -13746,8 +13905,11 @@ export interface IPagingIdentityResourceListOutputPagedResultDto { } export class PagingNotificationListInput implements IPagingNotificationListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; constructor(data?: IPagingNotificationListInput) { @@ -13784,8 +13946,11 @@ export class PagingNotificationListInput implements IPagingNotificationListInput } export interface IPagingNotificationListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; } @@ -13890,8 +14055,11 @@ export interface IPagingNotificationListOutputPagedResultDto { } export class PagingRoleListInput implements IPagingRoleListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -13931,15 +14099,21 @@ export class PagingRoleListInput implements IPagingRoleListInput { } export interface IPagingRoleListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } export class PagingTenantInput implements IPagingTenantInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; filter!: string | undefined; @@ -13979,15 +14153,21 @@ export class PagingTenantInput implements IPagingTenantInput { } export interface IPagingTenantInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; filter: string | undefined; } export class PagingUserListInput implements IPagingUserListInput { + /** 当前页面.默认从1开始 */ pageIndex!: number; + /** 每页多少条.每页显示多少记录 */ pageSize!: number; + /** 跳过多少条 */ readonly skipCount!: number; /** 关键字 */ filter!: string | undefined; @@ -14028,8 +14208,11 @@ export class PagingUserListInput implements IPagingUserListInput { } export interface IPagingUserListInput { + /** 当前页面.默认从1开始 */ pageIndex: number; + /** 每页多少条.每页显示多少记录 */ pageSize: number; + /** 跳过多少条 */ skipCount: number; /** 关键字 */ filter: string | undefined; @@ -15043,13 +15226,19 @@ export interface ISetReadInput { receiveId: string; } -export class SettingGroup implements ISettingGroup { - groupName!: string | undefined; - groupDisplayName!: string | undefined; - settingInfos!: SettingInfo[] | undefined; - permission!: string | undefined; +export class SettingItemOutput implements ISettingItemOutput { + /** 名称 */ + name!: string | undefined; + /** 显示名称 */ + displayName!: string | undefined; + /** 描述 */ + description!: string | undefined; + /** 值 */ + value!: string | undefined; + /** 前端控件类型 */ + type!: string | undefined; - constructor(data?: ISettingGroup) { + constructor(data?: ISettingItemOutput) { if (data) { for (var property in data) { if (data.hasOwnProperty(property)) @@ -15060,54 +15249,53 @@ export class SettingGroup implements ISettingGroup { init(_data?: any) { if (_data) { - this.groupName = _data["groupName"]; - this.groupDisplayName = _data["groupDisplayName"]; - if (Array.isArray(_data["settingInfos"])) { - this.settingInfos = [] as any; - for (let item of _data["settingInfos"]) - this.settingInfos!.push(SettingInfo.fromJS(item)); - } - this.permission = _data["permission"]; + this.name = _data["name"]; + this.displayName = _data["displayName"]; + this.description = _data["description"]; + this.value = _data["value"]; + this.type = _data["type"]; } } - static fromJS(data: any): SettingGroup { + static fromJS(data: any): SettingItemOutput { data = typeof data === 'object' ? data : {}; - let result = new SettingGroup(); + let result = new SettingItemOutput(); result.init(data); return result; } toJSON(data?: any) { data = typeof data === 'object' ? data : {}; - data["groupName"] = this.groupName; - data["groupDisplayName"] = this.groupDisplayName; - if (Array.isArray(this.settingInfos)) { - data["settingInfos"] = []; - for (let item of this.settingInfos) - data["settingInfos"].push(item.toJSON()); - } - data["permission"] = this.permission; + data["name"] = this.name; + data["displayName"] = this.displayName; + data["description"] = this.description; + data["value"] = this.value; + data["type"] = this.type; return data; } } -export interface ISettingGroup { - groupName: string | undefined; - groupDisplayName: string | undefined; - settingInfos: SettingInfo[] | undefined; - permission: string | undefined; +export interface ISettingItemOutput { + /** 名称 */ + name: string | undefined; + /** 显示名称 */ + displayName: string | undefined; + /** 描述 */ + description: string | undefined; + /** 值 */ + value: string | undefined; + /** 前端控件类型 */ + type: string | undefined; } -export class SettingInfo implements ISettingInfo { - name!: string | undefined; - displayName!: string | undefined; - description!: string | undefined; - value!: string | undefined; - properties!: { [key: string]: any; } | undefined; - permission!: string | undefined; +export class SettingOutput implements ISettingOutput { + /** 分组 */ + group!: string | undefined; + /** 分组显示名称 */ + groupDisplayName!: string | undefined; + settingItemOutput!: SettingItemOutput[] | undefined; - constructor(data?: ISettingInfo) { + constructor(data?: ISettingOutput) { if (data) { for (var property in data) { if (data.hasOwnProperty(property)) @@ -15118,53 +15306,42 @@ export class SettingInfo implements ISettingInfo { init(_data?: any) { if (_data) { - this.name = _data["name"]; - this.displayName = _data["displayName"]; - this.description = _data["description"]; - this.value = _data["value"]; - if (_data["properties"]) { - this.properties = {} as any; - for (let key in _data["properties"]) { - if (_data["properties"].hasOwnProperty(key)) - (this.properties)![key] = _data["properties"][key]; - } + this.group = _data["group"]; + this.groupDisplayName = _data["groupDisplayName"]; + if (Array.isArray(_data["settingItemOutput"])) { + this.settingItemOutput = [] as any; + for (let item of _data["settingItemOutput"]) + this.settingItemOutput!.push(SettingItemOutput.fromJS(item)); } - this.permission = _data["permission"]; } } - static fromJS(data: any): SettingInfo { + static fromJS(data: any): SettingOutput { data = typeof data === 'object' ? data : {}; - let result = new SettingInfo(); + let result = new SettingOutput(); result.init(data); return result; } toJSON(data?: any) { data = typeof data === 'object' ? data : {}; - data["name"] = this.name; - data["displayName"] = this.displayName; - data["description"] = this.description; - data["value"] = this.value; - if (this.properties) { - data["properties"] = {}; - for (let key in this.properties) { - if (this.properties.hasOwnProperty(key)) - (data["properties"])[key] = this.properties[key]; - } + data["group"] = this.group; + data["groupDisplayName"] = this.groupDisplayName; + if (Array.isArray(this.settingItemOutput)) { + data["settingItemOutput"] = []; + for (let item of this.settingItemOutput) + data["settingItemOutput"].push(item.toJSON()); } - data["permission"] = this.permission; return data; } } -export interface ISettingInfo { - name: string | undefined; - displayName: string | undefined; - description: string | undefined; - value: string | undefined; - properties: { [key: string]: any; } | undefined; - permission: string | undefined; +export interface ISettingOutput { + /** 分组 */ + group: string | undefined; + /** 分组显示名称 */ + groupDisplayName: string | undefined; + settingItemOutput: SettingItemOutput[] | undefined; } export class StringStringFromSelector implements IStringStringFromSelector { diff --git a/vben271/src/views/admin/settings/Setting.vue b/vben271/src/views/admin/settings/Setting.vue index 0d2c730e..1d7fad46 100644 --- a/vben271/src/views/admin/settings/Setting.vue +++ b/vben271/src/views/admin/settings/Setting.vue @@ -2,47 +2,28 @@
-