feat: 调整模板

2 months ago · 7e4e15d5ca
17 changed files with 13 additions and 79 deletions
--- 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"
--- 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
                    "<PackageReference Include=\"Lion.AbpPro.Shared.Hosting.Microservices\"/>")
                .Replace("<ProjectReference Include=\"..\\..\\..\\..\\..\\aspnet-core\\shared\\Lion.AbpPro.Shared.Hosting.Gateways\\Lion.AbpPro.Shared.Hosting.Gateways.csproj\"/>",
                    "<PackageReference Include=\"Lion.AbpPro.Shared.Hosting.Gateways\"/>")
+                .Replace("<ProjectReference Include=\"..\\..\\..\\..\\..\\aspnet-core\\frameworks\\src\\Lion.AbpPro.AspNetCore\\Lion.AbpPro.AspNetCore.csproj\"/>",
+                    "<PackageReference Include=\"Lion.AbpPro.AspNetCore\"/>")
            ;
    }

--- 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
--- a/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx
+++ b/templates/pro-nuget/service/MyCompanyName.MyProjectName.slnx
@ -17,7 +17,6 @@
    <Project Path="src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj" />
    <Project Path="src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj" />
    <Project Path="src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <Project Path="src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj" />
    <Project Path="src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
    <Project Path="src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj" />
  </Folder>
--- 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
--- 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;
--- 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;
    }
-
-
-    /// <summary>
-    /// 注册hangfire
-    /// </summary>
-    public static IServiceCollection AddAbpProHangfire(this IServiceCollection service)
-    {
-        var redisStorageOptions = new RedisStorageOptions()
-        {
-            Db = service.GetConfiguration().GetValue<int>("Hangfire:Redis:DB")
-        };
-
-        service.Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = true; });
-
-        service.AddHangfire(config =>
-        {
-            config.UseRedisStorage(service.GetConfiguration().GetValue<string>("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;
-    }
 }
--- 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 @@
        <PackageReference Include="DotNetCore.CAP.RabbitMQ"/>
        <PackageReference Include="DotNetCore.CAP.Dashboard"/>
        <PackageReference Include="DistributedLock.Redis"/>
-        <PackageReference Include="Hangfire.Redis.StackExchange"/>
-        <PackageReference Include="Lion.AbpPro.AspNetCore"/>
+        <ProjectReference Include="..\..\..\..\..\aspnet-core\frameworks\src\Lion.AbpPro.AspNetCore\Lion.AbpPro.AspNetCore.csproj"/>
    </ItemGroup>


-    
-
    <ItemGroup>
        <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj"/>
        <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj"/>
        <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj"/>
+
    </ItemGroup>


--- 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
--- 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 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Lion.AbpPro.AspNetCore"/>
+        <ProjectReference Include="..\..\..\..\..\aspnet-core\frameworks\src\Lion.AbpPro.AspNetCore\Lion.AbpPro.AspNetCore.csproj"/>
    </ItemGroup>
 </Project>
--- 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
@ -1,11 +0,0 @@
-namespace MyCompanyName.MyProjectName.Jobs
-{
-    public interface IRecurringJob : ITransientDependency
-    {
-        /// <summary>
-        /// 执行任务
-        /// </summary>
-        /// <returns></returns>
-        Task ExecuteAsync();
-    }
-}
--- 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;
--- 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 @@
    <ItemGroup>
        <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj"/>
        <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj"/>
-        <ProjectReference Include="..\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj"/>
    </ItemGroup>

    <ItemGroup>
@ -19,8 +18,4 @@
        <ProjectReference Include="..\..\..\..\..\aspnet-core\modules\LanguageManagement\src\Lion.AbpPro.LanguageManagement.Application\Lion.AbpPro.LanguageManagement.Application.csproj"/>
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="Volo.Abp.BackgroundJobs.HangFire"/>
-    </ItemGroup>
-
 </Project>
--- 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
@ -1,7 +0,0 @@
-namespace MyCompanyName.MyProjectName.Users.Dto
-{
-    public class UserOutput
-    {
-        public  Guid Id { get; set; }
-    }
-}
--- 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;
--- 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<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; });
-            Configure<AbpAutoMapperOptions>(options => { options.AddMaps<MyProjectNameDomainModule>(); });
-        }
+    
    }
 }
--- 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;