diff --git a/PARR.AIHITLoaderWorker/Dockerfile b/PARR.AIHITLoaderWorker/Dockerfile index 831fce3b..202b222c 100644 --- a/PARR.AIHITLoaderWorker/Dockerfile +++ b/PARR.AIHITLoaderWorker/Dockerfile @@ -28,7 +28,11 @@ WORKDIR /app COPY --from=publish /app/publish . # Понижаем уровень безопасности OpenSSL до уровня 1 и разрешаем TLSv1 -RUN sed -i 's/CipherString = DEFAULT:@SECLEVEL=2/CipherString = DEFAULT:@SECLEVEL=1/g' /etc/ssl/openssl.cnf && \ - sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf +#RUN sed -i 's/CipherString = DEFAULT:@SECLEVEL=2/CipherString = DEFAULT:@SECLEVEL=1/g' /etc/ssl/openssl.cnf && \ +# sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf + +ENV DOTNET_SYSTEM_NET_SECURITY_ALLOWUNSECUREDEFAULTS=true +ENV OPENSSL_SYSTEM_DEFAULT_MIN_PROTOCOL=TLSv1 +ENV OPENSSL_SYSTEM_DEFAULT_CIPHER_STRING=DEFAULT@SECLEVEL=0 ENTRYPOINT ["dotnet", "PARR.AIHITLoaderWorker.dll"] \ No newline at end of file diff --git a/PARR.AIHITLoaderWorker/appsettings.json b/PARR.AIHITLoaderWorker/appsettings.json index 54e9202b..6c506ebb 100644 --- a/PARR.AIHITLoaderWorker/appsettings.json +++ b/PARR.AIHITLoaderWorker/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "AihitConnection": "Data Source=10.248.19.97; Initial Catalog=mao2;User ID=awhit-ipp-parr;pwd=ET3h$9y1LH#D;Encrypt=False;TrustServerCertificate=true;" + "AihitConnection": "Data Source=10.248.19.97; Initial Catalog=mao2;User ID=awhit-ipp-parr;pwd=ET3h$9y1LH#D;Encrypt=Optional;TrustServerCertificate=true;" }, "Logging": { "LogLevel": { diff --git a/PARR.AIHITRelationshipsSyncerWorker/Program.cs b/PARR.AIHITRelationshipsSyncerWorker/Program.cs index 0c424515..efd2a421 100644 --- a/PARR.AIHITRelationshipsSyncerWorker/Program.cs +++ b/PARR.AIHITRelationshipsSyncerWorker/Program.cs @@ -21,8 +21,6 @@ builder.Services.AddLogging(config => config.AddSerilog(logger.CreateLogger()); }); -AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseUnsafeTls", true); - builder.Services.InstallAihitRelationshpsSyncerServices(builder.Configuration); builder.Configuration.AddAihitRelationshpsSyncerConfigurations(builder.Services); builder.Services.AddAihitRelationshpsSyncerSettings(builder.Configuration); diff --git a/PARR.AIHITRelationshipsSyncerWorker/appsettings.json b/PARR.AIHITRelationshipsSyncerWorker/appsettings.json index 391dc3c7..9f02a644 100644 --- a/PARR.AIHITRelationshipsSyncerWorker/appsettings.json +++ b/PARR.AIHITRelationshipsSyncerWorker/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "AihitConnection": "Data Source=10.248.19.97; Initial Catalog=mao2;User ID=awhit-ipp-parr;pwd=ET3h$9y1LH#D;TrustServerCertificate=true;", + "AihitConnection": "Data Source=10.248.19.97; Initial Catalog=mao2;User ID=awhit-ipp-parr;pwd=ET3h$9y1LH#D;Encrypt=Optional;TrustServerCertificate=true;", "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" }, "Logging": {