From 9445c4660740dc8a544b5c2440fe365a218bab12 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 26 十月 2023 17:26:39 +0800
Subject: [PATCH] 1.修改仓位信息列表接口 2.新增仓库库位基础资料接口 3.修改模具出入库提交接口(增加库位) 、模具清单增加库位 4.新增模具上下机记录报表、模具借还记录报表
---
VueWebCoreApi/Startup.cs | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index 9113269..748a1a7 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -10,6 +10,7 @@
using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -19,6 +20,7 @@
using Quartz;
using Quartz.Impl;
using Quartz.Spi;
+using Swashbuckle.AspNetCore.SwaggerUI;
using System;
using System.Collections.Generic;
using System.IO;
@@ -59,19 +61,20 @@
{
typeof(OpenApiGroup).GetEnumNames().ToList().ForEach(version =>
{
-
c.SwaggerDoc(version, new OpenApiInfo()
{
Title = $"新凯迪MesApi文档:{version}",
Version = version,
- Description = $"Panda.Sewerage : {version} "
+ Description = $"Panda.Sewerage : {version} ",
});
});
+
string basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);
string xmlPath = Path.Combine(basePath, "VueWebCoreApi.xml");
c.IncludeXmlComments(xmlPath, true);
});
#endregion
+
// 设置配置
AppSetting.SetAppSetting(Configuration.GetSection("ConnectionStrings"));
//log4net配置
@@ -99,7 +102,7 @@
});
//设置SignalR
services.AddSignalR();
-
+
//设置session,并设置超时时间
services.AddSession(o =>
@@ -110,7 +113,6 @@
services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie();
}
-
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApplicationLifetime applicationLeftTime, ILoggerFactory loggerFactory)
{
@@ -122,6 +124,7 @@
{
DataOperator.SetConnectionString1(Convert.ToString(AppSetting.GetAppSetting("DBServer")));
});
+
#region Swagger分组第二种
app.UseSwagger();
app.UseSwaggerUI(c =>
@@ -133,6 +136,7 @@
{
c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{version}");
});
+
});
#endregion
app.UseHttpsRedirection();
@@ -140,6 +144,17 @@
app.UseRouting();
app.UseAuthorization();
+ //添加静态文件中间件
+ app.UseDefaultFiles();
+ //添加授权文件
+ app.UseStaticFiles(new StaticFileOptions()
+ {
+ ContentTypeProvider = new FileExtensionContentTypeProvider()
+ {
+ Mappings = { [".xls"] = "application/vnd.ms-excel" }
+ }
+ });
+ app.UseStaticFiles();
//跨域
app.UseCors("cors");
//用户session服务
@@ -150,12 +165,27 @@
app.UseStaticHostEnviroment();
//Quartz
app.UseQuartz(env).UseStaticHttpContext();
+ //配置Excel下载
+ //app.UseStaticFiles(
+ // new StaticFileOptions
+ // {
+ // //设置不限制content-type
+ // ServeUnknownFileTypes = true
+ // });
+ //app.UseStaticFiles(new StaticFileOptions()
+ //{
+ // ContentTypeProvider = new FileExtensionContentTypeProvider()
+ // {
+ // Mappings = { [".exe"] = "application/octect-stream" }
+ // }
+ //});
+
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
endpoints.MapHub<ChatHub>("/ChatHub", options =>
{
- options.Transports =
+ options.Transports =
HttpTransportType.WebSockets |
HttpTransportType.LongPolling;
});
--
Gitblit v1.9.3