From fc4d9c533209c0872c8c44f15741e008aeff9674 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 29 Oct 2022 11:37:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E9=BC=8E=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.API/Startup.cs | 98 +++++++++---------- .../Sync/AfterSaleOrderSyncBusiness.cs | 5 +- BBWY.Server.Business/Sync/BaseSyncBusiness.cs | 3 +- ...arizeReportFormAdGroupLevelSyncBusiness.cs | 5 +- ...PopularizeReportFormAdLevelSyncBusiness.cs | 5 +- ...rizeReportFormCampaignLevelSyncBusiness.cs | 6 +- ...ularizeReportFormOrderLevelSyncBusiness.cs | 6 +- ...opularizeReportFormSkuLevelSyncBusiness.cs | 6 +- .../Sync/JD/JDPopularizeSyncBusiness.cs | 6 +- .../Sync/OrderSyncBusiness.cs | 6 +- .../Sync/ProductSyncBusiness.cs | 6 +- BBWY.Server.Business/TestBusiness.cs | 2 +- BBWY.Server.Business/Vender/VenderBusiness.cs | 2 +- JD.API/Controllers/PlatformSDKController.cs | 3 +- ...ingFilterAttribute.cs => YunDingFilter.cs} | 8 +- JD.API/Startup.cs | 1 + JD.API/appsettings.json | 2 +- 17 files changed, 94 insertions(+), 76 deletions(-) rename JD.API/Filters/{YunDingFilterAttribute.cs => YunDingFilter.cs} (76%) diff --git a/BBWY.Server.API/Startup.cs b/BBWY.Server.API/Startup.cs index 819743d3..fb48bf49 100644 --- a/BBWY.Server.API/Startup.cs +++ b/BBWY.Server.API/Startup.cs @@ -88,61 +88,61 @@ namespace BBWY.Server.API services.Configure(Configuration.GetSection("GlobalSetting")); services.AddMapper(new MappingProfiles()); - //services.AddSwaggerGen(c => - //{ - // c.SwaggerDoc("v1", new OpenApiInfo - // { - // Version = "v1.0.0", - // Title = "步步为盈API", - // Description = "注意事项\r\n1.返回参数名称采用大驼峰命名\r\n2.ApiResponse为基础返回对象(Code,Data,Message),接口中所有的返回值均属于Data属性\r\n3.正常返回Code=200" - // }); - // // JWT认证 - // //c.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme, new OpenApiSecurityScheme - // //{ - // // Scheme = JwtBearerDefaults.AuthenticationScheme, - // // BearerFormat = "JWT", - // // Type = SecuritySchemeType.ApiKey, - // // Name = "Authorization", - // // In = ParameterLocation.Header, - // // Description = "Authorization:Bearer {your JWT token}
", - // //}); - // //c.AddSecurityRequirement(new OpenApiSecurityRequirement - // // { - // // { - // // new OpenApiSecurityScheme{Reference = new OpenApiReference - // // { - // // Type = ReferenceType.SecurityScheme, - // // Id = JwtBearerDefaults.AuthenticationScheme - // // } - // // }, - // // new string[] { } - // // } - // // }); - - // var executingAssembly = Assembly.GetExecutingAssembly(); - // var assemblyNames = executingAssembly.GetReferencedAssemblies().Union(new AssemblyName[] { executingAssembly.GetName() }).ToArray(); - // Array.ForEach(assemblyNames, (assemblyName) => - // { - // //var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; - // var xmlFile = $"{assemblyName.Name}.xml"; - // var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); - // if (!File.Exists(xmlPath)) - // return; - // c.IncludeXmlComments(xmlPath, true); - // }); - //}); + services.AddSwaggerGen(c => + { + c.SwaggerDoc("v1", new OpenApiInfo + { + Version = "v1.0.0", + Title = "步步为盈API", + Description = "注意事项\r\n1.返回参数名称采用大驼峰命名\r\n2.ApiResponse为基础返回对象(Code,Data,Message),接口中所有的返回值均属于Data属性\r\n3.正常返回Code=200" + }); + // JWT认证 + //c.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme, new OpenApiSecurityScheme + //{ + // Scheme = JwtBearerDefaults.AuthenticationScheme, + // BearerFormat = "JWT", + // Type = SecuritySchemeType.ApiKey, + // Name = "Authorization", + // In = ParameterLocation.Header, + // Description = "Authorization:Bearer {your JWT token}
", + //}); + //c.AddSecurityRequirement(new OpenApiSecurityRequirement + // { + // { + // new OpenApiSecurityScheme{Reference = new OpenApiReference + // { + // Type = ReferenceType.SecurityScheme, + // Id = JwtBearerDefaults.AuthenticationScheme + // } + // }, + // new string[] { } + // } + // }); + + var executingAssembly = Assembly.GetExecutingAssembly(); + var assemblyNames = executingAssembly.GetReferencedAssemblies().Union(new AssemblyName[] { executingAssembly.GetName() }).ToArray(); + Array.ForEach(assemblyNames, (assemblyName) => + { + //var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; + var xmlFile = $"{assemblyName.Name}.xml"; + var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); + if (!File.Exists(xmlPath)) + return; + c.IncludeXmlComments(xmlPath, true); + }); + }); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env,YunDingBusiness yunDingBusiness) { yunDingBusiness.RefreshKey(); - //app.UseSwagger(c => c.SerializeAsV2 = true) - // .UseSwaggerUI(c => - // { - // c.SwaggerEndpoint("/swagger/v1/swagger.json", "BBWY API"); - // c.RoutePrefix = string.Empty; - // }); + app.UseSwagger(c => c.SerializeAsV2 = true) + .UseSwaggerUI(c => + { + c.SwaggerEndpoint("/swagger/v1/swagger.json", "BBWY API"); + c.RoutePrefix = string.Empty; + }); //if (env.IsDevelopment()) //{ diff --git a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs index 569e6396..1fe3ad0d 100644 --- a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs @@ -31,13 +31,14 @@ namespace BBWY.Server.Business IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness,YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { syncAfterSaleOrderMethodDic = new Dictionary>() { diff --git a/BBWY.Server.Business/Sync/BaseSyncBusiness.cs b/BBWY.Server.Business/Sync/BaseSyncBusiness.cs index 194102a7..f3685205 100644 --- a/BBWY.Server.Business/Sync/BaseSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/BaseSyncBusiness.cs @@ -21,7 +21,8 @@ namespace BBWY.Server.Business IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, options) + VenderBusiness venderBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, yunDingBusiness) { this.logger = logger; this.fsql = fsql; diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs index aee98e02..8256c25d 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs @@ -26,13 +26,14 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness,YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs index 4935428d..6d020f84 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs @@ -26,13 +26,14 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs index 28a8f5c5..8a344f86 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs @@ -25,13 +25,15 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs index deccadfb..7121c863 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs @@ -26,13 +26,15 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs index 072d352c..0bd1b826 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs @@ -25,13 +25,15 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs index 72c25ac6..c5f4ec82 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs @@ -27,13 +27,15 @@ namespace BBWY.Server.Business.Sync IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, - VenderBusiness venderBusiness) : base(restApiService, + VenderBusiness venderBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { } diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index 63a53ea8..13228868 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -33,13 +33,15 @@ namespace BBWY.Server.Business IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, - IMemoryCache memoryCache) : base(restApiService, + IMemoryCache memoryCache, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { this.memoryCache = memoryCache; syncOrderMethodDic = new Dictionary>() diff --git a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs index fa4bfa5e..1d843056 100644 --- a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs @@ -26,13 +26,15 @@ namespace BBWY.Server.Business.Sync IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, - ProductBusiness productBusiness) : base(restApiService, + ProductBusiness productBusiness, + YunDingBusiness yunDingBusiness) : base(restApiService, options, logger, fsql, idGenerator, taskSchedulerManager, - venderBusiness) + venderBusiness, + yunDingBusiness) { this.productBusiness = productBusiness; } diff --git a/BBWY.Server.Business/TestBusiness.cs b/BBWY.Server.Business/TestBusiness.cs index 90671597..77ef322a 100644 --- a/BBWY.Server.Business/TestBusiness.cs +++ b/BBWY.Server.Business/TestBusiness.cs @@ -15,7 +15,7 @@ namespace BBWY.Server.Business public TestBusiness(RestApiService restApiService, IOptions options, FreeSqlMultiDBManager freeSqlMultiDBManager, - VenderBusiness venderBusiness) : base(restApiService, options) + VenderBusiness venderBusiness,YunDingBusiness yunDingBusiness) : base(restApiService, options, yunDingBusiness) { this.freeSqlMultiDBManager = freeSqlMultiDBManager; this.venderBusiness = venderBusiness; diff --git a/BBWY.Server.Business/Vender/VenderBusiness.cs b/BBWY.Server.Business/Vender/VenderBusiness.cs index 063ec5b6..6adcf3b6 100644 --- a/BBWY.Server.Business/Vender/VenderBusiness.cs +++ b/BBWY.Server.Business/Vender/VenderBusiness.cs @@ -22,7 +22,7 @@ namespace BBWY.Server.Business public VenderBusiness(FreeSqlMultiDBManager freeSqlMultiDBManager, RestApiService restApiService, IOptions options, - IIdGenerator idGenerator) : base(restApiService, options) + IIdGenerator idGenerator,YunDingBusiness yunDingBusiness) : base(restApiService, options, yunDingBusiness) { this.freeSqlMultiDBManager = freeSqlMultiDBManager; this.idGenerator = idGenerator; diff --git a/JD.API/Controllers/PlatformSDKController.cs b/JD.API/Controllers/PlatformSDKController.cs index 3f4a927d..d276a66e 100644 --- a/JD.API/Controllers/PlatformSDKController.cs +++ b/JD.API/Controllers/PlatformSDKController.cs @@ -16,6 +16,7 @@ namespace JD.API.API.Controllers [Produces("application/json")] [Route("Api/[Controller]/[Action]")] [ApiController] + [ServiceFilter(typeof(YunDingFilter))] public class PlatformSDKController : ControllerBase { private IEnumerable platformSDKBusinessList; @@ -242,7 +243,7 @@ namespace JD.API.API.Controllers { return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetJDSopularizeReportFormByAdGroupLevel(request); } - + /// /// 鏌ヨJD鎺ㄥ箍鎶ヨ〃-璁㈠崟缁村害 /// diff --git a/JD.API/Filters/YunDingFilterAttribute.cs b/JD.API/Filters/YunDingFilter.cs similarity index 76% rename from JD.API/Filters/YunDingFilterAttribute.cs rename to JD.API/Filters/YunDingFilter.cs index 3f93f39d..c85af93d 100644 --- a/JD.API/Filters/YunDingFilterAttribute.cs +++ b/JD.API/Filters/YunDingFilter.cs @@ -7,13 +7,13 @@ using Microsoft.Extensions.Primitives; namespace JD.API.Filters { - public class YunDingFilterAttribute : ActionFilterAttribute + public class YunDingFilter : ActionFilterAttribute { private IConfiguration configuration; private YunDingBusiness yunDingBusiness; - public YunDingFilterAttribute(IConfiguration configuration, YunDingBusiness yunDingBusiness) + public YunDingFilter(IConfiguration configuration, YunDingBusiness yunDingBusiness) { this.configuration = configuration; this.yunDingBusiness = yunDingBusiness; @@ -30,10 +30,10 @@ namespace JD.API.Filters if (platform == Enums.Platform.浜笢) { if (!context.HttpContext.Request.Headers.TryGetValue("YunDingKey", out StringValues yundingKey)) - throw new BusinessException("YunDingKey鑾峰彇澶辫触"); + throw new BusinessException("韬唤楠岃瘉澶辫触"); if (yunDingBusiness.GetKey() != yundingKey.ToString()) - throw new BusinessException("YunDingKey楠岃瘉澶辫触"); + throw new BusinessException("韬唤楠岃瘉澶辫触"); } } } diff --git a/JD.API/Startup.cs b/JD.API/Startup.cs index 5b68a0ec..e3573ef5 100644 --- a/JD.API/Startup.cs +++ b/JD.API/Startup.cs @@ -62,6 +62,7 @@ namespace JD.API //setupAction.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Include; //setupAction.SerializerSettings.DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Include; }); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/JD.API/appsettings.json b/JD.API/appsettings.json index 746b7356..d3a0a141 100644 --- a/JD.API/appsettings.json +++ b/JD.API/appsettings.json @@ -9,7 +9,7 @@ "ConnectionStrings": { "DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy_test;charset=utf8;sslmode=none;", }, - "IsEnableSwagger": false, + "IsEnableSwagger": true, "AllowedHosts": "*", "ValidatePlatformKey": 1 }