From 6d5c3dee0d97798f70bf965e48c3a782b3df9e7d Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 10 七月 2024 10:48:25 +0800
Subject: [PATCH] Merge branch 'hwh' into Liudl
---
Wms/Wms/Startup.cs | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Startup.cs b/Wms/Wms/Startup.cs
index 93f1405..694afba 100644
--- a/Wms/Wms/Startup.cs
+++ b/Wms/Wms/Startup.cs
@@ -14,6 +14,14 @@
using Wms.Tools;
using WMS.Entity.Context;
using WMS.IBLL.IDataServer;
+using Serilog;
+using Autofac.Core;
+using Utility;
+using Utility.Extension;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Http;
+using SqlSugar;
+using Utility.Job;
namespace Wms
{
@@ -35,9 +43,12 @@
var url2 = Configuration.GetSection("ApiUrlConfig:AgvHost").Value + Configuration.GetSection("ApiUrlConfig:IssueComApiUrl").Value;
//调用定时任务
services.AddHostedService<DailyTaskService>(provider =>
- new DailyTaskService(url,url2));
+ new DailyTaskService(url, url2));
- services.AddControllers()
+ services.AddControllers(options =>
+ {
+ options.Filters.Add<RequestAuditLogFilter>();
+ })
.AddJsonOptions(options =>
{
//不使用驼峰样式的key
@@ -81,7 +92,7 @@
.SetIsOriginAllowed(_ => true)
.AllowAnyHeader()
.AllowCredentials();
-
+
});
});
#endregion
@@ -103,6 +114,12 @@
services.Configure<ApiUrlConfig>(Configuration.GetSection("ApiUrlConfig"));
//数据库配置
BaseDbConfig.ConnectionString = Configuration.GetSection("AppSettings:ConnectionString").Value;
+ //验签配置文件
+ SignConfig.ERPAppKey = Configuration.GetSection("SignConfig:ERPAppKey").Value;
+ SignConfig.MESAppKey = Configuration.GetSection("SignConfig:MESAppKey").Value;
+ SignConfig.LIMSAppKey = Configuration.GetSection("SignConfig:LIMSAppKey").Value;
+ SignConfig.FuMaAppKey = Configuration.GetSection("SignConfig:FuMaAppKey").Value;
+ SignConfig.Minutes = double.Parse(Configuration.GetSection("SignConfig:Minutes").Value);
#region AutoMapper注入
@@ -110,6 +127,18 @@
services.AddAutoMapper(typeof(AutoMapperProfile)); // automapper依赖
#endregion
+ //注册serilog
+ services.AddConfigSerilog();
+ services.AddScoped<ApiResponseActionFilter>();
+ services.AddScoped<UnitOfWorkAttribute>();
+ services.AddSingleton<ISqlSugarClient>(DataContext.Db); // 单例注册
+ services.AddTransient<IUnitOfWork, SqlSugarUnitOfWork>(); // 事务与工作单元注册
+
+ services.AddHostedService<HostedService>();
+ services.AddSingleton<SchedulerCenter>();
+
+ services.AddTransient<UserManager>();
+ services.AddTransient<IHttpContextAccessor, HttpContextAccessor>();
}
public void ConfigureContainer(ContainerBuilder builder)
{
@@ -133,15 +162,19 @@
c.RoutePrefix = string.Empty;
});
}
+ //全局返回规范
+ //app.UseApiResponse();//弃用 改用Filter [ServiceFilter(typeof(ApiResponseActionFilter))]
+ app.UseExceptionMiddleware();
+ //使用Serilog记录请求日志
+ app.UseSerilogRequestLogging();
//app.UseHttpsRedirection();
app.UseRouting();
-
+
app.UseAuthentication();
app.UseAuthorization();
app.UseCors("MyCors");//跨域
-
app.UseEndpoints(endpoints =>
{
--
Gitblit v1.8.0