diff --git a/YunDa.SOMS.sln b/YunDa.SOMS.sln index f24e248..fdda2a0 100644 --- a/YunDa.SOMS.sln +++ b/YunDa.SOMS.sln @@ -54,8 +54,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YunDa.SOMS.ExternalInteract EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yunda.ToolLibrary", "src\YunDa.Util\ToolLibrary\Yunda.ToolLibrary.csproj", "{D4151068-F1A4-4A8F-94E1-C1C05D986C71}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yunda.VideoSurveillanceAdapter", "src\YunDa.Util\VideoSurveillanceAdapter\Yunda.VideoSurveillanceAdapter.csproj", "{31DECE15-9A02-4E47-912B-FC08D3B24E1B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YunDa.SOMS.ExternalInteraction.DataTransferObject", "src\YunDa.Application\YunDa.SOMS.ExternalInteraction.DataTransferObject\YunDa.SOMS.ExternalInteraction.DataTransferObject.csproj", "{13D6143E-C01D-4E1B-A769-032F669CF725}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YunDa.Quick", "YunDa.Quick", "{7E07DDCE-003F-4C6E-98D5-74A71E8C1770}" @@ -381,24 +379,6 @@ Global {D4151068-F1A4-4A8F-94E1-C1C05D986C71}.Template|x64.Build.0 = Release|x64 {D4151068-F1A4-4A8F-94E1-C1C05D986C71}.Template|x86.ActiveCfg = Release|Any CPU {D4151068-F1A4-4A8F-94E1-C1C05D986C71}.Template|x86.Build.0 = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|x64.ActiveCfg = Debug|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|x64.Build.0 = Debug|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|x86.ActiveCfg = Debug|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Debug|x86.Build.0 = Debug|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|Any CPU.Build.0 = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|x64.ActiveCfg = Release|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|x64.Build.0 = Release|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|x86.ActiveCfg = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Release|x86.Build.0 = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|Any CPU.ActiveCfg = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|Any CPU.Build.0 = Release|Any CPU - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|x64.ActiveCfg = Release|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|x64.Build.0 = Release|x64 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|x86.ActiveCfg = Debug|x86 - {31DECE15-9A02-4E47-912B-FC08D3B24E1B}.Template|x86.Build.0 = Debug|x86 {13D6143E-C01D-4E1B-A769-032F669CF725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13D6143E-C01D-4E1B-A769-032F669CF725}.Debug|Any CPU.Build.0 = Debug|Any CPU {13D6143E-C01D-4E1B-A769-032F669CF725}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1017,7 +997,6 @@ Global {4CBFA9EA-B504-4893-AE68-B931C8EFF249} = {93CB9A86-F838-4498-B5EB-AB0A5EE42106} {7FF25D59-5262-40A2-8A9D-CC8B7450F3B4} = {EE6B9914-CE4E-467D-9DAF-A343701EF4A0} {D4151068-F1A4-4A8F-94E1-C1C05D986C71} = {A86F8C9A-DC31-4BDB-ADAD-41F08A3F9E43} - {31DECE15-9A02-4E47-912B-FC08D3B24E1B} = {A86F8C9A-DC31-4BDB-ADAD-41F08A3F9E43} {13D6143E-C01D-4E1B-A769-032F669CF725} = {EE6B9914-CE4E-467D-9DAF-A343701EF4A0} {7E07DDCE-003F-4C6E-98D5-74A71E8C1770} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC} {840AC814-E360-40DF-BA25-0ABD7D9E2898} = {7E07DDCE-003F-4C6E-98D5-74A71E8C1770} @@ -1055,7 +1034,7 @@ Global {43E4AAB5-FE6F-FF22-8A2C-98632C151F3C} = {A49CD7CD-52BA-48F3-83D5-D6CA072F8849} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B516B1E8-1CEC-4BCC-BA92-93CB32845E37} VisualSVNWorkingCopyRoot = . + SolutionGuid = {B516B1E8-1CEC-4BCC-BA92-93CB32845E37} EndGlobalSection EndGlobal diff --git a/src/YunDa.Application/YunDa.SOMS.Application.Core/Auditing/ISASAuditingStore.cs b/src/YunDa.Application/YunDa.SOMS.Application.Core/Auditing/ISASAuditingStore.cs index de85b61..e9cc208 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application.Core/Auditing/ISASAuditingStore.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application.Core/Auditing/ISASAuditingStore.cs @@ -2,7 +2,6 @@ using Abp.Extensions; using Abp.Runtime.Validation; using Abp.UI; -using iTextSharp.text; using MongoDB.Bson; using System; using System.Collections.Generic; diff --git a/src/YunDa.Application/YunDa.SOMS.Application.Core/Configuration/AppServiceConfiguration.cs b/src/YunDa.Application/YunDa.SOMS.Application.Core/Configuration/AppServiceConfiguration.cs index 003ef81..abc5db2 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application.Core/Configuration/AppServiceConfiguration.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application.Core/Configuration/AppServiceConfiguration.cs @@ -85,7 +85,7 @@ namespace YunDa.SOMS.Application.Core.Configuration /// 是否在上传主站时压缩图片 /// public bool IsCpmpressImageForMasterStation { get; set; } - public IConfiguration AppConfiguration { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } + public IConfiguration AppConfiguration { get; set ; } /// /// 获取url组合 diff --git a/src/YunDa.Application/YunDa.SOMS.Application.Core/YunDa.SOMS.Application.Core.csproj b/src/YunDa.Application/YunDa.SOMS.Application.Core/YunDa.SOMS.Application.Core.csproj index 674ac72..df859bf 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application.Core/YunDa.SOMS.Application.Core.csproj +++ b/src/YunDa.Application/YunDa.SOMS.Application.Core/YunDa.SOMS.Application.Core.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AnyCPU;x64;x86 @@ -14,13 +14,13 @@ - - - - + + + + - - + + diff --git a/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/SettingAndFaultRpt/TransformInfomationAppService.cs b/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/SettingAndFaultRpt/TransformInfomationAppService.cs index 7c9e2e1..b13939e 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/SettingAndFaultRpt/TransformInfomationAppService.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/SettingAndFaultRpt/TransformInfomationAppService.cs @@ -3,7 +3,6 @@ using Abp.Domain.Repositories; using Abp.Domain.Uow; using Abp.Web.Mvc.Alerts; using Google.Protobuf.WellKnownTypes; -using iTextSharp.text.pdf.parser; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; @@ -520,30 +519,45 @@ namespace YunDa.SOMS.Application.GeneralInformation.SettingAndFaultRpt var lastData = mongoToData.LastOrDefault(); strtime = (lastData.DateTime + TimeSpan.FromMinutes(5)).ToString("HH:mm"); } - var str = HttpHelper.HttpGetRequest(url + $"?faultRpt=GetFaultRptByTime|{date} {strtime}|{date} 23:59"); - JObject wrappedObject = JObject.Parse(str.ToString()); - var contentString = wrappedObject["content"].ToString(); - var dzList = JsonConvert.DeserializeObject>(contentString); + List dzList = default; + try + { + var str = HttpHelper.HttpGetRequest(url + $"?faultRpt=GetFaultRptByTime|{date} {strtime}|{date} 23:59"); + JObject wrappedObject = JObject.Parse(str.ToString()); + var contentString = wrappedObject["content"].ToString(); + dzList = JsonConvert.DeserializeObject>(contentString); + } + catch (Exception ex) + { + + Log4Helper.Error(this.GetType(), "获取故障报告聚合报告超时", ex); + + } + List faultReports = new List(); // 从Content中提取故障序号并赋值给SeqNo - foreach (var alert in dzList) + if (dzList!=null) { - FaultReport faultReport = new FaultReport + foreach (var alert in dzList) { - Content = alert.Content, - StatCode = alert.StatCode, - Alerter = alert.Alerter, - AlertId = Guid.Parse(alert.AlertID), - AlertLevel = alert.AlertLevel, - AlertTime = alert.AlertTime, - AlertType = alert.AlertType, - DevDataId = alert.DevDataID, - DeviceId = alert.DeviceID, - }; + FaultReport faultReport = new FaultReport + { + Content = alert.Content, + StatCode = alert.StatCode, + Alerter = alert.Alerter, + AlertId = Guid.Parse(alert.AlertID), + AlertLevel = alert.AlertLevel, + AlertTime = alert.AlertTime, + AlertType = alert.AlertType, + DevDataId = alert.DevDataID, + DeviceId = alert.DeviceID, + }; - faultReport.SeqNo = ExtractFaultSequenceNumber(alert.Content); - faultReports.Add(faultReport); + faultReport.SeqNo = ExtractFaultSequenceNumber(alert.Content); + faultReports.Add(faultReport); + } } + var resData = GroupFaultReports(faultReports); foreach (var group in resData) @@ -578,7 +592,6 @@ namespace YunDa.SOMS.Application.GeneralInformation.SettingAndFaultRpt } } - InsertGroups(resData, targetDate); mongoToData.AddRange(resData); var tempData = mongoToData.Where(t => t.AlertType == alertType); diff --git a/src/YunDa.Application/YunDa.SOMS.Application/MessageNotify/WebMsgToRedis/EquipmentToRedisAppService.cs b/src/YunDa.Application/YunDa.SOMS.Application/MessageNotify/WebMsgToRedis/EquipmentToRedisAppService.cs index 45fb1e1..dc80ffe 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application/MessageNotify/WebMsgToRedis/EquipmentToRedisAppService.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application/MessageNotify/WebMsgToRedis/EquipmentToRedisAppService.cs @@ -1,5 +1,4 @@ using Abp.Domain.Repositories; -using iTextSharp.text; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; diff --git a/src/YunDa.Application/YunDa.SOMS.Application/YunDa.SOMS.Application.csproj b/src/YunDa.Application/YunDa.SOMS.Application/YunDa.SOMS.Application.csproj index a923766..df3fa47 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application/YunDa.SOMS.Application.csproj +++ b/src/YunDa.Application/YunDa.SOMS.Application/YunDa.SOMS.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 8.0 YunDa.SOMS.Application YunDa.SOMS.Application diff --git a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/AutoMapperProfile.cs b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/AutoMapperProfile.cs new file mode 100644 index 0000000..1eb5e8c --- /dev/null +++ b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/AutoMapperProfile.cs @@ -0,0 +1,58 @@ +using AutoMapper; +using System; +using System.Linq; + +namespace YunDa.SOMS.DataTransferObject +{ + /// + /// Custom AutoMapper profile to handle Guid mapping issues and prevent MaxInteger constraint violations + /// + public class SOMSAutoMapperProfile : Profile + { + public SOMSAutoMapperProfile() + { + // Configure custom mappings to prevent extension method discovery issues + + // Explicitly handle Guid conversions to prevent MaxInteger constraint violations + CreateMap().ConvertUsing(guid => guid.ToString()); + CreateMap().ConvertUsing(str => ConvertStringToGuid(str)); + CreateMap().ConvertUsing(guid => ConvertNullableGuidToString(guid)); + CreateMap().ConvertUsing(str => ConvertStringToNullableGuid(str)); + + // Prevent issues with nullable Guid collections + CreateMap().ConvertUsing(guids => ConvertGuidArrayToStringArray(guids)); + CreateMap().ConvertUsing(strings => ConvertStringArrayToGuidArray(strings)); + } + + private static Guid ConvertStringToGuid(string str) + { + if (Guid.TryParse(str, out var guid)) + return guid; + return Guid.Empty; + } + + private static string ConvertNullableGuidToString(Guid? guid) + { + return guid?.ToString(); + } + + private static Guid? ConvertStringToNullableGuid(string str) + { + if (string.IsNullOrEmpty(str)) + return null; + if (Guid.TryParse(str, out var guid)) + return guid; + return null; + } + + private static string[] ConvertGuidArrayToStringArray(Guid[] guids) + { + return guids?.Select(g => g.ToString()).ToArray(); + } + + private static Guid[] ConvertStringArrayToGuidArray(string[] strings) + { + return strings?.Select(s => ConvertStringToGuid(s)).ToArray(); + } + } +} diff --git a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataTransferObjectModule.cs b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataTransferObjectModule.cs index 4e45898..5a8b9d0 100644 --- a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataTransferObjectModule.cs +++ b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataTransferObjectModule.cs @@ -1,6 +1,9 @@ using Abp.AutoMapper; using Abp.Modules; using Abp.Reflection.Extensions; +using AutoMapper; +using System; +using System.Diagnostics; namespace YunDa.SOMS.DataTransferObject { @@ -16,7 +19,28 @@ namespace YunDa.SOMS.DataTransferObject Configuration.Modules.AbpAutoMapper().Configurators.Add( // Scan the assembly for classes which inherit from AutoMapper.Profile - cfg => cfg.AddMaps(thSOMSsembly) + cfg => + { + try + { + // Add our custom profile first to handle Guid mappings + cfg.AddProfile(); + + // Try to add maps from assembly with error handling + cfg.AddMaps(thSOMSsembly); + } + catch (ArgumentException ex) when (ex.Message.Contains("MaxInteger") || ex.Message.Contains("violates the constraint")) + { + // Handle MaxInteger constraint violation gracefully + Debug.WriteLine($"AutoMapper MaxInteger constraint issue: {ex.Message}"); + // Only use our custom profile if assembly scanning fails + } + catch (Exception ex) + { + Debug.WriteLine($"AutoMapper configuration error: {ex.Message}"); + // Continue with just the custom profile + } + } ); } } diff --git a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.csproj b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.csproj index cad5665..57b72e0 100644 --- a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.csproj +++ b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 1701;1702;1591 true @@ -40,7 +40,7 @@ - + \ No newline at end of file diff --git a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.xml b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.xml index ba65723..c3353d3 100644 --- a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.xml +++ b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/YunDa.SOMS.DataTransferObject.xml @@ -84,6 +84,11 @@ 完整统计信息 + + + Custom AutoMapper profile to handle Guid mapping issues and prevent MaxInteger constraint violations + + 内容 diff --git a/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.Application/YunDa.SOMS.ExternalInteraction.Application.csproj b/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.Application/YunDa.SOMS.ExternalInteraction.Application.csproj index 0c6f12d..df768a2 100644 --- a/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.Application/YunDa.SOMS.ExternalInteraction.Application.csproj +++ b/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.Application/YunDa.SOMS.ExternalInteraction.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AnyCPU;x64;x86 1701;1702;1591;0414 diff --git a/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.DataTransferObject/YunDa.SOMS.ExternalInteraction.DataTransferObject.csproj b/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.DataTransferObject/YunDa.SOMS.ExternalInteraction.DataTransferObject.csproj index d639987..fd8bd48 100644 --- a/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.DataTransferObject/YunDa.SOMS.ExternalInteraction.DataTransferObject.csproj +++ b/src/YunDa.Application/YunDa.SOMS.ExternalInteraction.DataTransferObject/YunDa.SOMS.ExternalInteraction.DataTransferObject.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 AnyCPU;x64;x86 1701;1702;1591 diff --git a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/MaintenanceAndOperationInfo/FaultReportManager/FaultReportInfo.cs b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/MaintenanceAndOperationInfo/FaultReportManager/FaultReportInfo.cs index 1934718..72ff261 100644 --- a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/MaintenanceAndOperationInfo/FaultReportManager/FaultReportInfo.cs +++ b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/MaintenanceAndOperationInfo/FaultReportManager/FaultReportInfo.cs @@ -1,6 +1,5 @@ using Abp.Web.Mvc.Alerts; using Google.Protobuf.WellKnownTypes; -using iTextSharp.text.pdf.parser; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; diff --git a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.csproj b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.csproj index 1535bb1..6ac41cc 100644 --- a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.csproj +++ b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 YunDa.SOMS.MongoDB.Application YunDa.SOMS.MongoDB.Application YunDa.SOMS.MongoDB.Application diff --git a/src/YunDa.Core/YunDa.SOMS.Core/YunDa.SOMS.Core.csproj b/src/YunDa.Core/YunDa.SOMS.Core/YunDa.SOMS.Core.csproj index d0622ef..ed909ca 100644 --- a/src/YunDa.Core/YunDa.SOMS.Core/YunDa.SOMS.Core.csproj +++ b/src/YunDa.Core/YunDa.SOMS.Core/YunDa.SOMS.Core.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 YunDa.SOMS.Core YunDa.SOMS.Core false @@ -14,19 +14,19 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + diff --git a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.Commdb/YunDa.SOMS.Commdb.csproj b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.Commdb/YunDa.SOMS.Commdb.csproj index 887f4f9..f577123 100644 --- a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.Commdb/YunDa.SOMS.Commdb.csproj +++ b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.Commdb/YunDa.SOMS.Commdb.csproj @@ -2,19 +2,25 @@ Library - net6.0 + net8.0 8.0 enable - + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.IODB/YunDa.SOMS.IODB.csproj b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.IODB/YunDa.SOMS.IODB.csproj index 14119ff..4b98e69 100644 --- a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.IODB/YunDa.SOMS.IODB.csproj +++ b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.IODB/YunDa.SOMS.IODB.csproj @@ -2,18 +2,24 @@ Library - net6.0 + net8.0 enable - + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB.csproj b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB.csproj index 887f4f9..f577123 100644 --- a/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB.csproj +++ b/src/YunDa.Domain/ProtectionDeviceSqlite/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB/YunDa.SOMS.ProDB.csproj @@ -2,19 +2,25 @@ Library - net6.0 + net8.0 8.0 enable - + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/YunDa.Domain/YunDa.ISMS.BASE.Entities/YunDa.ISMS.BASE.Entities.csproj b/src/YunDa.Domain/YunDa.ISMS.BASE.Entities/YunDa.ISMS.BASE.Entities.csproj index 7d4a8c0..e7875df 100644 --- a/src/YunDa.Domain/YunDa.ISMS.BASE.Entities/YunDa.ISMS.BASE.Entities.csproj +++ b/src/YunDa.Domain/YunDa.ISMS.BASE.Entities/YunDa.ISMS.BASE.Entities.csproj @@ -2,7 +2,7 @@ Library - net6.0 + net8.0 enable False @@ -11,16 +11,16 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/YunDa.Domain/YunDa.SOMS.Entities/YunDa.SOMS.Entities.csproj b/src/YunDa.Domain/YunDa.SOMS.Entities/YunDa.SOMS.Entities.csproj index 87af28a..2261a8f 100644 --- a/src/YunDa.Domain/YunDa.SOMS.Entities/YunDa.SOMS.Entities.csproj +++ b/src/YunDa.Domain/YunDa.SOMS.Entities/YunDa.SOMS.Entities.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 AnyCPU;x64;x86 AnyCPU - - + + diff --git a/src/YunDa.Domain/YunDa.SOMS.EntityFrameworkCore/YunDa.SOMS.EntityFrameworkCore.csproj b/src/YunDa.Domain/YunDa.SOMS.EntityFrameworkCore/YunDa.SOMS.EntityFrameworkCore.csproj index bc289f1..76e5e99 100644 --- a/src/YunDa.Domain/YunDa.SOMS.EntityFrameworkCore/YunDa.SOMS.EntityFrameworkCore.csproj +++ b/src/YunDa.Domain/YunDa.SOMS.EntityFrameworkCore/YunDa.SOMS.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 YunDa.SOMS true true @@ -26,21 +26,21 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/src/YunDa.Domain/YunDa.SOMS.MongoDB/YunDa.SOMS.MongoDB.csproj b/src/YunDa.Domain/YunDa.SOMS.MongoDB/YunDa.SOMS.MongoDB.csproj index 02d552b..ce51cad 100644 --- a/src/YunDa.Domain/YunDa.SOMS.MongoDB/YunDa.SOMS.MongoDB.csproj +++ b/src/YunDa.Domain/YunDa.SOMS.MongoDB/YunDa.SOMS.MongoDB.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 AnyCPU;x64;x86 AnyCPU - + diff --git a/src/YunDa.Domain/YunDa.SOMS.Redis.Entities/YunDa.SOMS.Redis.Entities.csproj b/src/YunDa.Domain/YunDa.SOMS.Redis.Entities/YunDa.SOMS.Redis.Entities.csproj index 342cdea..8b3d9ae 100644 --- a/src/YunDa.Domain/YunDa.SOMS.Redis.Entities/YunDa.SOMS.Redis.Entities.csproj +++ b/src/YunDa.Domain/YunDa.SOMS.Redis.Entities/YunDa.SOMS.Redis.Entities.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/YunDa.Domain/YunDa.SOMS.Redis/YunDa.SOMS.Redis.csproj b/src/YunDa.Domain/YunDa.SOMS.Redis/YunDa.SOMS.Redis.csproj index feb67a9..1aa4220 100644 --- a/src/YunDa.Domain/YunDa.SOMS.Redis/YunDa.SOMS.Redis.csproj +++ b/src/YunDa.Domain/YunDa.SOMS.Redis/YunDa.SOMS.Redis.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 @@ -8,6 +8,6 @@ - + diff --git a/src/YunDa.Domain/Yunda.SOMS.MongoDB.Entities/Yunda.SOMS.MongoDB.Entities.csproj b/src/YunDa.Domain/Yunda.SOMS.MongoDB.Entities/Yunda.SOMS.MongoDB.Entities.csproj index b83d93e..7888e66 100644 --- a/src/YunDa.Domain/Yunda.SOMS.MongoDB.Entities/Yunda.SOMS.MongoDB.Entities.csproj +++ b/src/YunDa.Domain/Yunda.SOMS.MongoDB.Entities/Yunda.SOMS.MongoDB.Entities.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AnyCPU;x64;x86 AnyCPU @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/YunDa.Quick/MigratorForDB/MigratorForDB.csproj b/src/YunDa.Quick/MigratorForDB/MigratorForDB.csproj index dc0e29b..f1822ec 100644 --- a/src/YunDa.Quick/MigratorForDB/MigratorForDB.csproj +++ b/src/YunDa.Quick/MigratorForDB/MigratorForDB.csproj @@ -1,7 +1,8 @@  - net6.0`n 8.0 + net8.0 + 8.0 win-x64 Exe @@ -51,7 +52,7 @@ - + diff --git a/src/YunDa.Quick/RunMongoDB/RunMongoDB.csproj b/src/YunDa.Quick/RunMongoDB/RunMongoDB.csproj index 71997d0..03b5581 100644 --- a/src/YunDa.Quick/RunMongoDB/RunMongoDB.csproj +++ b/src/YunDa.Quick/RunMongoDB/RunMongoDB.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 dotnet-RunMongoDB-F084529C-6E8B-44A8-BE09-0A65470BDFBE Exe diff --git a/src/YunDa.Quick/RunRedis/Properties/PublishProfiles/FolderProfile.pubxml b/src/YunDa.Quick/RunRedis/Properties/PublishProfiles/FolderProfile.pubxml index bf1de7d..1c8f152 100644 --- a/src/YunDa.Quick/RunRedis/Properties/PublishProfiles/FolderProfile.pubxml +++ b/src/YunDa.Quick/RunRedis/Properties/PublishProfiles/FolderProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU D:\SOMS\内存数据库 FileSystem - netcoreapp3.1 + net6.0 win-x64 true true diff --git a/src/YunDa.Quick/RunRedis/RunRedis.csproj b/src/YunDa.Quick/RunRedis/RunRedis.csproj index 1f2db7d..db8191b 100644 --- a/src/YunDa.Quick/RunRedis/RunRedis.csproj +++ b/src/YunDa.Quick/RunRedis/RunRedis.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 8.0 dotnet-RunRedis-A18FAF4A-2F80-402E-8246-728465033F11 diff --git a/src/YunDa.Quick/RunRedis/Services/RedisProcessManager.cs b/src/YunDa.Quick/RunRedis/Services/RedisProcessManager.cs index 286a81b..4cb1749 100644 --- a/src/YunDa.Quick/RunRedis/Services/RedisProcessManager.cs +++ b/src/YunDa.Quick/RunRedis/Services/RedisProcessManager.cs @@ -404,9 +404,12 @@ namespace RunRedis.Services UseShellExecute = false, RedirectStandardOutput = true, RedirectStandardError = true, - RedirectStandardInput = true + RedirectStandardInput = true, + WorkingDirectory ="./" }; - +#if DEBUG + processStartInfo.WorkingDirectory = System.AppDomain.CurrentDomain.BaseDirectory; +#endif process = Process.Start(processStartInfo); var outputBuilder = new StringBuilder(); var errorBuilder = new StringBuilder(); diff --git a/src/YunDa.Quick/WatchDog/WatchDog.csproj b/src/YunDa.Quick/WatchDog/WatchDog.csproj index 303ab6c..29b6696 100644 --- a/src/YunDa.Quick/WatchDog/WatchDog.csproj +++ b/src/YunDa.Quick/WatchDog/WatchDog.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows7.0 + net8.0-windows7.0 8.0 true true diff --git a/src/YunDa.Server/IEC104/IEC104.csproj b/src/YunDa.Server/IEC104/IEC104.csproj index e03f2fb..c7fa7e5 100644 --- a/src/YunDa.Server/IEC104/IEC104.csproj +++ b/src/YunDa.Server/IEC104/IEC104.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 8.0 JDYD.IEC104 JDYD.IEC104 diff --git a/src/YunDa.Server/YunDa.Server.Communication/YunDa.Server.Communication.csproj b/src/YunDa.Server/YunDa.Server.Communication/YunDa.Server.Communication.csproj index fe5805a..01b3b32 100644 --- a/src/YunDa.Server/YunDa.Server.Communication/YunDa.Server.Communication.csproj +++ b/src/YunDa.Server/YunDa.Server.Communication/YunDa.Server.Communication.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 8.0 enable @@ -11,12 +11,12 @@ - - - + + + - - + + diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Configuration/ISMSServerConfiguration.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Configuration/ISMSServerConfiguration.cs index 774ed84..c73ba74 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Configuration/ISMSServerConfiguration.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Configuration/ISMSServerConfiguration.cs @@ -85,7 +85,7 @@ public class WebApiConfiguration /// /// Web API端口 /// - public int Port { get; set; } = 56670; + public int Port { get; set; } = 38094; /// /// 查询超时时间（秒） diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Controllers/QueryController.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Controllers/QueryController.cs index 690be26..2cc3b88 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Controllers/QueryController.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Controllers/QueryController.cs @@ -51,7 +51,7 @@ namespace YunDa.Server.ISMSTcp.Controllers { try { - _logger.LogInformation("收到查询请求 - dz:{Dz}, faultRpt:{FaultRpt}, waveCfg:{WaveCfg}, waveDat:{WaveDat}, version:{Version}", + _logger.LogError("收到查询请求 - dz:{Dz}, faultRpt:{FaultRpt}, waveCfg:{WaveCfg}, waveDat:{WaveDat}, version:{Version}", dz, faultRpt, waveCfg, waveDat, version); WebResult result; diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/DeviceCommunicationStateService.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/DeviceCommunicationStateService.cs index fa35833..0dc1b8e 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/DeviceCommunicationStateService.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/DeviceCommunicationStateService.cs @@ -113,6 +113,7 @@ namespace YunDa.Server.ISMSTcp.Services { try { + return true; var commState = await GetDeviceCommunicationStateAsync(deviceId, cancellationToken); // 如果未找到状态信息，默认认为通信异常 diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemeteringHandle.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemeteringHandle.cs index dc86c63..d99f7b5 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemeteringHandle.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemeteringHandle.cs @@ -211,7 +211,7 @@ namespace YunDa.Server.ISMSTcp.Services // 使用映射字典查找对应的haskey列表 if (!_ycIdToHashKeysMapping.TryGetValue(ycDataModel.YC_ID, out List haskeys)) { - _logger.LogWarning("未找到YC_ID {YcId} 对应的映射", ycDataModel.YC_ID); + //_logger.LogWarning("未找到YC_ID {YcId} 对应的映射", ycDataModel.YC_ID); return; } diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemetryCallJob.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemetryCallJob.cs index b10020b..a804bef 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemetryCallJob.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/TelemetryCallJob.cs @@ -32,7 +32,7 @@ namespace YunDa.Server.ISMSTcp.Services _tcpClient = tcpClient; _logger = logger; } - + int _yxCount = 0; /// /// 执行定时任务 /// @@ -99,6 +99,8 @@ namespace YunDa.Server.ISMSTcp.Services // 构造召唤命令：CallYCByDevice|{装置ID} string command = $"CallYCByDevice|{device.Id}"; + + // 发送命令到TCP客户端 bool tcpResult = await _tcpClient.SendMessageAsync(command); @@ -113,8 +115,19 @@ namespace YunDa.Server.ISMSTcp.Services failedDevices.Add($"{device.Id}({device.DeviceName})"); _logger.LogWarning("通过TCP客户端发送命令失败，装置: {DeviceId} ({DeviceName})", device.Id, device.DeviceName); } + await Task.Delay(100); + if (_yxCount == 0) + { + string command1 = $"CallYXByDevice|{device.Id}"; + tcpResult = await _tcpClient.SendMessageAsync(command); + } + _yxCount++; + if (_yxCount>10) + { + _yxCount = 0; + } - // 每个命令之间间隔100毫秒 + // 每个命令之间间隔100毫秒 await Task.Delay(100); } catch (Exception ex) diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/YunDa.Server.ISMSTcp.csproj b/src/YunDa.Server/YunDa.Server.ISMSTcp/YunDa.Server.ISMSTcp.csproj index f5be76e..2d18f77 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/YunDa.Server.ISMSTcp.csproj +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/YunDa.Server.ISMSTcp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 8.0 enable ISMS通信网关 @@ -17,8 +17,8 @@ - - + + diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Development.json b/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Development.json index 116c037..6d916bb 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Development.json +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Development.json @@ -47,7 +47,7 @@ "DefaultDatabaseIndex": 0 }, "WebApi": { - "Port": 56670, + "Port": 38094, "QueryTimeoutSeconds": 180, "EnableCors": true, "AllowedOrigins": [ "*" ] diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Production.json b/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Production.json index 714f1bc..24f333a 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Production.json +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/appsettings.Production.json @@ -31,7 +31,7 @@ }, "ScheduledTelemetry": { "Enabled": true, - "IntervalMinutes": 5, + "IntervalMinutes": 60, "MaxRetries": 10, "RetryDelayMs": 2000, "CommandDelayMs": 100 diff --git a/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/ISASDataMonitoringServerModule.cs b/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/ISASDataMonitoringServerModule.cs index ccdcd1f..db0546d 100644 --- a/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/ISASDataMonitoringServerModule.cs +++ b/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/ISASDataMonitoringServerModule.cs @@ -139,7 +139,22 @@ namespace Yunda.SOMS.DataMonitoringServer { Configuration.Modules.AbpAutoMapper().Configurators.Add(cfg => { - cfg.AddMaps(typeof(SOMSDataMonitoringServerModule).GetAssembly()); + try + { + // Disable extension method discovery to prevent MaxInteger constraint violation + cfg.Advanced.AllowAdditiveTypeMapCreation = false; + cfg.AddMaps(typeof(SOMSDataMonitoringServerModule).GetAssembly()); + } + catch (System.ArgumentException ex) when (ex.Message.Contains("MaxInteger") || ex.Message.Contains("violates the constraint")) + { + // Handle MaxInteger constraint violation gracefully + System.Diagnostics.Debug.WriteLine($"AutoMapper MaxInteger constraint issue in DataMonitoringServer: {ex.Message}"); + // Continue without the problematic mappings + } + catch (Exception ex) + { + System.Diagnostics.Debug.WriteLine($"AutoMapper configuration error in DataMonitoringServer: {ex.Message}"); + } }); } diff --git a/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/Yunda.SOMS.DataMonitoringServer.csproj b/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/Yunda.SOMS.DataMonitoringServer.csproj index 428b232..406bfcf 100644 --- a/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/Yunda.SOMS.DataMonitoringServer.csproj +++ b/src/YunDa.Server/Yunda.SOMS.DataMonitoringServer/Yunda.SOMS.DataMonitoringServer.csproj @@ -4,7 +4,7 @@ WinExe - net6.0-windows7.0 + net8.0-windows7.0 true AnyCPU;x64;x86 serviceIcon.ico @@ -143,11 +143,9 @@ - + - - diff --git a/src/YunDa.Server/Yunda.SOMS.IEC104.ConsoleApp/Yunda.SOMS.IEC104.ConsoleApp.csproj b/src/YunDa.Server/Yunda.SOMS.IEC104.ConsoleApp/Yunda.SOMS.IEC104.ConsoleApp.csproj index 310ca02..12c8d23 100644 --- a/src/YunDa.Server/Yunda.SOMS.IEC104.ConsoleApp/Yunda.SOMS.IEC104.ConsoleApp.csproj +++ b/src/YunDa.Server/Yunda.SOMS.IEC104.ConsoleApp/Yunda.SOMS.IEC104.ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable Yunda.SOMS.IEC104.ConsoleApp @@ -39,10 +39,7 @@ - + diff --git a/src/YunDa.Util/DotNettyHelper/Yunda.DotNettyHelper.csproj b/src/YunDa.Util/DotNettyHelper/Yunda.DotNettyHelper.csproj index 9e3b711..3818d70 100644 --- a/src/YunDa.Util/DotNettyHelper/Yunda.DotNettyHelper.csproj +++ b/src/YunDa.Util/DotNettyHelper/Yunda.DotNettyHelper.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 8.0 AnyCPU;x64 AnyCPU diff --git a/src/YunDa.Util/Dump/MiniDumpLib/MiniDumpLib.csproj b/src/YunDa.Util/Dump/MiniDumpLib/MiniDumpLib.csproj index dbc1517..58990cd 100644 --- a/src/YunDa.Util/Dump/MiniDumpLib/MiniDumpLib.csproj +++ b/src/YunDa.Util/Dump/MiniDumpLib/MiniDumpLib.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/src/YunDa.Util/ToolLibrary/Yunda.ToolLibrary.csproj b/src/YunDa.Util/ToolLibrary/Yunda.ToolLibrary.csproj index a971a03..63c9ecb 100644 --- a/src/YunDa.Util/ToolLibrary/Yunda.ToolLibrary.csproj +++ b/src/YunDa.Util/ToolLibrary/Yunda.ToolLibrary.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AnyCPU;x64 AnyCPU True diff --git a/src/YunDa.Util/VideoSurveillanceAdapter/Yunda.VideoSurveillanceAdapter.csproj b/src/YunDa.Util/VideoSurveillanceAdapter/Yunda.VideoSurveillanceAdapter.csproj index bd02b89..4033eb6 100644 --- a/src/YunDa.Util/VideoSurveillanceAdapter/Yunda.VideoSurveillanceAdapter.csproj +++ b/src/YunDa.Util/VideoSurveillanceAdapter/Yunda.VideoSurveillanceAdapter.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AnyCPU;x64;x86 TRACE;Is32Bit TRACE;Is32Bit diff --git a/src/YunDa.Util/WebSocket/WebSocket.csproj b/src/YunDa.Util/WebSocket/WebSocket.csproj index 7d749da..c0e8040 100644 --- a/src/YunDa.Util/WebSocket/WebSocket.csproj +++ b/src/YunDa.Util/WebSocket/WebSocket.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 8.0 AnyCPU;x64 @@ -24,10 +24,10 @@ - - - - + + + + diff --git a/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/Dockerfile b/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/Dockerfile index c9929a3..ed09d00 100644 --- a/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/Dockerfile +++ b/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/Dockerfile @@ -1,11 +1,11 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["src/YunDa.Web/YunDa.ISAS.ExternalInteraction.WebApi/YunDa.ISAS.ExternalInteraction.WebApi.csproj", "src/YunDa.Web/YunDa.ISAS.ExternalInteraction.WebApi/"] RUN dotnet restore "src/YunDa.Web/YunDa.ISAS.ExternalInteraction.WebApi/YunDa.ISAS.ExternalInteraction.WebApi.csproj" diff --git a/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/YunDa.SOMS.ExternalInteraction.Web.Host.csproj b/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/YunDa.SOMS.ExternalInteraction.Web.Host.csproj index d7bfe0b..d479177 100644 --- a/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/YunDa.SOMS.ExternalInteraction.Web.Host.csproj +++ b/src/YunDa.Web/YunDa.SOMS.ExternalInteraction.Web.Host/YunDa.SOMS.ExternalInteraction.Web.Host.csproj @@ -95,7 +95,7 @@ - + diff --git a/src/YunDa.Web/YunDa.SOMS.Iec104Server/YunDa.SOMS.Iec104Server.csproj b/src/YunDa.Web/YunDa.SOMS.Iec104Server/YunDa.SOMS.Iec104Server.csproj index 85f11f1..927bde9 100644 --- a/src/YunDa.Web/YunDa.SOMS.Iec104Server/YunDa.SOMS.Iec104Server.csproj +++ b/src/YunDa.Web/YunDa.SOMS.Iec104Server/YunDa.SOMS.Iec104Server.csproj @@ -3,7 +3,7 @@ 10.0 false - net6.0 + net8.0 enable disable WinExe diff --git a/src/YunDa.Web/YunDa.SOMS.Web.Core/YunDa.SOMS.Web.Core.csproj b/src/YunDa.Web/YunDa.SOMS.Web.Core/YunDa.SOMS.Web.Core.csproj index 192eb69..4938498 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.Core/YunDa.SOMS.Web.Core.csproj +++ b/src/YunDa.Web/YunDa.SOMS.Web.Core/YunDa.SOMS.Web.Core.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 YunDa.SOMS.Web.Core YunDa.SOMS.Web.Core YunDa-SOMS-5F9F2126-6913-40F7-BB3E-166FB37D0539 @@ -13,7 +13,7 @@ - + diff --git a/src/YunDa.Web/YunDa.SOMS.Web.Host/Dockerfile b/src/YunDa.Web/YunDa.SOMS.Web.Host/Dockerfile deleted file mode 100644 index 40e464a..0000000 --- a/src/YunDa.Web/YunDa.SOMS.Web.Host/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build -WORKDIR /src -COPY ["src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj", "src/YunDa.Web/YunDa.SOMS.Web.Host/"] -RUN dotnet restore "src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj" -COPY . . -WORKDIR "/src/src/YunDa.Web/YunDa.SOMS.Web.Host" -RUN dotnet build "YunDa.SOMS.Web.Host.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "YunDa.SOMS.Web.Host.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "YunDa.SOMS.Web.Host.dll"] \ No newline at end of file diff --git a/src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj b/src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj index 026bc79..f5b6270 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj +++ b/src/YunDa.Web/YunDa.SOMS.Web.Host/YunDa.SOMS.Web.Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Linux ..\..\.. @@ -23,9 +23,6 @@ - - Always - PreserveNewest PreserveNewest diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/Dockerfile b/src/YunDa.Web/YunDa.SOMS.Web.MVC/Dockerfile index 7b52faf..4edd064 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/Dockerfile +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj", "src/YunDa.Web/YunDa.SOMS.Web.MVC/"] RUN dotnet restore "src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj" diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj b/src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj index 84c863d..6d83883 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/YunDa.SOMS.Web.MVC.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Linux SOMS后台服务 WinExe @@ -229,9 +229,6 @@ - - Always - PreserveNewest PreserveNewest diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json index 1266835..1ced9c6 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json @@ -13,7 +13,7 @@ "IsmsBaseDatabaseType": "MySQL" }, "ConnectionStrings": { - "MysqlSetting": "server=192.168.81.22;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", + "MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", "ISMS_BASE_MysqlSetting": "server=192.168.65.33;port=3306;uid=root;pwd=123456; Database=isms_l_base;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True;", "ISMS_BASESqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True;Max Pool Size=200;Connection Timeout=60;", @@ -23,7 +23,7 @@ "ISMS_ReportServerTempDBSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True", "MongoDBSetting": { - "Host": "192.168.81.22", + "Host": "127.0.0.1", "Port": "37017", "DatabaseName": "soms_mongodb", "IsAuth": "false", @@ -31,7 +31,7 @@ "PassWord": "123456" }, "RedisSetting": { - "Host": "192.168.81.22", + "Host": "127.0.0.1", "Port": "36379", "Auth": "yunda123", "Name": "", diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json index f201f9f..dc34e67 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json @@ -15,14 +15,14 @@ "ConnectionStrings": { "MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", "ISMS_BASE_MysqlSetting": "server=192.168.65.33;port=3306;uid=root;pwd=123456; Database=isms_l_base;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True;", - "ISMS_BASESqlServerSetting": "Server=192.168.65.33;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True;Max Pool Size=200;Connection Timeout=60;", "ISMS_YcSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_DataSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Data;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_ReportServerSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ReportServer;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_ReportServerTempDBSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True", + "MongoDBSetting": { - "Host": "127.0.0.1", + "Host": "192.168.81.22", "Port": "37017", "DatabaseName": "soms_mongodb", "IsAuth": "false", @@ -30,7 +30,7 @@ "PassWord": "123456" }, "RedisSetting": { - "Host": "127.0.0.1", + "Host": "192.168.81.22", "Port": "36379", "Auth": "yunda123", "Name": "", @@ -47,7 +47,7 @@ "DataMonitoringServiceBaseUrl": "http://127.0.0.1:8093/SOMS/api/dataMonitoringService/", "MaxDataCount": 80000, "Swagger": true, - "IsmsGateWayIp": "http://127.0.0.1:38094", + "IsmsGateWayIp": "http://192.168.81.22:56670", "IsmsftpIp": "192.168.65.33:48021", "IsmsftpUserName": "admin", "IsmsftpPassword": "yunda123", @@ -66,11 +66,11 @@ }, "Kestrel": { "System.GC.Server": false, + "EndPoints": { "Http": { "Url": "http://0.0.0.0:38090" } - } }, "App": { diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Controllers/WeatherForecastController.cs b/src/YunDa.Web/YundDa.SOMS.Iec104Client/Controllers/WeatherForecastController.cs deleted file mode 100644 index 48a6805..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Controllers/WeatherForecastController.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace YundDa.SOMS.Iec104Client.Controllers -{ - [ApiController] - [Route("[controller]")] - public class WeatherForecastController : ControllerBase - { - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - private readonly ILogger _logger; - - public WeatherForecastController(ILogger logger) - { - _logger = logger; - } - - [HttpGet(Name = "GetWeatherForecast")] - public IEnumerable Get() - { - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = DateTime.Now.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }) - .ToArray(); - } - } -} \ No newline at end of file diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Program.cs b/src/YunDa.Web/YundDa.SOMS.Iec104Client/Program.cs deleted file mode 100644 index 662cd18..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Program.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace YundDa.SOMS.Iec104Client -{ - public class Program - { - public static void Main(string[] args) - { - var builder = WebApplication.CreateBuilder(args); - - // Add services to the container. - - builder.Services.AddControllers(); - // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle - builder.Services.AddEndpointsApiExplorer(); - builder.Services.AddSwaggerGen(); - - var app = builder.Build(); - - // Configure the HTTP request pipeline. - if (app.Environment.IsDevelopment()) - { - app.UseSwagger(); - app.UseSwaggerUI(); - } - - app.UseHttpsRedirection(); - - app.UseAuthorization(); - - - app.MapControllers(); - - app.Run(); - } - } -} \ No newline at end of file diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Properties/launchSettings.json b/src/YunDa.Web/YundDa.SOMS.Iec104Client/Properties/launchSettings.json deleted file mode 100644 index eb144a8..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/Properties/launchSettings.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:62546", - "sslPort": 44394 - } - }, - "profiles": { - "YundDa.SOMS.Iec104Client": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "https://localhost:7286;http://localhost:5286", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/WeatherForecast.cs b/src/YunDa.Web/YundDa.SOMS.Iec104Client/WeatherForecast.cs deleted file mode 100644 index 8d304c3..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/WeatherForecast.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace YundDa.SOMS.Iec104Client -{ - public class WeatherForecast - { - public DateTime Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } - } -} \ No newline at end of file diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/YundDa.SOMS.Iec104Client.csproj b/src/YunDa.Web/YundDa.SOMS.Iec104Client/YundDa.SOMS.Iec104Client.csproj deleted file mode 100644 index 464aad8..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/YundDa.SOMS.Iec104Client.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.Development.json b/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.json b/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.json deleted file mode 100644 index 10f68b8..0000000 --- a/src/YunDa.Web/YundDa.SOMS.Iec104Client/appsettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*" -} diff --git a/src/rules.txt b/src/rules.txt index f7335c7..8495776 100644 --- a/src/rules.txt +++ b/src/rules.txt @@ -1,4 +1,4 @@ -# .NET 6.0 开发规范 (基于ASP.NET Boilerplate) +# .NET 8.0 开发规范 (基于ASP.NET Boilerplate) ## 📁 项目结构 @@ -392,5 +392,64 @@ public class UserAppService : SOMSAppServiceBase ## 📚 参考文档 - [ASP.NET Boilerplate官方文档](https://aspnetboilerplate.com/Pages/Documents) -- .NET 6.0 官方文档 -- C# 编程指南 \ No newline at end of file +- .NET 8.0 官方文档 +- C# 编程指南 + + +# Project Structure & Architecture +- YunDa.SOMS follows a layered architecture with Application, Domain, Infrastructure, and Web.MVC layers +- Application layer handles DTO conversion, business coordination, and API interfaces +- Domain layer contains pure business logic, entity definitions, and domain services +- Infrastructure layer manages data access and external service calls +- Web.MVC layer handles frontend pages, controllers, and views + +# Technology Stack +- .NET 8.0 with ASP.NET Boilerplate framework +- MySQL for configuration data storage +- MongoDB for record data storage +- Redis for data sharing and caching + +# Coding Standards +- Classes use PascalCase (UserManagementAppService) +- Interfaces use I + PascalCase (IUserManagementAppService) +- Async methods end with Async suffix +- Variables use camelCase, private fields have underscore prefix (_userRepository) +- Constants use UPPER_SNAKE_CASE (DEFAULT_USER_ROLE) +- Backend uses PascalCase for properties, frontend uses camelCase + +# Best Practices +- All AppServices should inherit from SOMSAppServiceBase +- Use dependency injection via constructor +- Implement proper exception handling with BusinessException, ValidationException +- Use Log4Helper for logging with appropriate levels (Info, Warning, Error) +- Leverage C# 8.0+ features like nullable reference types, switch expressions +- User prefers processing raw JSON strings directly for camelCase conversion rather than converting to objects first, as it's more efficient + +# Async Programming +- Always use async/await for asynchronous operations +- Include CancellationToken parameter with default value +- Use ConfigureAwait(false) for better performance +- Return Task> for async methods + +# AppService Patterns +- Implement standard try/catch blocks in AppService methods +- Follow CRUD template for standard operations +- Validate inputs before processing +- Use ObjectMapper for entity-to-DTO conversion +- Return RequestResult with appropriate Flag and Message +- Implements data synchronization using batch creation functionality in AppServices for efficient data insertion from external REST APIs. + +# Development Constraints +- No test projects needed +- No Summary.md file required +- Avoid referencing infrastructure in Domain layer +- Don't directly operate database connections in AppService +- Avoid hardcoded strings in business logic + +# Redis Integration +- Alarm messages use AlarmMessage class from YunDa.SOMS.Redis.Entities +- Alarm messages require equipment-based filtering where EquipmentInfoId field determines if messages are filtered to specific equipment or sent to all clients. + +# External API Integration +- YunDa.SOMS uses external API integrations with base URL configurations in Web.MVC project. +` \ No newline at end of file diff --git a/src/test_iec104_debug.bat b/src/test_iec104_debug.bat deleted file mode 100644 index fe658d0..0000000 --- a/src/test_iec104_debug.bat +++ /dev/null @@ -1,29 +0,0 @@ -@echo off -echo ======================================== -echo IEC104 Console App 独立调试测试 -echo ======================================== -echo. - -echo 正在启动IEC104控制台应用程序（调试模式）... -echo 默认配置: 192.168.65.101:2410, RTU地址=1 -echo. - -cd YunDa.Server\Yunda.SOMS.DataMonitoringServer\bin\Debug\net6.0-windows7.0\IEC104Console\net6.0 - -echo 当前目录: %CD% -echo. - -if exist "Yunda.SOMS.IEC104.ConsoleApp.exe" ( - echo 找到可执行文件，正在启动... - echo. - Yunda.SOMS.IEC104.ConsoleApp.exe -) else ( - echo 错误: 找不到 Yunda.SOMS.IEC104.ConsoleApp.exe - echo 请先编译项目: dotnet build - echo. - pause -) - -echo. -echo 程序已退出 -pause diff --git a/src/test_iec104_debug.ps1 b/src/test_iec104_debug.ps1 deleted file mode 100644 index e1234a4..0000000 --- a/src/test_iec104_debug.ps1 +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env pwsh - -Write-Host "========================================" -ForegroundColor Green -Write-Host "IEC104 Console App 独立调试测试" -ForegroundColor Green -Write-Host "========================================" -ForegroundColor Green -Write-Host "" - -Write-Host "正在启动IEC104控制台应用程序（调试模式）..." -ForegroundColor Yellow -Write-Host "默认配置: 192.168.65.101:2410, RTU地址=1" -ForegroundColor Yellow -Write-Host "" - -# 切换到输出目录 -$outputPath = "YunDa.Server\Yunda.SOMS.DataMonitoringServer\bin\Debug\net6.0-windows7.0\IEC104Console\net6.0" -Set-Location $outputPath - -Write-Host "当前目录: $(Get-Location)" -ForegroundColor Cyan -Write-Host "" - -$exePath = "Yunda.SOMS.IEC104.ConsoleApp.exe" - -if (Test-Path $exePath) { - Write-Host "找到可执行文件，正在启动..." -ForegroundColor Green - Write-Host "" - Write-Host "提示: 在调试模式下，您可以使用以下命令:" -ForegroundColor Magenta - Write-Host " status - 显示连接状态" -ForegroundColor Magenta - Write-Host " info - 显示连接信息" -ForegroundColor Magenta - Write-Host " help - 显示帮助信息" -ForegroundColor Magenta - Write-Host " quit - 退出程序" -ForegroundColor Magenta - Write-Host "" - - # 启动程序 - & ".\$exePath" -} else { - Write-Host "错误: 找不到 $exePath" -ForegroundColor Red - Write-Host "请先编译项目: dotnet build" -ForegroundColor Red - Write-Host "" - Read-Host "Press any key to continue" -} - -Write-Host "" -Write-Host "程序已退出" -ForegroundColor Yellow -Read-Host "Press any key to continue" diff --git a/test/ConsoleISMSMysql/ConsoleISMSMysql.csproj b/test/ConsoleISMSMysql/ConsoleISMSMysql.csproj index 71861b9..49e6195 100644 --- a/test/ConsoleISMSMysql/ConsoleISMSMysql.csproj +++ b/test/ConsoleISMSMysql/ConsoleISMSMysql.csproj @@ -2,20 +2,20 @@ Exe - net6.0 + net8.0 8.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/ConsoleISMSMysql/Data/AppDbContext.cs b/test/ConsoleISMSMysql/Data/AppDbContext.cs index 54ddfd5..fcac8dc 100644 --- a/test/ConsoleISMSMysql/Data/AppDbContext.cs +++ b/test/ConsoleISMSMysql/Data/AppDbContext.cs @@ -142,7 +142,7 @@ namespace ConsoleISMSMysql.Data if (!optionsBuilder.IsConfigured) { #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings. - optionsBuilder.UseMySql("server=192.168.81.229;port=3306;uid=root;pwd=123456;database=isms_l_base;sslmode=none", x => x.ServerVersion("8.0.15-mysql")); + optionsBuilder.UseMySql("server=192.168.81.229;port=3306;uid=root;pwd=123456;database=isms_l_base;sslmode=none", ServerVersion.Parse("8.0.15-mysql")); } } diff --git a/test/ConsoleISMSMysql/Models/isms_l_baseContext.cs b/test/ConsoleISMSMysql/Models/isms_l_baseContext.cs index ba78508..7cf9c89 100644 --- a/test/ConsoleISMSMysql/Models/isms_l_baseContext.cs +++ b/test/ConsoleISMSMysql/Models/isms_l_baseContext.cs @@ -141,7 +141,7 @@ namespace ConsoleISMSMysql.Models if (!optionsBuilder.IsConfigured) { #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings. - optionsBuilder.UseMySql("server=192.168.81.229;port=3306;uid=root;pwd=123456;database=isms_l_base;sslmode=none;maxpoolsize=200;connectiontimeout=60;pooling=true", x => x.ServerVersion("8.0.15-mysql")); + optionsBuilder.UseMySql("server=192.168.81.229;port=3306;uid=root;pwd=123456;database=isms_l_base;sslmode=none;maxpoolsize=200;connectiontimeout=60;pooling=true", ServerVersion.Parse("8.0.15-mysql")); } } diff --git a/test/ConsoleTestDotnettyClient/ConsoleTestDotnettyClient.csproj b/test/ConsoleTestDotnettyClient/ConsoleTestDotnettyClient.csproj index 35c5049..31cfee3 100644 --- a/test/ConsoleTestDotnettyClient/ConsoleTestDotnettyClient.csproj +++ b/test/ConsoleTestDotnettyClient/ConsoleTestDotnettyClient.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 8.0 disable enable