From e497983f8a88bae6096c6544d55f00d0b72632ca Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sun, 26 Dec 2021 09:45:46 +0800 Subject: [PATCH] fix(configuration): use context.Services.GetConfiguration() --- .../vue/src/views/oss-management/objects/hooks/useObjects.ts | 4 ++-- .../Abp/OssManagement/FileSystem/FileSystemOssContainer.cs | 5 +++-- .../BackendAdminHttpApiHostModule.cs | 1 - .../PlatformManagementHttpApiHostModule.cs | 2 +- .../Properties/launchSettings.json | 2 +- .../RealtimeMessageHttpApiHostModule.cs | 2 +- .../IdentityServerHttpApiHostModule.cs | 2 +- .../LY.MicroService.identityServer/IdentityServerModule.cs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/vue/src/views/oss-management/objects/hooks/useObjects.ts b/apps/vue/src/views/oss-management/objects/hooks/useObjects.ts index a518caf93..856719eb3 100644 --- a/apps/vue/src/views/oss-management/objects/hooks/useObjects.ts +++ b/apps/vue/src/views/oss-management/objects/hooks/useObjects.ts @@ -28,7 +28,7 @@ export function useObjects() { marker: '', sorting: '', skipCount: 0, - maxResultCount: 100, + maxResultCount: 1000, }).then((res) => { containers.value = res.containers; }); @@ -58,7 +58,7 @@ export function useObjects() { encodingType: '', sorting: '', skipCount: 0, - maxResultCount: 100, + maxResultCount: 1000, }).then((res) => { const fs = res.objects .filter((item) => item.isFolder) diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/FileSystemOssContainer.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/FileSystemOssContainer.cs index 244b5f760..d55183058 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/FileSystemOssContainer.cs +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/FileSystemOssContainer.cs @@ -394,8 +394,9 @@ namespace LINGYUN.Abp.OssManagement.FileSystem } DirectoryHelper.CreateIfNotExists(filePath); // 目录也属于Oss对象,需要抽象的文件系统集合来存储 - var fileSystemNames = Directory.GetFileSystemEntries(filePath); - int maxFilesCount = fileSystemNames.Length; + var fileSystemNames = string.Equals(request.Delimiter, "/") + ? Directory.GetDirectories(filePath) + : Directory.GetFileSystemEntries(filePath); // 排序所有文件与目录 Array.Sort(fileSystemNames, delegate (string x, string y) diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs index 0f6d28ea6..c3b971d85 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs @@ -91,7 +91,6 @@ public partial class BackendAdminHttpApiHostModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAlwaysAllowAuthorization(); var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs index 2be103608..88cf8df07 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs @@ -89,7 +89,7 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = hostingEnvironment.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); ConfigureJsonSerializer(); diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Properties/launchSettings.json index 7a39b6fbf..158f1870f 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Properties/launchSettings.json +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Properties/launchSettings.json @@ -11,7 +11,7 @@ "LY.MicroService.PlatformManagement.HttpApi.Host": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "applicationUrl": "http://127.0.0.1:30025", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index e0b42684b..f6a8fc264 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -85,7 +85,7 @@ namespace LY.MicroService.RealtimeMessage public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = hostingEnvironment.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); ConfigureJsonSerializer(); diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs index 0dee706bc..ee2317c2a 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs @@ -69,7 +69,7 @@ public partial class IdentityServerHttpApiHostModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = hostingEnvironment.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); ConfigureJsonSerializer(); diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs index 5b38aa36a..f874a48f0 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs @@ -83,7 +83,7 @@ public partial class IdentityServerModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = hostingEnvironment.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); ConfigureDbContext(); ConfigureJsonSerializer();