调整docker

This commit is contained in:
18942506660
2023-10-30 17:13:34 +08:00
parent 6d44541d44
commit 8985cae8d1
4 changed files with 11 additions and 43 deletions

View File

@@ -19,6 +19,10 @@ RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev
EXPOSE 80
EXPOSE 443
COPY ["src/WMS.Web.Api/wwwroot/Ops.Web.Api.xml", "/app/WMS.Web.Api.xml"]
COPY ["src/WMS.Web.Api/wwwroot/Ops.Web.Core.xml", "/app/WMS.Web.Core.xml"]
COPY ["src/WMS.Web.Api/wwwroot/Ops.Web.Domain.xml", "/app/WMS.Web.Domain.xml"]
FROM registry.cn-hangzhou.aliyuncs.com/yz-ops/base-module:aspnetsdk3.1 AS build
WORKDIR /src
COPY ["src/WMS.Web.Api/WMS.Web.Api.csproj", "src/WMS.Web.Api/"]

View File

@@ -48,48 +48,7 @@ namespace WMS.Web.Api
builder.AddDbContext(
opt => { opt.UseMySql(option.DBConnectionString, serverVersion); });
});
if (WebHostEnvironment.IsDevelopment())
{
// ע<><D7A2>Swagger<65><72><EFBFBD><EFBFBD>
services.AddSwaggerGen(c =>
{
// <20><><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD>Ϣ
c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo
{
Title = "WMS",
Version = "v1",
Description = "WMS-Api"
});
#region <EFBFBD><EFBFBD>ȡxml<EFBFBD><EFBFBD>Ϣ
// ʹ<>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>ȡxml<6D>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>·<EFBFBD><C2B7>
//// <20><><EFBFBD><EFBFBD>xmlע<6C><D7A2>. <20>÷<EFBFBD><C3B7><EFBFBD><EFBFBD>ڶ<EFBFBD><DAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD><C3BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD>ͣ<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊfalse.
foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.*.xml")) c.IncludeXmlComments(file, true);
#endregion
#region <EFBFBD><EFBFBD><EFBFBD><EFBFBD>swagger<EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//<2F><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD>ְ<EFBFBD>ȫ<EFBFBD><C8AB>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD>AddSecurityDefinition<6F><6E><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD>¼<EFBFBD><C2BC>ɣ<EFBFBD>CoreAPI<50><49>
var securit = new OpenApiSecurityRequirement()
{
{
new OpenApiSecurityScheme
{
Reference=new OpenApiReference { Type=ReferenceType.SecurityScheme,Id= "WMSAPI" }
},
new string[] { }
}
};
c.AddSecurityRequirement(securit);
c.AddSecurityDefinition("WMSAPI", new OpenApiSecurityScheme
{
Description = "JWT<57><54>Ȩ(<28><><EFBFBD>ݽ<EFBFBD><DDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD>н<EFBFBD><D0BD>д<EFBFBD><D0B4><EFBFBD>) <20><><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD><EFBFBD>Bearer {token} <20><><EFBFBD><EFBFBD>",
Name = "Authorization",//jwtĬ<74>ϵIJ<CFB5><C4B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
In = ParameterLocation.Header,//jwtĬ<74>ϴ<EFBFBD><CFB4><EFBFBD>Authorization<6F><6E>Ϣ<EFBFBD><CFA2>λ<EFBFBD><CEBB>(<28><><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7>)
Type = SecuritySchemeType.ApiKey
});
#endregion
});
}
services.AddControllers();
//<2F>Ƴ<EFBFBD><C6B3><EFBFBD>http<74><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD>ַhttps://docs.microsoft.com/zh-cn/dotnet/core/compatibility/aspnet-core/5.0/http-httpclient-instances-log-integer-status-codes<65><73>
services.RemoveAll<IHttpMessageHandlerBuilderFilter>();

View File

@@ -915,6 +915,11 @@
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.GenerateNo">
<summary>
生成单据号
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.TakeStockDetails">
<summary>
wms盘点单明细

View File

@@ -51,7 +51,7 @@ namespace WMS.Web.Repositories.DependencyInjection
{
this.AddCors();
this.InitRedis();
//this.AddSwagger();
this.AddSwagger();
this.AddOther();
this.AddConfigOptions();
this.AddServiceRepositories();