From c9a6f8b99b6c651e9c172487b34f9cbda142bb80 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 14 Oct 2024 11:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Progranm.cs | 97 +++++-------------- .../_ServiceExtensions/EasyCachingSetup.cs | 24 ----- .../StaticFileAuthorizationSetup.cs | 18 ---- .../Consumer/NeedVerify/TestConsumer.cs | 2 +- 4 files changed, 27 insertions(+), 114 deletions(-) delete mode 100644 IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs delete mode 100644 IRaCIS.Core.API/_ServiceExtensions/StaticFileAuthorizationSetup.cs diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index c4618643d..03f60f0c3 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -45,24 +45,6 @@ var builder = WebApplication.CreateBuilder(new WebApplicationOptions EnvironmentName = enviromentName }); -#region 兼容windows 服务命令行的方式 - -//foreach (var arg in args) -//{ -// Console.WriteLine(arg); -//} - -int urlsIndex = Array.FindIndex(args, arg => arg != null && arg.StartsWith("--urls")); - -if (urlsIndex > -1) -{ - var url = args[urlsIndex].Substring("--urls=".Length); - Console.WriteLine(url); - builder.WebHost.UseUrls(url); -} - -#endregion - #region 主机配置 @@ -91,6 +73,10 @@ var _configuration = builder.Configuration; //手动注册服务 builder.Services.ConfigureServices(_configuration); +//异常处理 +//builder.Services.AddExceptionHandler(); +//builder.Services.AddProblemDetails(); + //健康检查 builder.Services.AddHealthChecks(); //本地化 @@ -141,12 +127,6 @@ builder.Services.AddDicomSetup(); // 实时应用 builder.Services.AddSignalR(); -//异常处理 -//builder.Services.AddExceptionHandler(); -//builder.Services.AddProblemDetails(); - - - #endregion var app = builder.Build(); @@ -156,8 +136,6 @@ var env = app.Environment; app.UseMiddleware(); -// Configure the HTTP request pipeline. - #region 异常处理 全局业务异常已统一处理了，非业务错误会来到这里 400 -500状态码 @@ -198,38 +176,10 @@ app.UseStatusCodePages(async context => // Log.Logger.Error(errorInfo); - //} - // }); //}); - - -#endregion - -app.UseIRacisHostStaticFileStore(env); - -//本地化 -app.UseLocalization(); - -app.UseForwardedHeaders(); - -//响应压缩 -app.UseResponseCompression(); - - -//不需要 token 访问的静态文件 wwwroot css, JavaScript, and images don't require authentication. -app.UseStaticFiles(); - - - -//LogDashboard -app.UseLogDashboard("/LogDashboard"); - -//hangfire -app.UseHangfireConfig(env); - #region 暂时废弃 //app.UseMiddleware(); @@ -243,44 +193,53 @@ app.UseHangfireConfig(env); //{ // //app.UseHsts(); //} + +//app.UseIRacisHostStaticFileStore(env); #endregion +#endregion +app.UseIRacisHostStaticFileStore(env); +//本地化 +app.UseLocalization(); +app.UseForwardedHeaders(); +//响应压缩 +app.UseResponseCompression(); + +//不需要 token 访问的静态文件 wwwroot css, JavaScript, and images don't require authentication. +app.UseStaticFiles(); + +//LogDashboard +app.UseLogDashboard("/LogDashboard"); + +//hangfire +app.UseHangfireConfig(env); + +// Swagger SwaggerSetup.Configure(app, env); - -////serilog 记录请求的用户信息 +//serilog 记录请求的用户信息 app.UseSerilogConfig(env); app.UseRouting(); - app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()); - -//app.UseIRacisHostStaticFileStore(env); - - app.UseAuthentication(); app.UseAuthorization(); - app.MapControllers(); app.MapHub("/UploadHub"); app.MapHealthChecks("/health"); - // Serilog SerilogExtension.AddSerilogSetup(enviromentName, app.Services); - var hangfireJobService = app.Services.GetRequiredService(); await hangfireJobService.InitHangfireJobTaskAsync(); - - #endregion try @@ -302,9 +261,6 @@ try Log.Logger.Warning($"当前部署平台环境：OSX or FreeBSD"); } - #endregion - - Log.Logger.Warning($"ContentRootPath：{env.ContentRootPath}"); @@ -315,10 +271,9 @@ try //Log.Logger.Warning($"ContentRootPath——GetParent：{Directory.GetParent(env.ContentRootPath).Parent.FullName}"); //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}"); - + #endregion app.Run(); - } catch (Exception e) { diff --git a/IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs deleted file mode 100644 index 875ff9268..000000000 --- a/IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace IRaCIS.Core.API -{ - public static class EasyCachingSetup - { - public static void AddEasyCachingSetup(this IServiceCollection services, IConfiguration configuration) - { - //services.AddEasyCaching(options => - //{ - // options.UseInMemory(); - - // //options.UseRedis(configuration, EasyCachingConstValue.DefaultRedisName).WithMessagePack(EasyCachingConstValue.DefaultRedisName); - - - //}); - - ////services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultRedisName); - - //services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName); - } - } -} diff --git a/IRaCIS.Core.API/_ServiceExtensions/StaticFileAuthorizationSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/StaticFileAuthorizationSetup.cs deleted file mode 100644 index 8692cdd6a..000000000 --- a/IRaCIS.Core.API/_ServiceExtensions/StaticFileAuthorizationSetup.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.Extensions.DependencyInjection; - -namespace IRaCIS.Core.API -{ - public static class StaticFileAuthorizationSetup - { - public static void AddStaticFileAuthorizationSetup(this IServiceCollection services) - { - services.AddAuthorization(options => - { - options.FallbackPolicy = new AuthorizationPolicyBuilder() - .RequireAuthenticatedUser() - .Build(); - }); - } - } -} diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/NeedVerify/TestConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/NeedVerify/TestConsumer.cs index c54ad7e31..07d313afa 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/NeedVerify/TestConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/NeedVerify/TestConsumer.cs @@ -1,4 +1,5 @@ using IRaCIS.Core.Domain; +using IRaCIS.Core.Domain.Share; using MassTransit; using MassTransit.Mediator; using Medallion.Threading; @@ -10,7 +11,6 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; -using static IRaCIS.Core.Application.Service.TestService; namespace IRaCIS.Core.Application.MassTransit.Consumer;