From 8c6e292c508312eca0aef4c203e5857c4fc3094c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 07 九月 2024 09:18:39 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Startup.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Startup.cs b/Wms/Wms/Startup.cs
index e2e8614..8b90be5 100644
--- a/Wms/Wms/Startup.cs
+++ b/Wms/Wms/Startup.cs
@@ -17,7 +17,6 @@
using Serilog;
using Autofac.Core;
using Utility;
-using Utility.Extension;
using Microsoft.Extensions.Options;
using Microsoft.AspNetCore.Http;
using SqlSugar;
@@ -43,10 +42,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(options => {
+ services.AddControllers(options =>
+ {
options.Filters.Add<RequestAuditLogFilter>();
+ options.Filters.Add<CustomerExceptionFilter>();
})
.AddJsonOptions(options =>
{
@@ -91,7 +92,7 @@
.SetIsOriginAllowed(_ => true)
.AllowAnyHeader()
.AllowCredentials();
-
+
});
});
#endregion
@@ -110,11 +111,14 @@
#endregion
//读取配置文件配置的接口交互的相关配置
- services.Configure<ApiUrlConfig>(Configuration.GetSection("ApiUrlConfig"));
+ services.Configure<ApiUrlConfig>(Configuration.GetSection("ApiUrlConfig"));
//数据库配置
BaseDbConfig.ConnectionString = Configuration.GetSection("AppSettings:ConnectionString").Value;
//验签配置文件
- SignConfig.AppKey = Configuration.GetSection("SignConfig:AppKey").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);
@@ -132,6 +136,9 @@
services.AddHostedService<HostedService>();
services.AddSingleton<SchedulerCenter>();
+
+ services.AddTransient<UserManager>();
+ services.AddTransient<IHttpContextAccessor, HttpContextAccessor>();
}
public void ConfigureContainer(ContainerBuilder builder)
{
@@ -157,14 +164,13 @@
}
//全局返回规范
//app.UseApiResponse();//弃用 改用Filter [ServiceFilter(typeof(ApiResponseActionFilter))]
- app.UseExceptionMiddleware();
//使用Serilog记录请求日志
app.UseSerilogRequestLogging();
//app.UseHttpsRedirection();
app.UseRouting();
-
+
app.UseAuthentication();
app.UseAuthorization();
app.UseCors("MyCors");//跨域
--
Gitblit v1.8.0