update .net core 8.0

KingYSoft · Jun 12, 2024 · 2e7d5d8 · 2e7d5d8
1 parent 5baee30
commit 2e7d5d8
Show file tree

Hide file tree

Showing 21 changed files with 111 additions and 74 deletions.
diff --git a/...Name.FacadeProjectName.Application/FacadeCompanyName.FacadeProjectName.Application.csproj b/...Name.FacadeProjectName.Application/FacadeCompanyName.FacadeProjectName.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AssemblyName>FacadeCompanyName.FacadeProjectName.Application</AssemblyName>
     <PackageId>FacadeCompanyName.FacadeProjectName.Application</PackageId>

diff --git a/...ctName.DomainService.Share/FacadeCompanyName.FacadeProjectName.DomainService.Share.csproj b/...ctName.DomainService.Share/FacadeCompanyName.FacadeProjectName.DomainService.Share.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AssemblyName>FacadeCompanyName.FacadeProjectName.DomainService.Share</AssemblyName>
     <PackageId>FacadeCompanyName.FacadeProjectName.DomainService.Share</PackageId>
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Facade.Dapper.Oracle" Version="4.4.4" />
-    <PackageReference Include="Facade.NLogger" Version="4.4.4" />
+    <PackageReference Include="Facade.Dapper.Oracle" Version="5.1.1" />
+    <PackageReference Include="Facade.NLogger" Version="5.1.1" />
   </ItemGroup>
 
 

diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService.Share/FacadeConfiguration.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService.Share/FacadeConfiguration.cs
@@ -3,5 +3,8 @@
     public class FacadeConfiguration : IFacadeConfiguration
     {
         public string AppName { get; set; }
+        public string AppRootPath { get; set; }
+        public string AppEnvName { get; set; }
+        public bool IsDevelopment { get; set; }
     }
 }
diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService.Share/IFacadeConfiguration.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService.Share/IFacadeConfiguration.cs
@@ -2,7 +2,15 @@
 {
     public interface IFacadeConfiguration
     {
-        string AppName { get; }
-
+        string AppName { get; }
+        string AppRootPath { get; }
+        /// <summary>
+        /// app running env name.
+        /// </summary>
+        string AppEnvName { get; }
+        /// <summary>
+        /// is local development
+        /// </summary>
+        bool IsDevelopment { get; }
     }
 }
diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService/BackgroundWorkers/ClearLoggerWorker.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService/BackgroundWorkers/ClearLoggerWorker.cs
@@ -0,0 +1,39 @@
+using Abp.Dependency;
+using Abp.Threading.Timers;
+using Abp.Timing;
+using FacadeCompanyName.FacadeProjectName.DomainService.Share;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FacadeCompanyName.FacadeProjectName.DomainService.BackgroundWorkers
+{
+    public class ClearLoggerWorker: FacadeProjectNameBackgroundWorkerBase, ISingletonDependency
+    {
+        private readonly IFacadeConfiguration _facadeConfiguration;
+        public ClearLoggerWorker(AbpAsyncTimer timer, IFacadeConfiguration facadeConfiguration)
+            : base(timer)
+        {
+            timer.Period = 1000 * 60 * 60;
+            _facadeConfiguration = facadeConfiguration;
+        }
+        protected override async Task DoWorkAsync()
+        {
+            var rootPath = _facadeConfiguration.AppRootPath;
+            var logsPath = Path.Combine(rootPath, "App_Data", "Logs");
+            if (Directory.Exists(logsPath))
+            {
+                var lastMonth = Clock.Now.Subtract(TimeSpan.FromDays(90));
+                var path1 = Path.Combine(logsPath, lastMonth.ToString("yyyy"), lastMonth.ToString("MM"));
+                if (Directory.Exists(path1))
+                {
+                    Directory.Delete(path1, true);
+                }
+            }
+            await Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService/BackgroundWorkers/DemoWorker.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService/BackgroundWorkers/DemoWorker.cs
diff --git a/....FacadeProjectName.DomainService/FacadeCompanyName.FacadeProjectName.DomainService.csproj b/....FacadeProjectName.DomainService/FacadeCompanyName.FacadeProjectName.DomainService.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AssemblyName>FacadeCompanyName.FacadeProjectName.DomainService</AssemblyName>
     <PackageId>FacadeCompanyName.FacadeProjectName.DomainService</PackageId>
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Facade.AutoMapper" Version="4.4.4" />
-    <PackageReference Include="Facade.Quartz" Version="4.4.4" />
+    <PackageReference Include="Facade.AutoMapper" Version="5.1.1" />
+    <PackageReference Include="Facade.Quartz" Version="5.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...FacadeCompanyName.FacadeProjectName.DomainService/FacadeProjectNameDomainServiceModule.cs b/...FacadeCompanyName.FacadeProjectName.DomainService/FacadeProjectNameDomainServiceModule.cs
@@ -42,7 +42,7 @@ public override void PostInitialize()
             if (Configuration.BackgroundJobs.IsJobExecutionEnabled)
             {
                 //Worker DI.
-                //IocManager.Resolve<IBackgroundWorkerManager>().Add(IocManager.Resolve<DemoWorker>());
+                IocManager.Resolve<IBackgroundWorkerManager>().Add(IocManager.Resolve<ClearLoggerWorker>());
             }
         }
     }

diff --git a/...ectName.Application/Folders/AppFolders.cs → ...tName.DomainService/Folders/AppFolders.cs b/...ectName.Application/Folders/AppFolders.cs → ...tName.DomainService/Folders/AppFolders.cs
diff --git a/...ctName.Application/Folders/IAppFolders.cs → ...Name.DomainService/Folders/IAppFolders.cs b/...ctName.Application/Folders/IAppFolders.cs → ...Name.DomainService/Folders/IAppFolders.cs
@@ -3,16 +3,16 @@
     public interface IAppFolders
     {
         /// <summary>
-        /// 临时文件下载文件夹 /downloads/temps
+        /// 临时文件下载文件夹 /temps//downloads/
         /// </summary>
         string TempFileDownloadFolder { get; }
         /// <summary>
-        /// 临时文件上传文件夹 /uploads/temps
+        /// 临时文件上传文件夹 /temps/uploads/
         /// </summary>
         string TempFileUploadFolder { get; }
 
         /// <summary>
-        /// 文件上传后保存的路径 /uploads/
+        /// 文件上传后保存的路径 /files/uploads/
         /// </summary>
         string FileUploadFolder { get; }
     }

diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService/Schedules/DemoSchedule.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService/Schedules/DemoSchedule.cs
@@ -11,7 +11,7 @@ public DemoSchedule(ILogger logger)
         {
             _logger = logger;
         }
-        public override async Task Execute(IJobExecutionContext context)
+        public override async Task ExecuteJobAsync(IJobExecutionContext context)
         {
             _logger.Debug("DemoSchedule 执行了");
 

diff --git a/src/FacadeCompanyName.FacadeProjectName.DomainService/Schedules/ScheduleJobBase.cs b/src/FacadeCompanyName.FacadeProjectName.DomainService/Schedules/ScheduleJobBase.cs
@@ -1,12 +1,13 @@
 using Abp.Quartz;
+using Facade.Quartz;
 using FacadeCompanyName.FacadeProjectName.DomainService.Share;
 
 namespace FacadeCompanyName.FacadeProjectName.DomainService.Schedules
 {
     /// <summary>
     /// 任务调度作业
     /// </summary>
-    public abstract class ScheduleJobBase : JobBase
+    public abstract class ScheduleJobBase : FacadeScheduleJobBase
     {
         protected ScheduleJobBase() : base()
         {

diff --git a/...adeCompanyName.FacadeProjectName.Oracle/FacadeCompanyName.FacadeProjectName.Oracle.csproj b/...adeCompanyName.FacadeProjectName.Oracle/FacadeCompanyName.FacadeProjectName.Oracle.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> 
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

diff --git a/...ame.FacadeProjectName.Web.Core/AspNetCore/FacadeProjectNameServiceCollectionExtensions.cs b/...ame.FacadeProjectName.Web.Core/AspNetCore/FacadeProjectNameServiceCollectionExtensions.cs
@@ -24,11 +24,7 @@ public static class FacadeProjectNameServiceCollectionExtensions
         /// <param name="appConfiguration"></param>
         public static void ConfigureFacadeProjectNameService(this IServiceCollection services, IConfigurationRoot appConfiguration)
         {
-            services.AddControllers().AddNewtonsoftJson(options =>
-            {
-                options.OutputFormatterMemoryBufferThreshold = 1024 * 1024;
-                options.InputFormatterMemoryBufferThreshold = 1024 * 1024;
-            });
+            services.AddControllers();
 
             services.Configure<ApiBehaviorOptions>(options =>
             {

diff --git a/...ompanyName.FacadeProjectName.Web.Core/FacadeCompanyName.FacadeProjectName.Web.Core.csproj b/...ompanyName.FacadeProjectName.Web.Core/FacadeCompanyName.FacadeProjectName.Web.Core.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AssemblyName>FacadeCompanyName.FacadeProjectName.Web.Core</AssemblyName>
     <PackageId>FacadeCompanyName.FacadeProjectName.Web.Core</PackageId>
@@ -14,12 +14,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Facade.AspNetCore" Version="4.4.4" />
-    <PackageReference Include="Facade.AspNetCore.Zero" Version="4.4.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Facade.AspNetCore" Version="5.1.1" />
+    <PackageReference Include="Facade.AspNetCore.Zero" Version="5.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
 
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FacadeCompanyName.FacadeProjectName.Web.Core/FacadeProjectNameWebCoreModule.cs b/src/FacadeCompanyName.FacadeProjectName.Web.Core/FacadeProjectNameWebCoreModule.cs
@@ -44,6 +44,9 @@ public override void PreInitialize()
             IocManager.RegisterIfNot<IFacadeConfiguration, FacadeConfiguration>(Abp.Dependency.DependencyLifeStyle.Singleton);
             var facadeConfiguration = IocManager.Resolve<FacadeConfiguration>();
             _appConfiguration.GetSection("FacadeConfiguration").Bind(facadeConfiguration);
+            facadeConfiguration.AppRootPath = _env.ContentRootPath;
+            facadeConfiguration.IsDevelopment = _env.EnvironmentName.Equals("Development", StringComparison.OrdinalIgnoreCase);
+            facadeConfiguration.AppEnvName = _env.EnvironmentName;
 
             Configuration.Auditing.IsEnabled = false;
             Configuration.Auditing.IsEnabledForAnonymousUsers = true;
@@ -52,6 +55,7 @@ public override void PreInitialize()
             Configuration.DefaultNameOrConnectionString = _appConfiguration.GetConnectionString(FacadeProjectNameConsts.ConnectionStringName);
             Configuration.UnitOfWork.Timeout = new TimeSpan(0, 0, 30);
 
+            Configuration.Localization.Languages.Clear();
             Configuration.Localization.Languages.Add(new LanguageInfo("zh", "中文简体", isDefault: true));
             Configuration.Localization.Languages.Add(new LanguageInfo("en", "English"));
             ConfigureTokenAuth();

diff --git a/src/FacadeCompanyName.FacadeProjectName.Web.Core/Filters/DebounceActionFilter.cs b/src/FacadeCompanyName.FacadeProjectName.Web.Core/Filters/DebounceActionFilter.cs
@@ -70,16 +70,19 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
                 var requestParams = context.ActionArguments;
                 #region 获取参数及token
                 var sb = new StringBuilder();
+                sb.Append(methodInfo.DeclaringType.FullName);
+                sb.Append(methodInfo.Name);
                 sb.Append(request.Method);
+                sb.Append(request.Host.ToString());
+                sb.Append(request.Path.ToString());
+                sb.Append(request.Protocol);
 
+                //_logger.Debug($"Debounce-{methodInfo.DeclaringType.FullName}-{methodInfo.Name}：" + Environment.NewLine + sb.ToString());
+                sb.Append(request.QueryString.ToString());
                 foreach (var kvp in requestParams)
                 {
                     sb.Append(kvp.Key).Append(kvp.Value.ToJsonString());
                 }
-                sb.Append(request.Host.ToString());
-                sb.Append(request.Path.ToString());
-                sb.Append(request.QueryString.ToString());
-                sb.Append(request.Protocol);
                 if (request.Headers.TryGetValue("Authorization", out var v))
                 {
                     var token = v.ToString();
@@ -104,9 +107,8 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
                     {
                         var obj = new ObjectResult(JsonSerializationHelper.DeserializeWithType(cacheValue));
                         context.Result = obj;
-                        var d_type = context.ActionDescriptor.GetMethodInfo().DeclaringType;
-                        var methodName = context.ActionDescriptor.GetMethodInfo().Name;
-                        _logger.Debug($"Debounce-{d_type.FullName}-{methodName}：" + cacheKey);
+                        //context.Result = new ObjectResult(new JsonResponse(false, "数据正在处理中，请稍后再试..."));
+                        _logger.Debug($"Debounce-{methodInfo.DeclaringType.FullName}-{methodInfo.Name}：" + cacheKey);
                         return;
                     }
                 }

diff --git a/...ompanyName.FacadeProjectName.Web.Host/FacadeCompanyName.FacadeProjectName.Web.Host.csproj b/...ompanyName.FacadeProjectName.Web.Host/FacadeCompanyName.FacadeProjectName.Web.Host.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>FacadeCompanyName.FacadeProjectName.Web.Host</AssemblyName>

diff --git a/src/FacadeCompanyName.FacadeProjectName.Web.Host/Hubs/NewSignalRRealTimeNotifier.cs b/src/FacadeCompanyName.FacadeProjectName.Web.Host/Hubs/NewSignalRRealTimeNotifier.cs
@@ -41,7 +41,7 @@ public async Task SendNotificationsAsync(UserNotification[] userNotifications)
             {
                 try
                 {
-                    var onlineClients = _onlineClientManager.GetAllByUserId(userNotification);
+                    var onlineClients = await _onlineClientManager.GetAllByUserIdAsync(userNotification);
                     foreach (var onlineClient in onlineClients)
                     {
                         var signalRClient = _hubContext.Clients.Client(onlineClient.ConnectionId);

diff --git a/...acadeCompanyName.FacadeProjectName.Tests/FacadeCompanyName.FacadeProjectName.Tests.csproj b/...acadeCompanyName.FacadeProjectName.Tests/FacadeCompanyName.FacadeProjectName.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Facade.AspNetCore.TestBase" Version="4.4.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Facade.AspNetCore.TestBase" Version="5.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/FacadeCompanyName.FacadeProjectName.Tests/FacadeProjectNameTestModule.cs b/test/FacadeCompanyName.FacadeProjectName.Tests/FacadeProjectNameTestModule.cs
@@ -9,7 +9,10 @@
 using Castle.Facilities.Logging;
 using Facade.NLogger;
 using FacadeCompanyName.FacadeProjectName.Application;
-using FacadeCompanyName.FacadeProjectName.DomainService.Share;
+using FacadeCompanyName.FacadeProjectName.DomainService.Share;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.IO;
 
 namespace FacadeCompanyName.FacadeProjectName.Tests
 {
@@ -18,9 +21,9 @@ namespace FacadeCompanyName.FacadeProjectName.Tests
            typeof(FacadeProjectNameApplicationModule)
            )]
     public class FacadeProjectNameTestModule : AbpModule
-    {
+    { 
         public FacadeProjectNameTestModule()
-        {
+        { 
         }
 
         public override void PreInitialize()
@@ -31,15 +34,21 @@ public override void PreInitialize()
             });
             IocManager.Register<IFacadeConfiguration, FacadeConfiguration>(Abp.Dependency.DependencyLifeStyle.Singleton);
             var facadeConfiguration = IocManager.Resolve<FacadeConfiguration>();
-            facadeConfiguration.AppName = "FacadeProjectName_Tests";
-
-            // Disable static mapper usage since it breaks unit tests (see https://github.com/aspnetboilerplate/aspnetboilerplate/issues/2052)
-            // Configuration.Modules.AbpAutoMapper().UseStaticMapper = false;
-
+            facadeConfiguration.AppName = "FacadeProjectName_Tests";
+            facadeConfiguration.AppRootPath = Directory.GetCurrentDirectory();
+            facadeConfiguration.IsDevelopment = true;
+            facadeConfiguration.AppEnvName = "Development";
+
+            // Disable static mapper usage since it breaks unit tests (see https://github.com/aspnetboilerplate/aspnetboilerplate/issues/2052)
+            // Configuration.Modules.AbpAutoMapper().UseStaticMapper = false;
+
+            Configuration.Auditing.IsEnabled = false;
             Configuration.Auditing.IsEnabledForAnonymousUsers = true;
             Configuration.BackgroundJobs.IsJobExecutionEnabled = false;
             Configuration.MultiTenancy.IsEnabled = FacadeProjectNameConsts.MultiTenancyEnabled;
             Configuration.DefaultNameOrConnectionString = "Data Source=ORCL;Persist Security Info=True;User Id=ORCL;Password=ORCL;";
+
+            Configuration.Localization.Languages.Clear();
             Configuration.Localization.Languages.Add(new LanguageInfo("zh", "ÖÐÎÄ¼òÌå", isDefault: true));
             Configuration.Localization.Languages.Add(new LanguageInfo("en", "English"));