From 9c7d7b9b2bb58608a1d4c3d2ae9779a7e4f64d85 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 16:28:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/OutStockService.cs | 2 +- src/WMS.Web.Domain/Services/TakeStockService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; //提交事务 From 6bfd990b6c8f2722b2975ab538be501fb051c22c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 16:51:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4swagger=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index bb5e8c89..b1c9c937 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -131,7 +131,7 @@ namespace WMS.Web.Repositories.DependencyInjection #region 读取xml信息 // 使用反射获取xml文件。并构造出文件的路径 //// 启用xml注释. 该方法第二个参数启用控制器的注释，默认为false. - foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.*.xml")) c.IncludeXmlComments(file, true); + foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.Web.*.xml")) c.IncludeXmlComments(file, true); #endregion #region 启用swagger验证功能 From 6d44541d44a9060ef6ee6f48b2ce4eb1ea77d3a1 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 17:02:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Startup.cs | 44 +++++++++++++++++++ .../DependencyInjection/AppBuilder.cs | 4 +- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Api/Startup.cs b/src/WMS.Web.Api/Startup.cs index ef5523ae..0d1b7ae4 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,48 @@ namespace WMS.Web.Api builder.AddDbContext( opt => { opt.UseMySql(option.DBConnectionString, serverVersion); }); }); + if (WebHostEnvironment.IsDevelopment()) + { + // עSwagger + services.AddSwaggerGen(c => + { + // ĵϢ + c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo + { + Title = "WMS", + Version = "v1", + Description = "WMS-Api" + }); + #region ȡxmlϢ + // ʹ÷ȡxmlļļ· + //// xmlע. ÷ڶÿעͣĬΪfalse. + foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.*.xml")) c.IncludeXmlComments(file, true); + #endregion + + #region swagger֤ + //һȫְȫϢAddSecurityDefinitionָķһ¼ɣCoreAPI + 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Ȩ(ݽͷнд) ·Bearer {token} ", + Name = "Authorization",//jwtĬϵIJ + In = ParameterLocation.Header,//jwtĬϴAuthorizationϢλ(ͷ) + Type = SecuritySchemeType.ApiKey + }); + #endregion + + }); + } 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.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index b1c9c937..0cb6e997 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -51,7 +51,7 @@ namespace WMS.Web.Repositories.DependencyInjection { this.AddCors(); this.InitRedis(); - this.AddSwagger(); + //this.AddSwagger(); this.AddOther(); this.AddConfigOptions(); this.AddServiceRepositories(); @@ -131,7 +131,7 @@ namespace WMS.Web.Repositories.DependencyInjection #region 读取xml信息 // 使用反射获取xml文件。并构造出文件的路径 //// 启用xml注释. 该方法第二个参数启用控制器的注释，默认为false. - foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.Web.*.xml")) c.IncludeXmlComments(file, true); + foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.*.xml")) c.IncludeXmlComments(file, true); #endregion #region 启用swagger验证功能 From 8985cae8d1df0c00ba3fa16b241f79697910f97c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 17:13:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++ src/WMS.Web.Api/Startup.cs | 43 +------------------ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 +++ .../DependencyInjection/AppBuilder.cs | 2 +- 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5e310d3..63fa2768 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/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/"] diff --git a/src/WMS.Web.Api/Startup.cs b/src/WMS.Web.Api/Startup.cs index 0d1b7ae4..b24d7b03 100644 --- a/src/WMS.Web.Api/Startup.cs +++ b/src/WMS.Web.Api/Startup.cs @@ -48,48 +48,7 @@ namespace WMS.Web.Api builder.AddDbContext( opt => { opt.UseMySql(option.DBConnectionString, serverVersion); }); }); - if (WebHostEnvironment.IsDevelopment()) - { - // עSwagger - services.AddSwaggerGen(c => - { - // ĵϢ - c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo - { - Title = "WMS", - Version = "v1", - Description = "WMS-Api" - }); - #region ȡxmlϢ - // ʹ÷ȡxmlļļ· - //// xmlע. ÷ڶÿעͣĬΪfalse. - foreach (var file in Directory.GetFiles(AppContext.BaseDirectory, "WMS.*.xml")) c.IncludeXmlComments(file, true); - #endregion - - #region swagger֤ - //һȫְȫϢAddSecurityDefinitionָķһ¼ɣCoreAPI - 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Ȩ(ݽͷнд) ·Bearer {token} ", - Name = "Authorization",//jwtĬϵIJ - In = ParameterLocation.Header,//jwtĬϴAuthorizationϢλ(ͷ) - Type = SecuritySchemeType.ApiKey - }); - #endregion - - }); - } + 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.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 3e28250d..8e5b0949 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -915,6 +915,11 @@ + + + 生成单据号 + + wms盘点单明细 diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index 0cb6e997..bb5e8c89 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -51,7 +51,7 @@ namespace WMS.Web.Repositories.DependencyInjection { this.AddCors(); this.InitRedis(); - //this.AddSwagger(); + this.AddSwagger(); this.AddOther(); this.AddConfigOptions(); this.AddServiceRepositories(); From 5204009b2100f97276b5dbf056f509e96d72547e Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 30 Oct 2023 17:16:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63fa2768..f28f0272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,9 @@ 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"] +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