diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/UserProfilePictureProvider.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/UserProfilePictureProvider.cs
index 20bd32dc9..8758fa718 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/UserProfilePictureProvider.cs
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/UserProfilePictureProvider.cs
@@ -68,7 +68,7 @@ public class UserProfileUserPictureProvider : IUserPictureProvider
(await UserManager.UpdateAsync(user)).CheckErrors();
- var pictureName = $"{userId}/avatar/{pictureBlobId}";
+ var pictureName = $"users/{userId}/avatar/{pictureBlobId}";
await AccountBlobContainer.SaveAsync(pictureName, stream, true);
}
@@ -90,7 +90,7 @@ public class UserProfileUserPictureProvider : IUserPictureProvider
return Stream.Null;
}
- var pictureName = $"{user.Id:N}/avatar/{picture}";
+ var pictureName = $"users/{user.Id:N}/avatar/{picture}";
return await AccountBlobContainer.ExistsAsync(pictureName)
? await AccountBlobContainer.GetAsync(pictureName)
diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/LINGYUN.Abp.Account.Web.IdentityServer.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/LINGYUN.Abp.Account.Web.IdentityServer.csproj
index 0c0554570..4d7cb71ec 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/LINGYUN.Abp.Account.Web.IdentityServer.csproj
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/LINGYUN.Abp.Account.Web.IdentityServer.csproj
@@ -11,7 +11,9 @@
false
false
LINGYUN.Abp.Account.Web.IdentityServer
+ true
Library
+ true
diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/LINGYUN.Abp.Account.Web.OpenIddict.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/LINGYUN.Abp.Account.Web.OpenIddict.csproj
index ad062b9c9..f27fd23f2 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/LINGYUN.Abp.Account.Web.OpenIddict.csproj
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/LINGYUN.Abp.Account.Web.OpenIddict.csproj
@@ -10,8 +10,10 @@
false
false
false
+ true
LINGYUN.Abp.Account.Web.OpenIddict
Library
+ true
diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj
index ebeb4f3a4..61556a1ac 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj
@@ -12,8 +12,8 @@
false
true
LINGYUN.Abp.Account.Web
- true
Library
+ true
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN/Abp/OssManagement/Aliyun/AbpOssManagementAliyunModule.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN/Abp/OssManagement/Aliyun/AbpOssManagementAliyunModule.cs
index c2a97a282..e78424fba 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN/Abp/OssManagement/Aliyun/AbpOssManagementAliyunModule.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN/Abp/OssManagement/Aliyun/AbpOssManagementAliyunModule.cs
@@ -1,6 +1,4 @@
using LINGYUN.Abp.BlobStoring.Aliyun;
-using Microsoft.Extensions.DependencyInjection;
-using System;
using Volo.Abp.Modularity;
namespace LINGYUN.Abp.OssManagement.Aliyun;
@@ -10,14 +8,4 @@ namespace LINGYUN.Abp.OssManagement.Aliyun;
typeof(AbpOssManagementDomainModule))]
public class AbpOssManagementAliyunModule : AbpModule
{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddTransient();
-
- context.Services.AddTransient(provider =>
- provider
- .GetRequiredService()
- .Create()
- .As());
- }
}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/Microsoft/Extensions/DependencyInjection/AliyunOssContainerServiceCollectionExtensions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/Microsoft/Extensions/DependencyInjection/AliyunOssContainerServiceCollectionExtensions.cs
new file mode 100644
index 000000000..bed1323a6
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/Microsoft/Extensions/DependencyInjection/AliyunOssContainerServiceCollectionExtensions.cs
@@ -0,0 +1,21 @@
+using LINGYUN.Abp.OssManagement;
+using LINGYUN.Abp.OssManagement.Aliyun;
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class AliyunOssContainerServiceCollectionExtensions
+{
+ public static IServiceCollection AddMinioContainer(this IServiceCollection services)
+ {
+ services.AddTransient();
+
+ services.AddTransient(provider =>
+ provider
+ .GetRequiredService()
+ .Create()
+ .As());
+
+ return services;
+ }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/AbpOssManagementFileSystemModule.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/AbpOssManagementFileSystemModule.cs
index cc88113ac..9bd406970 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/AbpOssManagementFileSystemModule.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/AbpOssManagementFileSystemModule.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Volo.Abp.BlobStoring.FileSystem;
+using Volo.Abp.BlobStoring.FileSystem;
using Volo.Abp.Modularity;
namespace LINGYUN.Abp.OssManagement.FileSystem;
@@ -10,14 +8,4 @@ namespace LINGYUN.Abp.OssManagement.FileSystem;
typeof(AbpOssManagementDomainModule))]
public class AbpOssManagementFileSystemModule : AbpModule
{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddTransient();
-
- context.Services.AddTransient(provider =>
- provider
- .GetRequiredService()
- .Create()
- .As());
- }
}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/Microsoft/Extensions/DependencyInjection/FileSystemOssContainerServiceCollectionExtensions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/Microsoft/Extensions/DependencyInjection/FileSystemOssContainerServiceCollectionExtensions.cs
new file mode 100644
index 000000000..7d85d395f
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/Microsoft/Extensions/DependencyInjection/FileSystemOssContainerServiceCollectionExtensions.cs
@@ -0,0 +1,21 @@
+using LINGYUN.Abp.OssManagement;
+using LINGYUN.Abp.OssManagement.FileSystem;
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class FileSystemOssContainerServiceCollectionExtensions
+{
+ public static IServiceCollection AddFileSystemContainer(this IServiceCollection services)
+ {
+ services.AddTransient();
+
+ services.AddTransient(provider =>
+ provider
+ .GetRequiredService()
+ .Create()
+ .As());
+
+ return services;
+ }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/AbpOssManagementMinioModule.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/AbpOssManagementMinioModule.cs
index 141764965..b7882b2f0 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/AbpOssManagementMinioModule.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/AbpOssManagementMinioModule.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Volo.Abp.BlobStoring.Minio;
+using Volo.Abp.BlobStoring.Minio;
using Volo.Abp.Modularity;
namespace LINGYUN.Abp.OssManagement.Minio;
@@ -10,14 +8,4 @@ namespace LINGYUN.Abp.OssManagement.Minio;
typeof(AbpOssManagementDomainModule))]
public class AbpOssManagementMinioModule : AbpModule
{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddTransient();
-
- context.Services.AddTransient(provider =>
- provider
- .GetRequiredService()
- .Create()
- .As());
- }
}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs
index 4a7d115bc..36abbd161 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs
@@ -3,8 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Minio;
-using Minio.ApiEndpoints;
-using Minio.DataModel;
using Minio.DataModel.Args;
using Minio.DataModel.ILM;
using Minio.Exceptions;
@@ -20,7 +18,6 @@ using Volo.Abp.BlobStoring;
using Volo.Abp.BlobStoring.Minio;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Timing;
-using static System.Runtime.InteropServices.JavaScript.JSType;
namespace LINGYUN.Abp.OssManagement.Minio;
@@ -139,7 +136,7 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
{
var lifecycleRule = new LifecycleRule
{
- Status = "Enabled",
+ Status = LifecycleRule.LifecycleRuleStatusEnabled,
ID = putResponse.Etag,
Expiration = new Expiration(Clock.Now.Add(request.ExpirationTime.Value))
};
@@ -236,7 +233,7 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
{
var lifecycleRule = new LifecycleRule
{
- Status = "Enabled",
+ Status = LifecycleRule.LifecycleRuleStatusEnabled,
ID = item.Key,
Expiration = new Expiration(Clock.Normalize(request.ExpirationTime.DateTime))
};
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/Microsoft/Extensions/DependencyInjection/MinioOssContainerServiceCollectionExtensions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/Microsoft/Extensions/DependencyInjection/MinioOssContainerServiceCollectionExtensions.cs
new file mode 100644
index 000000000..053efa995
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/Microsoft/Extensions/DependencyInjection/MinioOssContainerServiceCollectionExtensions.cs
@@ -0,0 +1,21 @@
+using LINGYUN.Abp.OssManagement;
+using LINGYUN.Abp.OssManagement.Minio;
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class MinioOssContainerServiceCollectionExtensions
+{
+ public static IServiceCollection AddMinioContainer(this IServiceCollection services)
+ {
+ services.AddTransient();
+
+ services.AddTransient(provider =>
+ provider
+ .GetRequiredService()
+ .Create()
+ .As());
+
+ return services;
+ }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN/Abp/OssManagement/Tencent/AbpOssManagementTencentModule.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN/Abp/OssManagement/Tencent/AbpOssManagementTencentModule.cs
index 3579b70b7..b9159213c 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN/Abp/OssManagement/Tencent/AbpOssManagementTencentModule.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN/Abp/OssManagement/Tencent/AbpOssManagementTencentModule.cs
@@ -1,6 +1,4 @@
using LINGYUN.Abp.BlobStoring.Tencent;
-using Microsoft.Extensions.DependencyInjection;
-using System;
using Volo.Abp.Modularity;
namespace LINGYUN.Abp.OssManagement.Tencent;
@@ -10,14 +8,4 @@ namespace LINGYUN.Abp.OssManagement.Tencent;
typeof(AbpOssManagementDomainModule))]
public class AbpOssManagementTencentModule : AbpModule
{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddTransient();
-
- context.Services.AddTransient(provider =>
- provider
- .GetRequiredService()
- .Create()
- .As());
- }
}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/Microsoft/Extensions/DependencyInjection/TencentOssContainerServiceCollectionExtensions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/Microsoft/Extensions/DependencyInjection/TencentOssContainerServiceCollectionExtensions.cs
new file mode 100644
index 000000000..bb4fc05ae
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/Microsoft/Extensions/DependencyInjection/TencentOssContainerServiceCollectionExtensions.cs
@@ -0,0 +1,21 @@
+using LINGYUN.Abp.OssManagement;
+using LINGYUN.Abp.OssManagement.Tencent;
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class TencentOssContainerServiceCollectionExtensions
+{
+ public static IServiceCollection AddMinioContainer(this IServiceCollection services)
+ {
+ services.AddTransient();
+
+ services.AddTransient(provider =>
+ provider
+ .GetRequiredService()
+ .Create()
+ .As());
+
+ return services;
+ }
+}