From 0b7b96dff182b7392d7eb587c644f1006ab0d28c Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Thu, 29 Aug 2024 22:01:28 +0800 Subject: [PATCH] =?UTF-8?q?pgsql=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/IRaCIS.Core.API.xml | 5 +++++ IRaCIS.Core.API/Progranm.cs | 3 ++- IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs | 11 ++++++++--- IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json | 3 ++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 24c372afc..78ee17b23 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -353,6 +353,11 @@ 序列化，反序列化的时候，处理时间 时区转换 + + + 序列化，反序列化的时候，处理时间 时区转换 + + 创建属性 diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index c785221c2..8e4574c11 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -34,7 +34,8 @@ using Microsoft.AspNetCore.Diagnostics; using IRaCIS.Core.Application.MassTransit.Command; using IRaCIS.Core.Application.MassTransit.Consumer; - +AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); +AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true); #region 获取环境变量 //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数) var config = new ConfigurationBuilder() diff --git a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs index 5d87f976a..9cabfec27 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs @@ -38,16 +38,21 @@ namespace IRaCIS.Core.API //public static readonly ILoggerFactory MyLoggerFactory = LoggerFactory.Create(builder => { builder.AddConsole(); }); var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); }); - if(envName != "Test_IRC_PGSQL") + var dbType = configuration.GetSection("ConnectionStrings:Db_Type").Value ; + if (!string.IsNullOrWhiteSpace(dbType) && dbType == "pgsql") { - options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value,contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure()); + options.UseNpgsql(@"Host=106.14.89.110;Port=5432;Username=sa;Password=pgsql_pwd;Database=Test2_PG"); + } else { - options.UseNpgsql(@"Host=106.14.89.110;Port=5432;Username=sa;Password=pgsql_pwd;Database=Test_IRC"); + options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure()); + } + + options.UseLoggerFactory(logFactory); options.UseExceptionProcessor(); diff --git a/IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json b/IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json index 938cbb330..4d17342dc 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json @@ -7,7 +7,8 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Db_Type": "pgsql", + "RemoteNew": "Host=106.14.89.110;Port=5432;Username=sa;Password=pgsql_pwd;Database=Test2_PG", "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" },