diff --git a/Dockerfile b/Dockerfile index a5e310d3..f28f0272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/WMS.Web.Api.xml", "/app/WMS.Web.Api.xml"] +COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml", "/app/WMS.Web.Core.xml"] +COPY ["src/WMS.Web.Api/wwwroot/WMS.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/"] diff --git a/src/WMS.Web.Api/Startup.cs b/src/WMS.Web.Api/Startup.cs index ef5523ae..b24d7b03 100644 --- a/src/WMS.Web.Api/Startup.cs +++ b/src/WMS.Web.Api/Startup.cs @@ -9,10 +9,12 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Http; using Microsoft.Extensions.Logging; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerUI; using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; +using System.IO; using System.Linq; using System.Threading.Tasks; using WMS.Web.Domain.Options; @@ -46,6 +48,7 @@ namespace WMS.Web.Api builder.AddDbContext( opt => { opt.UseMySql(option.DBConnectionString, serverVersion); }); }); + services.AddControllers(); //移除:http请求的默认日志处理器(备注:也可以实现它,自定义自己想要的日志,文档地址https://docs.microsoft.com/zh-cn/dotnet/core/compatibility/aspnet-core/5.0/http-httpclient-instances-log-integer-status-codes) services.RemoveAll(); diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 7a8abce9..d30a60bf 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -57,7 +57,7 @@ namespace WMS.Web.Domain.Services IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); bool isRollback = false; bool isSuccess = true; - entity = await _outStockRepositories.Add(entity, true); + entity = await _outStockRepositories.Add(entity, false); if (entity == null) isRollback = true; //鎻愪氦浜嬪姟 diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index c00e0c78..13bb71b0 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -52,7 +52,7 @@ namespace WMS.Web.Domain.Services IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); bool isRollback = false; bool isSuccess = true; - entity = await _takeStockRepositories.Add(entity, true); + entity = await _takeStockRepositories.Add(entity, false); if (entity == null) isRollback = true; //鎻愪氦浜嬪姟