diff --git a/aspnet-core/Dockerfile b/aspnet-core/Dockerfile index fc640db1..be8b08dc 100644 --- a/aspnet-core/Dockerfile +++ b/aspnet-core/Dockerfile @@ -1,11 +1,11 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 ENV TZ=Asia/Shanghai ENV ASPNETCORE_ENVIRONMENT=Production -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY . . WORKDIR "/src/services/host/Lion.AbpPro.HttpApi.Host" diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplacePackageReferenceExtensions.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplacePackageReferenceExtensions.cs index c92708dc..c4cfdfb6 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplacePackageReferenceExtensions.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplacePackageReferenceExtensions.cs @@ -13,6 +13,8 @@ public static class ReplacePackageReferenceExtensions "") .Replace("", "") + .Replace("", + "") ; } diff --git a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile index b76a9257..aa181ffa 100644 --- a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile +++ b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 # 创建目录 RUN mkdir /app diff --git a/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx b/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx index 4608108e..a4d11b2e 100644 --- a/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx +++ b/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx @@ -17,7 +17,6 @@ - diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile index 09e62a2c..aff3f80e 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 # 创建目录 RUN mkdir /app diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs index 5ae0b980..42eaa07b 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs @@ -7,11 +7,6 @@ global using System.Linq; global using System.Text; global using System.Text.RegularExpressions; global using System.Threading.Tasks; -global using Hangfire; -global using Hangfire.Common; -global using Hangfire.Dashboard; -global using Hangfire.States; -global using Hangfire.Storage; global using Lion.AbpPro; global using Lion.AbpPro.AspNetCore; global using MyCompanyName.MyProjectName.EntityFrameworkCore; @@ -50,7 +45,6 @@ global using Volo.Abp.AspNetCore.Serilog; global using Volo.Abp.Auditing; global using Volo.Abp.Authorization; global using Volo.Abp.BackgroundJobs; -global using Volo.Abp.BackgroundJobs.Hangfire; global using Volo.Abp.Caching; global using Volo.Abp.Caching.StackExchangeRedis; global using Volo.Abp.DependencyInjection; diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs index 129f42ce..c8ad0d16 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs @@ -1,5 +1,4 @@ -using Hangfire.Redis.StackExchange; -using Medallion.Threading; +using Medallion.Threading; using Medallion.Threading.Redis; #pragma warning disable CS0618 // Type or member is obsolete @@ -57,30 +56,4 @@ public static class ServiceCollectionExtensions options => { options.Configuration.ChannelPrefix = "Lion.AbpPro"; }); return service; } - - - /// - /// 注册hangfire - /// - public static IServiceCollection AddAbpProHangfire(this IServiceCollection service) - { - var redisStorageOptions = new RedisStorageOptions() - { - Db = service.GetConfiguration().GetValue("Hangfire:Redis:DB") - }; - - service.Configure(options => { options.IsJobExecutionEnabled = true; }); - - service.AddHangfire(config => - { - config.UseRedisStorage(service.GetConfiguration().GetValue("Hangfire:Redis:Host"), redisStorageOptions) - .WithJobExpirationTimeout(TimeSpan.FromDays(7)); - var delaysInSeconds = new[] { 10, 60, 60 * 3 }; // 重试时间间隔 - const int attempts = 3; // 重试次数 - config.UseFilter(new AutomaticRetryAttribute() { Attempts = 3, DelaysInSeconds = delaysInSeconds }); - //config.UseFilter(new AutoDeleteAfterSuccessAttribute(TimeSpan.FromDays(7))); - //config.UseFilter(new JobRetryLastFilter(attempts)); - }); - return service; - } } \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 3ba9cac7..39888330 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -26,17 +26,15 @@ - - + - - - + + diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile index 471faeec..823263e8 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 # 创建目录 RUN mkdir /app diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj index ac8d57fe..f1c4a31a 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs deleted file mode 100644 index 47d2d0a6..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MyCompanyName.MyProjectName.Jobs -{ - public interface IRecurringJob : ITransientDependency - { - /// - /// 执行任务 - /// - /// - Task ExecuteAsync(); - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs index c98bb35a..8b76e5f7 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs @@ -12,7 +12,5 @@ global using MyCompanyName.MyProjectName.Permissions; global using Microsoft.AspNetCore.Authorization; global using Microsoft.Extensions.Configuration; global using Volo.Abp.Application.Services; -global using Volo.Abp.AutoMapper; -global using Volo.Abp.BackgroundJobs.Hangfire; global using Volo.Abp.DependencyInjection; global using Volo.Abp.Modularity; \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index 93ec532d..3e568059 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -9,7 +9,6 @@ - @@ -19,8 +18,4 @@ - - - - diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs deleted file mode 100644 index 8908c5dc..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MyCompanyName.MyProjectName.Users.Dto -{ - public class UserOutput - { - public Guid Id { get; set; } - } -} diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs index 1bf0ac44..8669ab0b 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs @@ -12,11 +12,9 @@ global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.LanguageManagement; global using Lion.AbpPro.NotificationManagement; global using MyCompanyName.MyProjectName.MultiTenancy; -global using MyCompanyName.MyProjectName.Users.Dto; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Logging.Abstractions; -global using Volo.Abp.AutoMapper; global using Volo.Abp.Data; global using Volo.Abp.DependencyInjection; global using Volo.Abp.Domain.Services; diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index a644cadc..9a73402c 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -9,10 +9,6 @@ namespace MyCompanyName.MyProjectName )] public class MyProjectNameDomainModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); - Configure(options => { options.AddMaps(); }); - } + } } \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs index 711b65be..e540fcde 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs @@ -17,7 +17,6 @@ global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.NotificationManagement.EntityFrameworkCore; global using Lion.AbpPro.NotificationManagement.Notifications.Aggregates; global using MyCompanyName.MyProjectName.Data; -global using MyCompanyName.MyProjectName.Users; global using Microsoft.EntityFrameworkCore; global using Microsoft.EntityFrameworkCore.Design; global using Microsoft.EntityFrameworkCore.Storage;