From cde56aae50adc11ff8db84e424d873843c566bfd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 23:40:41 +0800
Subject: [PATCH] 优化WCS移库逻辑

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs |   56 ++++++++++++++++++--------------------------------------
 1 files changed, 18 insertions(+), 38 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
index 90c4c55..d6c4c0f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
@@ -17,8 +17,8 @@
 using WIDESEA_WMSServer.Filter;
 using WIDESEA_Core.Authorization;
 using WIDESEA_Core.Core;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using Microsoft.OpenApi.Models;
+using Autofac.Core;
+using Microsoft.AspNetCore.Builder;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -34,35 +34,30 @@
 }); ;
 builder.ConfigureApplication();
 
+App.ExpDateTime = DateTime.Parse("2025-06-30 00:00:00");
+
 // 2、配置服务
 builder.Services.AddSingleton(new AppSettings(builder.Configuration));//注册
 builder.Services.AddAllOptionRegister();//读取配置文件
 builder.Services.AddMemoryCacheSetup();//缓存
 builder.Services.AddSqlsugarSetup();//SqlSugar 启动服务
-builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
+//builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
 builder.Services.AddDbSetup();//Db 启动服务
-
-//todo 初始化模型验证配置
-//builder.Services.UseMethodsModelParameters().UseMethodsGeneralParameters();
-//builder.Services.AddSingleton<IObjectModelValidator>(new NullObjectModelValidator());
 
 builder.Services.AddAutoMapperSetup();
 
 builder.Services.AddCorsSetup();
+
 builder.Services.AddMiniProfilerSetup();
 
 builder.Services.AddSwaggerSetup();
 
-builder.Services.AddJobSetup();//任务调度 启动服务
-
 builder.Services.AddHttpContextSetup();
 
-//todo
+
 builder.Services.AddMvc(options =>
 {
     options.Filters.Add(typeof(ApiAuthorizeFilter));
-    //options.Filters.Add(typeof(ActionExecuteFilter));
-    //  options.SuppressAsyncSuffixInActionNames = false;
 });
 
 builder.Services.AddAuthorizationSetup();
@@ -71,7 +66,6 @@
 
 builder.Services.AddScoped<UseServiceDIAttribute>();
 
-//builder.Services.AddDistributedMemoryCache();
 builder.Services.AddSession();
 
 builder.Services.AddHttpClient();
@@ -79,8 +73,6 @@
 builder.Services.AddControllers(o =>
 {
     o.Filters.Add(typeof(GlobalExceptionsFilter));//全局异常
-    //todo
-    //o.Conventions.Insert(0, new GlobalRoutePrefixFilter(new RouteAttribute(RoutePrefix.Name)));//路由
 })
 .AddNewtonsoftJson(options =>
 {
@@ -98,17 +90,6 @@
 builder.Services.Replace(ServiceDescriptor.Transient<IControllerActivator, ServiceBasedControllerActivator>());
 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-builder.Services.AddSwaggerGen(c =>
-{
-    // 启用XML注解
-    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    if (File.Exists(xmlPath))
-    {
-        c.IncludeXmlComments(xmlPath);
-    }
-});
-
 
 var app = builder.Build();
 
@@ -116,14 +97,16 @@
 app.UseMiniProfiler();//性能分析器
 app.ConfigureApplication();//配置文件
 app.UseApplicationSetup();//启动配置
+
+app.UseAllServicesMiddle(builder.Services);
+
 app.UseSession();
-if (app.Environment.IsDevelopment())
+if (app.Environment.IsProduction())
 {
     //todo
-    //app.UseSwaggerAuthorized();
-    app.UseSwaggerMiddle(() => Assembly.GetExecutingAssembly().GetManifestResourceStream("WIDESEA_WMSServer.index.html"));
+    app.UseSwaggerAuthorized();
 }//判断是否需要打开swagger
-
+app.UseSwaggerMiddle(() => Assembly.GetExecutingAssembly().GetManifestResourceStream("WIDESEA_WMSServer.index.html") ?? throw new Exception("WIDESEA_WMSServer.index.html文件"));
 app.UseIpLimitMiddle();
 app.UseApiLogMiddleware();
 //todo
@@ -131,23 +114,20 @@
 
 app.UseCors(AppSettings.app(new string[] { "Cors", "PolicyName" }));
 
-//DefaultFilesOptions defaultFilesOptions = new DefaultFilesOptions();
-//defaultFilesOptions.DefaultFileNames.Clear();
-//defaultFilesOptions.DefaultFileNames.Add("index.html");
-//app.UseDefaultFiles(defaultFilesOptions);
+DefaultFilesOptions defaultFilesOptions = new DefaultFilesOptions();
+defaultFilesOptions.DefaultFileNames.Clear();
+defaultFilesOptions.DefaultFileNames.Add("index.html");
+app.UseDefaultFiles(defaultFilesOptions);
+app.UseMiddleware<HttpRequestMiddleware>();
 app.UseStaticFiles();
 app.UseCookiePolicy();
 app.UseStatusCodePages();
 
 app.UseRouting();
 
-
 app.UseAuthentication();
 app.UseAuthorization();
-
-
 
 app.MapControllers();
 
 app.Run();
-

--
Gitblit v1.9.3