diff --git a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs index 4ea64a6..9a68b73 100644 --- a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs +++ b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs @@ -129,15 +129,15 @@ public class PeisHttpApiHostModule : AbpModule opt.Password.RequiredLength = 1; }); - //密码策略配置 - context.Services.Configure(opt => - { - opt.Password.RequireDigit = false; - opt.Password.RequireLowercase = false; - opt.Password.RequireUppercase = false; - opt.Password.RequireNonAlphanumeric = false; - opt.Password.RequiredLength = 1; - }); + ////密码策略配置 + //context.Services.Configure(opt => + //{ + // opt.Password.RequireDigit = false; + // opt.Password.RequireLowercase = false; + // opt.Password.RequireUppercase = false; + // opt.Password.RequireNonAlphanumeric = false; + // opt.Password.RequiredLength = 1; + //}); #region 临时去掉日志 //关闭审计日志 @@ -457,7 +457,7 @@ public class PeisHttpApiHostModule : AbpModule config.UsePostgreSqlStorage(configuration.GetConnectionString("Default")); }); } - public override async void OnApplicationInitialization(ApplicationInitializationContext context) + public override async void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); var env = context.GetEnvironment(); @@ -583,7 +583,7 @@ public class PeisHttpApiHostModule : AbpModule IConfigurationRoot interfaceConfig; try { - interfaceConfig = configurationBuilder.Build(); + interfaceConfig = configurationBuilder.Build(); } catch (Exception ex) { @@ -596,11 +596,11 @@ public class PeisHttpApiHostModule : AbpModule .GetSection("Corn").Value; if (isActive == "Y") { - if(thirdInterfaceDto.ThirdInterfaceType == "02") + if (thirdInterfaceDto.ThirdInterfaceType == "02") { RecurringJob.AddOrUpdate("收费接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local); } - else if(thirdInterfaceDto.ThirdInterfaceType == "03") + else if (thirdInterfaceDto.ThirdInterfaceType == "03") { RecurringJob.AddOrUpdate("导入检验结果接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local); } diff --git a/src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs b/src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs index 7e89b75..e764277 100644 --- a/src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs +++ b/src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs @@ -12,7 +12,7 @@ namespace Shentun.Peis.Schedulers { public interface IImportLisResultInterfaceWorker { - public void DoWork(Guid interfaceId); + Task DoWork(Guid interfaceId); public void DoWork(); } public class ImportLisResultInterfaceWorker : HangfireBackgroundWorkerBase, IImportLisResultInterfaceWorker @@ -21,55 +21,54 @@ namespace Shentun.Peis.Schedulers private static long i; private static bool _isRunning = false; private static readonly object lockObject = new object(); - public void DoWork(Guid interfaceId) + public async Task DoWork(Guid interfaceId) { if (_isRunning) return; - lock (lockObject) + + _isRunning = true; + try { - _isRunning = true; - try + Logger.LogInformation("Executed ImportLisResultInterfaceWorker..!"); + var appServiceHelper = new AppServiceHelper(); + appServiceHelper.Login(); + var thirdInterFaceForHostOutDto = appServiceHelper.CallAppService("api/app/ThirdInterface/GetList", null); + var thirdInterfaceDto = thirdInterFaceForHostOutDto.Data.Where(o => o.Id == interfaceId).FirstOrDefault(); + if (thirdInterfaceDto == null) + { + _isRunning = false; + return; + } + + var parmValue = thirdInterfaceDto.ParmValue; + if (!string.IsNullOrWhiteSpace(parmValue)) { - Logger.LogInformation("Executed ImportLisResultInterfaceWorker..!"); - var appServiceHelper = new AppServiceHelper(); - appServiceHelper.Login(); - var thirdInterFaceForHostOutDto = appServiceHelper.CallAppService("api/app/ThirdInterface/GetList", null); - var thirdInterfaceDto = thirdInterFaceForHostOutDto.Data.Where(o => o.Id == interfaceId).FirstOrDefault(); - if (thirdInterfaceDto == null) + var configurationBuilder = new ConfigurationBuilder() + .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue))); + var interfaceConfig = configurationBuilder.Build(); + + isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler") + .GetSection("IsActive").Value; + if (isActive != "Y") { _isRunning = false; return; } - - var parmValue = thirdInterfaceDto.ParmValue; - if (!string.IsNullOrWhiteSpace(parmValue)) - { - var configurationBuilder = new ConfigurationBuilder() - .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue))); - var interfaceConfig = configurationBuilder.Build(); - - isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler") - .GetSection("IsActive").Value; - if (isActive != "Y") - { - _isRunning = false; - return; - } - var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value; - var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value; - var funName = "DoWork"; - //object[] objects = new object[] { chargeRequestPlugInsInput }; - ReflectionHelper.InvokeAsync(assemblyName, className, parmValue, funName); - } + var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value; + var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value; + var funName = "DoWork"; + //object[] objects = new object[] { chargeRequestPlugInsInput }; + await ReflectionHelper.InvokeAsync(assemblyName, className, parmValue, funName); + } - } - catch (Exception ex) - { - Logger.LogError("Executed ImportLisResultInterfaceWorker Error" + ex.Message); - } - _isRunning = false; - return; } + catch (Exception ex) + { + Logger.LogError("Executed ImportLisResultInterfaceWorker Error" + ex.Message); + } + _isRunning = false; + return; + } public void DoWork()