From 7a145541730c48d2c5419b4ba8325586f55cb9f3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Mon, 13 May 2024 23:41:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.json | 4 ++-- .../ImportLisResultPlugInsBase.cs | 22 +++++++++---------- .../PlugInsBase.cs | 14 ++++++------ .../appsettings.json | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/appsettings.json b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/appsettings.json index 042dc68..be0e1aa 100644 --- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/appsettings.json +++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/appsettings.json @@ -9,8 +9,8 @@ "RedirectAllowedUrls": "http://localhost:9530", "Sql": "select id::varchar as Code ,display_name as DisplayName ,simple_code as SimpleCode ,display_order as DisplayOrder from asbitem", "ColumnNames": "编码,名称", - "AppUser": "admin", - "AppPassword": "666666" + "SelfUser": "admin", + "SelfPassword": "666666" }, "Interface": { diff --git a/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs index 25423e5..61831b9 100644 --- a/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs @@ -12,15 +12,15 @@ namespace Shentun.Peis.PlugIns public class ImportLisResultPlugInsBase : ThirdPlugInsBase { - protected string AppLisUser; - protected string AppLisPassword; + //protected string AppLisUser; + //protected string AppLisPassword; public ImportLisResultPlugInsBase(string parmValue) : base(parmValue) { - AppLisUser = AppConfig.GetSection("App") - .GetSection("LisUser").Value; - AppLisPassword = AppConfig.GetSection("App") - .GetSection("LisPassword").Value; + //AppLisUser = AppConfig.GetSection("App") + // .GetSection("LisUser").Value; + //AppLisPassword = AppConfig.GetSection("App") + // .GetSection("LisPassword").Value; } public virtual async Task ImportResultAsync(ImportLisResultPlugInsInput input) { @@ -100,10 +100,10 @@ ORDER BY register_check.patient_register_id return Task.CompletedTask; } - protected async override Task LoginAsync() - { - var relult = await LoginAsync(AppLisUser, AppLisPassword); - return relult; - } + //protected async override Task LoginAsync() + //{ + // var relult = await LoginAsync(AppLisUser, AppLisPassword); + // return relult; + //} } } diff --git a/src/Shentun.ColumnReferencePlugIns/PlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/PlugInsBase.cs index d0e5fee..70f9366 100644 --- a/src/Shentun.ColumnReferencePlugIns/PlugInsBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/PlugInsBase.cs @@ -24,8 +24,8 @@ namespace Shentun.Peis.PlugIns protected string? AppConnctionStr; private string _appBaseAddress; private string _accesToken; - protected string? AppUser; - protected string? AppPassword; + protected string? SelfUser; + protected string? SelfPassword; protected string InterfaceSql; protected string InterfaceSqlKeyColumn; @@ -53,10 +53,10 @@ namespace Shentun.Peis.PlugIns .GetSection("Default").Value; _appBaseAddress = AppConfig.GetSection("App") .GetSection("SelfUrl").Value; - AppUser = AppConfig.GetSection("App") - .GetSection("AppUser").Value; - AppPassword = AppConfig.GetSection("App") - .GetSection("AppPassword").Value; + SelfUser = AppConfig.GetSection("App") + .GetSection("SelfUser").Value; + SelfPassword = AppConfig.GetSection("App") + .GetSection("SelfPassword").Value; var configurationBuilder = new ConfigurationBuilder() .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue))); @@ -199,7 +199,7 @@ namespace Shentun.Peis.PlugIns protected async virtual Task LoginAsync() { - var relult = await LoginAsync(AppUser, AppPassword); + var relult = await LoginAsync(SelfUser, SelfPassword); return relult; } public async Task LoginAsync(string userId,string password) diff --git a/test/Shentun.Peis.ColumnReference.Tests/appsettings.json b/test/Shentun.Peis.ColumnReference.Tests/appsettings.json index 5480861..6adfbca 100644 --- a/test/Shentun.Peis.ColumnReference.Tests/appsettings.json +++ b/test/Shentun.Peis.ColumnReference.Tests/appsettings.json @@ -9,8 +9,8 @@ "Sql": "SELECT TMH AS LisRequestNo,TJBH AS PatientId,TESTID as ItemId,XMMC as ItemName,XMJG as Result,UNIT as Unit,CKFW AS ReferenceRangeValue FROM PORTAL56_LIS.VI_TJ_RESULT", "ColumnNames": "Code=编码,DisplayName=名称", "AsbitemColumnReferenceId": "", - "LisUser": "admin", - "LisPassword": "666666" + "SelfUser": "admin", + "SelfPassword": "666666" }, "Interface": { //"DbType": "SqlServer",