From d66c04a6a86c8cc1e7361d062fef542ad10a5db3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Wed, 24 Apr 2024 22:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ColumnReferencePlugInsAsbitemBase.cs      | 17 ----------------
 ...Shentun.Peis.ColumnReferencePlugIns.csproj |  2 +-
 .../PeisHttpApiHostModule.cs                  | 20 ++++++++++---------
 .../appsettings.json                          |  9 ++++++---
 4 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsAsbitemBase.cs

diff --git a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsAsbitemBase.cs b/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsAsbitemBase.cs
deleted file mode 100644
index f53b100..0000000
--- a/src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsAsbitemBase.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Shentun.Peis.ColumnReferencePlugIns
-{
-    public class ColumnReferencePlugInsAsbitemBase: ColumnReferencePlugInsBase
-    {
-        public ColumnReferencePlugInsAsbitemBase(string configParm):base(configParm) { }
-        public override Task<List<ColumnReferenceCodeValue>> GetCodeValues()
-        {
-            return base.GetCodeValues();
-        }
-    }
-}
diff --git a/src/Shentun.ColumnReferencePlugIns/Shentun.Peis.ColumnReferencePlugIns.csproj b/src/Shentun.ColumnReferencePlugIns/Shentun.Peis.ColumnReferencePlugIns.csproj
index 8dcff9c..a8cd024 100644
--- a/src/Shentun.ColumnReferencePlugIns/Shentun.Peis.ColumnReferencePlugIns.csproj
+++ b/src/Shentun.ColumnReferencePlugIns/Shentun.Peis.ColumnReferencePlugIns.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="Npgsql" Version="6.0.2" />
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.140" />
   </ItemGroup>
 
diff --git a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
index c4c6897..18c0697 100644
--- a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
+++ b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
@@ -54,6 +54,7 @@ using Shentun.Peis.VirtualPath;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 using Volo.Abp.Json;
+using Shentun.Utilities;
 
 namespace Shentun.Peis;
 [DependsOn(
@@ -190,17 +191,18 @@ public class PeisHttpApiHostModule : AbpModule
         //    options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
         //    options.JsonSerializerOptions.PropertyNamingPolicy = null;
         //});
-        //Configure<JsonOptions>(x =>
-        //{
-        //    x.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
-        //    //x.JsonSerializerOptions.PropertyNamingPolicy = null;
-        //    x.JsonSerializerOptions.Converters.Add(new JsonTimeSpanConverter());
-        //});
-
-        Configure<AbpJsonOptions>(x =>
+        Configure<JsonOptions>(x =>
         {
-            x.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+            //x.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            x.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter());
+            x.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
+
         });
+
+        //Configure<AbpJsonOptions>(x =>
+        //{
+        //    x.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+        //});
     }
 
 
diff --git a/test/Shentun.Peis.ColumnReference.Tests/appsettings.json b/test/Shentun.Peis.ColumnReference.Tests/appsettings.json
index e04ea8f..a63b2da 100644
--- a/test/Shentun.Peis.ColumnReference.Tests/appsettings.json
+++ b/test/Shentun.Peis.ColumnReference.Tests/appsettings.json
@@ -8,9 +8,12 @@
     "Sql": "select id::varchar as Code ,display_name as DisplayName ,simple_code as SimpleCode ,display_order as DisplayOrder from asbitem"
   },
   "Interface": {
-    "DbType": "SqlServer",
-    "ConnectionStrings": "Server=.;Database=mypeis_wyy;User ID=sa;Password=shentun;Application Name=mypeis;Encrypt=False;TrustServerCertificate=True",
-    "Sql": "select asbitem_id as Code ,asbitem_name as DisplayName from asbitem"
+    //"DbType": "SqlServer",
+    "DbType": "Oracle",
+    //"ConnectionStrings": "Server=.;Database=mypeis_wyy;User ID=sa;Password=shentun;Application Name=mypeis;Encrypt=False;TrustServerCertificate=True",
+    "ConnectionStrings": "User ID=TJ_LIS;Password=TJ_LIS;Data Source=(DESCRIPTION = (ADDRESS_LIST= (ADDRESS = (PROTOCOL = TCP)(HOST = 10.1.12.34)(PORT = 1521))) (CONNECT_DATA = (SERVICE_NAME = HIS56)))",
+
+    "Sql": "select ZHID as Code ,ZHMC as DisplayName from PORTAL56_LIS.vi_tj_testitemgroup"
   },
   "ConnectionStrings": {
     "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;"