diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs index 10a98ac4..e58662a7 100644 --- a/IRaCIS.Core.API/Program.cs +++ b/IRaCIS.Core.API/Program.cs @@ -76,50 +76,50 @@ namespace IRaCIS.Core.API #region 认证程序 - //if (!File.Exists($@"C:\ProgramData\.xingcang\config.json")) - //{ - // Console.WriteLine("当前未注册"); - // Log.Logger.Error("当前未注册"); - // Console.ReadLine(); - // return; - //} - //else - //{ - // var json = File.ReadAllText($@"C:\ProgramData\.xingcang\config.json"); + if (!File.Exists($@"C:\ProgramData\.xingcang\config.json")) + { + Console.WriteLine("当前未注册"); + Log.Logger.Error("当前未注册"); + Console.ReadLine(); + return; + } + else + { + var json = File.ReadAllText($@"C:\ProgramData\.xingcang\config.json"); - // JObject jsonObject = JObject.Parse(json); + JObject jsonObject = JObject.Parse(json); - // var key = jsonObject["key"].ToString(); + var key = jsonObject["key"].ToString(); - // var value = jsonObject["value"].ToString(); + var value = jsonObject["value"].ToString(); - // var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t => t.GetPhysicalAddress().ToString()); + var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t => t.GetPhysicalAddress().ToString()); - // // 判断文件里面的机器码是否是本机的 - // if (!physicalAddressList.Contains(key)) - // { - // Console.WriteLine("机器码和本机不对应"); - // Log.Logger.Error("机器码和本机不对应"); - // Console.ReadLine(); + // 判断文件里面的机器码是否是本机的 + if (!physicalAddressList.Contains(key)) + { + Console.WriteLine("机器码和本机不对应"); + Log.Logger.Error("机器码和本机不对应"); + Console.ReadLine(); - // return; - // } + return; + } - // var secrete = MD5Helper.Md5($"{key}_XINGCANG"); + var secrete = MD5Helper.Md5($"{key}_XINGCANG"); - // if (value != secrete) - // { - // Console.WriteLine("机器码和注册码不匹配"); - // Log.Logger.Error("机器码和注册码不匹配"); - // Console.ReadLine(); + if (value != secrete) + { + Console.WriteLine("机器码和注册码不匹配"); + Log.Logger.Error("机器码和注册码不匹配"); + Console.ReadLine(); - // return; + return; - // } + } - //} + } #endregion diff --git a/IRaCIS.Core.API/appsettings.Development.json b/IRaCIS.Core.API/appsettings.Development.json index f01c8122..8fa4be36 100644 --- a/IRaCIS.Core.API/appsettings.Development.json +++ b/IRaCIS.Core.API/appsettings.Development.json @@ -7,8 +7,9 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true", - "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true" + //"RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true", + //"Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true" + "RemoteNew": "Server=192.168.1.11\\WCH; Database=IRaCIS; User ID=sa; Password=123456;TrustServerCertificate=true" }, "BasicSystemConfig": { diff --git a/IRaCIS.Core.Application/Helper/ImageHelper.cs b/IRaCIS.Core.Application/Helper/ImageHelper.cs index 50f0ab4f..67727228 100644 --- a/IRaCIS.Core.Application/Helper/ImageHelper.cs +++ b/IRaCIS.Core.Application/Helper/ImageHelper.cs @@ -5,6 +5,8 @@ using SixLabors.ImageSharp; using SixLabors.ImageSharp.Processing; using System.Security.Cryptography; using System.Text; +using Dicom.Imaging; +using DicomImage = FellowOakDicom.Imaging.DicomImage; namespace IRaCIS.Core.Application.Helper; @@ -33,7 +35,7 @@ public static class ImageHelper { string jpegPath = filePath + ".preview.jpg"; - if (!File.Exists(jpegPath)) + if (!File.Exists(jpegPath)|| new FileInfo(jpegPath).Length==0) { using (Stream stream = new FileStream(jpegPath, FileMode.Create)) { diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj index d993bd15..fa169fa6 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj @@ -123,7 +123,6 @@ - diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/SystemAnonymizationViewModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/SystemAnonymizationViewModel.cs index 55da414b..f6571633 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/SystemAnonymizationViewModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/SystemAnonymizationViewModel.cs @@ -30,6 +30,8 @@ namespace IRaCIS.Core.Application.ViewModel public string TagDescription { get; set; } = string.Empty; + public string TagDescriptionCN { get; set; } = string.Empty; + public string ValueRepresentation { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs index 7467fea4..a325bf1f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using IRaCIS.Core.Application.Helper; +using Org.BouncyCastle.Utilities; namespace IRaCIS.Core.Application.Services { @@ -148,13 +149,21 @@ namespace IRaCIS.Core.Application.Services //var (physicalPath, relativePath) = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id); - using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath)) + if (File.Exists(physicalPath)) { - var bytes = new byte[sw.Length]; - sw.Read(bytes, 0, bytes.Length); - sw.Close(); - return new FileContentResult(bytes, "image/jpeg"); + using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath)) + { + var bytes = new byte[sw.Length]; + sw.Read(bytes, 0, bytes.Length); + sw.Close(); + return new FileContentResult(bytes, "image/jpeg"); + } } + else + { + return new FileContentResult(new byte[0], "image/jpeg"); + } + } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs index 791f5e99..91c49db7 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs @@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.Service var systemAnonymizationQueryable = systemAnonymizationRepository .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.Group), t => t.Group.Contains(querySystemAnonymization.Group)) .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.Element), t => t.Element.Contains(querySystemAnonymization.Element)) + .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.TagDescription), t => t.TagDescription.Contains(querySystemAnonymization.TagDescription)) + .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.TagDescriptionCN), t => t.TagDescriptionCN.Contains(querySystemAnonymization.TagDescriptionCN)) .WhereIf(querySystemAnonymization.IsAdd != null, t => t.IsAdd == querySystemAnonymization.IsAdd) .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.ValueRepresentation), t => t.ValueRepresentation.Contains(querySystemAnonymization.ValueRepresentation)) .ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 8e4225f9..2409d619 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -39,6 +39,13 @@ namespace IRaCIS.Application.Services _trialRepository = trialRepository; //_cache = cache; } + [AllowAnonymous] + public async Task TestTimeOut() + { + await Task.Delay(15000); + return ResponseOutput.Ok(); + } + [UnitOfWork] public async Task Get() diff --git a/Start/EI_Image_Viewer_Installer.csproj b/Start/EI_Image_Viewer_Installer.csproj index 51264946..73675648 100644 --- a/Start/EI_Image_Viewer_Installer.csproj +++ b/Start/EI_Image_Viewer_Installer.csproj @@ -20,7 +20,6 @@ - @@ -47,9 +46,6 @@ Always - - Always - diff --git a/Start/Main.cs b/Start/Main.cs index db7656cb..e2788f0f 100644 --- a/Start/Main.cs +++ b/Start/Main.cs @@ -164,7 +164,7 @@ namespace Start isServiceTestOk = true; } - private async void testNetcoreRuntime() + private void testNetcoreRuntime() { string runtimeListCommand = "dotnet --list-runtimes"; @@ -295,7 +295,7 @@ namespace Start - private async void confimDeployBtn_Click(object sender, EventArgs e) + private void confimDeployBtn_Click(object sender, EventArgs e) { portBtn_Click(null, null); @@ -788,6 +788,8 @@ namespace Start await ProcessStandardInputAsync(process, $@" SQLCMD -v dbName = ""{dbNameTBox.Text}"" -i ""{AppContext.BaseDirectory}Resource\Data\dbo.sql"" "); + await Task.Delay(3000); + await ProcessStandardInputAsync(process, $@" SQLCMD -v dbName = ""{dbNameTBox.Text}"" -i ""{AppContext.BaseDirectory}Resource\Data\data.sql"" "); @@ -823,7 +825,7 @@ namespace Start } } - catch (SqlException) + catch (SqlException ex) { WinformLog($"杩炴帴瀛楃涓查敊璇", Color.Red); @@ -883,6 +885,8 @@ namespace Start try { WinformLog($"鐜板湪鍑嗗鎵撳紑娴忚鍣...", Color.Green); + + await Task.Delay(2000); // Use ProcessStartInfo class var start = new ProcessStartInfo($"http://127.0.0.1:{vuePort}") { @@ -925,7 +929,7 @@ namespace Start } - private async void selectPathBtn_Click(object sender, EventArgs e) + private void selectPathBtn_Click(object sender, EventArgs e) { FolderBrowserDialog dialog = new FolderBrowserDialog(); if (dialog.ShowDialog() == DialogResult.OK) diff --git a/Start/Resource/Data/dbo.sql b/Start/Resource/Data/dbo.sql index 8a3bbdb1..3ba589c5 100644 Binary files a/Start/Resource/Data/dbo.sql and b/Start/Resource/Data/dbo.sql differ diff --git a/Start/Resource/EIImageViewerService.rar b/Start/Resource/EIImageViewerService.rar index 1e088962..80872ff0 100644 Binary files a/Start/Resource/EIImageViewerService.rar and b/Start/Resource/EIImageViewerService.rar differ diff --git a/Start/Resource/EIImageViewerWeb.rar b/Start/Resource/EIImageViewerWeb.rar index 015d9c5e..0e0dc5a1 100644 Binary files a/Start/Resource/EIImageViewerWeb.rar and b/Start/Resource/EIImageViewerWeb.rar differ diff --git a/Start/Resource/UnInstall.exe b/Start/Resource/UnInstall.exe index fcaefa21..536048ea 100644 Binary files a/Start/Resource/UnInstall.exe and b/Start/Resource/UnInstall.exe differ diff --git a/Start/Resource/鍖诲褰卞儚澶勭悊杞欢鐢ㄦ埛鎵嬪唽.pdf b/Start/Resource/鍖诲褰卞儚澶勭悊杞欢鐢ㄦ埛鎵嬪唽.pdf index e8398ee3..aea92d67 100644 Binary files a/Start/Resource/鍖诲褰卞儚澶勭悊杞欢鐢ㄦ埛鎵嬪唽.pdf and b/Start/Resource/鍖诲褰卞儚澶勭悊杞欢鐢ㄦ埛鎵嬪唽.pdf differ