From 8159dedb5427184568c5398c6807723695bef1f2 Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 10 Jan 2024 12:36:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?change-=E4=BF=AE=E6=94=B9=E6=B3=A1=E5=89=8D?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91=E5=92=8C=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=9C=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aucma.Core.BoxFoam/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index 6eb8669d..bbf72b1a 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -202,7 +202,7 @@ "EquipName": "泡前库Plc", "PlcType": "Siemens", "Enabled": true, - "IP": "10.10.93.41", + "IP": "127.0.0.1", "Port": 102 }, { @@ -226,7 +226,7 @@ "EquipName": "foamMachinePlc", "PlcType": "Siemens", "Enabled": true, - "IP": "10.10.93.180", + "IP": "127.0.0.1", //"IP": "127.0.0.1", "Port": 102 } From 1499c24f7de5940b4158d53047a2b5c73cec712b Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 10 Jan 2024 12:43:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?change=20-=E8=80=81=E7=BA=BF=E7=AE=B1?= =?UTF-8?q?=E4=BD=93=E5=8F=91=E6=B3=A1=E7=BB=86=E8=8A=82=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/TeamSwitchBusiness.cs | 129 ++++++++++-------- .../ViewModels/MainWindowViewModel.cs | 1 + .../ViewModels/RoadKindPageViewModel.cs | 16 ++- .../Views/RealRoadPageView.xaml | 16 +-- .../Views/RoadKindPageView.xaml | 2 +- 8 files changed, 98 insertions(+), 72 deletions(-) diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index decf85c2..2f9c868b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\ diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index f38a35e7..0f098310 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\ diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index a581a844..a3d7d5ba 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ diff --git a/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs index 6252ad5f..e7bb1fae 100644 --- a/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Timers; @@ -148,43 +149,10 @@ namespace Aucma.Core.OldBoxFoam.Business try { //下发PLC清空产量信号 - #region 清空PLC产量 - var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); - if (obj1 != null) - { - if (obj1.plc.IsConnected) - { - var flag = obj1.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空A区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc2")); - if (obj2 != null) - { - if (obj2.plc.IsConnected) - { - bool flag = obj2.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空B区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj3 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc3")); - if (obj3 != null) - { - if (obj3.plc.IsConnected) - { - var flag = obj3.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空C区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj4 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc4")); - if (obj4 != null) - { - if (obj4.plc.IsConnected) - { - var flag = obj4.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空D区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } + #region 清空PLC产量,写1保持500毫秒后写0 + ClearPlcOutPut("1"); + Thread.Sleep(500); + ClearPlcOutPut("0"); #endregion //小时统计报表数据存至记录表，清空小时统计报表 @@ -246,35 +214,34 @@ namespace Aucma.Core.OldBoxFoam.Business { foreach (var plan in planInfoList) { - if (plan.PlanAmount > plan.CompleteAmount) + + plan.ShiftType = 0; + + bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; + if (updateFlag) { - plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; - plan.CompleteAmount = 0; - plan.ShiftType = 1; + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; - if (saveFlag > 0) + if (plan.PlanAmount > plan.CompleteAmount) { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; + plan.CompleteAmount = 0; + plan.ShiftType = 1; + + int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; + if (saveFlag > 0) + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); + } + else + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + } } } else { - plan.ShiftType = 0; - - bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; - if (updateFlag) - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); - } + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); } } } @@ -284,5 +251,49 @@ namespace Aucma.Core.OldBoxFoam.Business log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}"); } } + + /// + /// 清空PLC产量数据 + /// + /// + private void ClearPlcOutPut(string value) + { + var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); + if (obj1 != null) + { + if (obj1.plc.IsConnected) + { + var flag = obj1.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc2")); + if (obj2 != null) + { + if (obj2.plc.IsConnected) + { + bool flag = obj2.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj3 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc3")); + if (obj3 != null) + { + if (obj3.plc.IsConnected) + { + var flag = obj3.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空C区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj4 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc4")); + if (obj4 != null) + { + if (obj4.plc.IsConnected) + { + var flag = obj4.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空D区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + } } } diff --git a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs index c0d82566..c4a5f281 100644 --- a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs @@ -136,6 +136,7 @@ namespace Aucma.Core.OldBoxFoam.ViewModels case "Exit": if (System.Windows.MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) { + log.Warn($"系统退出，当前时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Application.Current.Shutdown(); Environment.Exit(0); } diff --git a/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs index f65842c3..f8673ae2 100644 --- a/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs +++ b/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows; @@ -56,7 +57,20 @@ namespace Aucma.Core.OldBoxFoam.ViewModels { OldBoxFoamTypeModel model= new OldBoxFoamTypeModel(); model.MaterialCode = item.MaterialCode; - model.MaterialName = item.MaterialName; + + string pattern = @",(.*)"; + Regex regex = new Regex(pattern); + Match match = regex.Match(item.MaterialName); + + if (match.Success) + { + string result = match.Groups[1].Value; + model.MaterialName = result; + } + else + { + model.MaterialName = item.MaterialName; + } model.ObjId = item.ObjId; model.Status = "1"; Shapes.Add(model); diff --git a/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml b/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml index 13a5726d..b0b67600 100644 --- a/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml +++ b/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml @@ -166,17 +166,17 @@ - + - - - + + + - + @@ -198,9 +198,9 @@ - + - + @@ -208,7 +208,7 @@ - + diff --git a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml index 25fdb814..c198646d 100644 --- a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml +++ b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml @@ -206,7 +206,7 @@ From e4f78599c7d26f5316196f9280dfa2b78399d61f Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 10 Jan 2024 12:50:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?change=20-=20=E6=96=B0=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E7=BA=BF=E7=8F=AD=E7=BB=84=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 140916 -> 56 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/TeamSwitchBusiness.cs | 43 +++++++++--------- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 152 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +-- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 601c80d9..d1d06cea 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index d57995efc7954aaf5f62c45db37abc2783259951..49f1a9f2a16243ec53dc4768f820a9d0f0ad8241 100644 GIT binary patch literal 56 zcmZQzU})fBU|=|^V0k`QJt^?yH;p$}0$zOfmZ@)@;>Gm+NcFk!b0uBuKqU=83l8&bK_7;aF_I8)Mdk9p{Ia@hr zS=m8WmTbv6$T=rD$d=`tv;Dv7sp_uo>E4;$JAT$r-e7iSx~pGR=j!U}y?1Tjboz0} z9e2ieUiY@cYbRHJ`M4JjPW+E;pZG?5%RgVV;#>7UecPrTM{axIY0r4`@d%aw_c`32 zw&gK1`}>Vvf2KCK&}`3S?Zx@VV5VEEAF9na@V4J=HwN`iuhFXw8m;C+b1*ZRtSp4rsz?rsdWAkaPp+DU=3xmN2@oDQY@ z)*u0$R{lZLKN0kZ{zivrc6_x2vc}Otqup?u>@tCL za%X`&C3iM1O70w7@2`?ed3rjdAc9_}-#LI%W<~C@Y-0snD%W;dVkP-^E&vk)D{&D6 z=i!Kas`M|B3I&~ zM6SYBCdpQ3ev;UN$g+ubl8R)TX_WF1I-#pUm=d}M7bWy)T(2oBQz?PWi!&GrYqnrS@y6~UrJ+UT29bPe_ffYV@a#PjRMl5D+qtUKt;_iEjP$FgR7 z(CD>mEo8ImXLK${#k)n*m|_|l?oAB$X52}(x8QogSa9cRgBsfV0ry9v;oOSIX!kj? z26$@#@HRZZa~S~o`M)HzsiKet&{yGkymEW6gEp)^zZA?nm_!Qf>HzG-*m4%I7_1#` z^p*qjbWSM+eN6y;EuK3iO>?v@J2)70O$A#c?N(_8+kq&$xK1*bb+}V~T92!Ah?fMj zB;gUVl*l$POsV!8@qBDtk!1%OwZUQ!gYar?zLD7-97hZ9c19%){bR;O^ahW;$KiRrCUW6$9V3t<0}O01CM1wPzGN@C3lVqQh=fuDe0%`# z33y%{Co}tvK20!2>|>_$SQ^n28IcsPC*k=SV8Nnzzwm z?lO_JH1`Go@5b}4l)(|CUS(&72t|5C7~GX9E)%IAP1WWPsZvmv3S{Nw=ay?B22GD!JAv(<1VWJzV>4vm28=T|HPcsq)S$XPd)3KgcYt_oz~XyT~>(5K<~MPmVt>Aa{A+tD>1;_X$5f@_8$ z-j6#q?%#`Rgl^pBbxbX{lu8%FovL~dFcZ?|J{`|XmGeSpuF;x7ADOKmK7&!E!C~G- zv2}&3F~nKiNzQd#<27qk#V}Ml+(fGoQN2XUZlYvR1;ZeT38iE^$G}Cl4LrYLtTOBa zhbE>EO;>BgHo^zJmx*Xe9|!=?<9WQ+fdKc9^#_fG`BrBZ?eP2r$XAo_3E+mS`-&GrP?!`+pKR8z7(qZCQf^dT`2X(|oTA+GEIVD$>$yj0`9fUPD~OMg>-6a8q%NyGeGzbI zTrb9Rbrq10%WAMjN9MFu3foHpY%j(02!qB1xU2({hvpn=53Rs01?nCUnwmq!AwoK{ zUlss=Ii9QQ#C_c3mc(Kad_{ojm3V%ra`mOogH|=NgN+&uy{oACsJ}2O`W<;3Eu&X4 z8flqdjpwozc(=Mid06W*1!IWC*XHF| z_Hhg?mp3w!H!+eokAWngF*FXNQSHM(Lg^NLWoM2epB`*8p*51XFp{@2lDFZ0sI;uM zn`nY)+Jd!0Ys3YSKqGB61zsQ1ZldAIBgDrwZ)Y6uU>xtnz080KHf1p!8P;q@$3p8h zs!4oTfal$KE>}h?JpF?(shA6JNSV#ci4w}R39SLVCjjtXJl|cGF~>*~pEr}8o@qFI z4fruqyvui;+WR=Q_v20#^#i!>DM`&Oi{a;zi**s zCL*d?w>Db?@}e_wPabnu9+TF>HsvuDq8|nV8YzAT7uCfd!By5x zb(>un(6$@>tlz00YCwpK?aqM%&3ZGmKceEg*M^?v(EDv@E&b0TWkMoDhtJ{n_7drL zJFV6+^hf9lLvtH{?=q_2!@aBlwy2uzLk3d6(`pznR!H1hkQu+! ztZ5S(Kq$0^@cRtm4;aE9;$E+qWqm_5R|;cTjf%`0I-E2@1O+YdH#z-3;`IL*_p-@{ zFM<(EOD>6ILHQHLBL(G8@mw289yHa$+@qu-8)-mWzQnJku6w77TgM1Z|pcJ8BSwE;}XVe0k3;WZl1Uo)N^jOTA~FO`MHLzS~4 z1`4Xv{@Wn!zr*uLvVi8mECpu?Y0$*clR`0q#`E_9o`1me{<6CAP^-TqxDCaCWhN2rZc#<7H?CQGasnm>q2y z2r9f9@1Z56@EXnkGMeL#&oldY+)G#a`-*%Kj=$VWn!8c3r50Mh2f%2qCO{vB=c8r$ z6~_tq^Yg|OY`vS@aDPq;*l86_Ne{0nnwH)P3~B}LR8>yI{n<+bHQyi$z;SSGZ+I5i zCk4<>#&g-cKasC2uf-KvrS!ebtb4z`*coQRO4shxpc&lrwvQ$7M5kqqHQAawUYQ27gnc! zW{~<>cs^2AObV&f(73+X>yaJuC_o?%j;1l49bh_VJWTBln!+|ZaZ*V~b0#XB-JLed zD@D_o&J8fF#B=G$tSF~`w?TTL=EFumT^-c4i>FbY7oa*H&+}DtZ=u_1Bg1klxP*kz z;^a)wY|jKQn7v&PV7L&^rIS99jK)x5xhVxFzUXvOfb3#Cm)dFPYdf@sLWw6E976_l z+Ss9mUMf|b)+K~>4R02rOb^WYGS{rlw`uoa9fKKTFO|Sxx!9FpkPbo;H!SsIFyz*WpgZ<9ghmQ>_Wo_%LrZ8lZL^ z^=y&0-kRcT5vt;=<%MahMB9=_)7WlcY&SBtn{cn#xoK>WPW=$=ekQ36Z?iSFX^M6a zMbnsWW=zuE--72ciq-%|VEq&v+e~UW_fQOtW@T**{0f)5b_Ffw2W211 z4hfZv38@jRVFXf!*W$TyE(HkC!}5l?5wKuV%$w}gtavg&wGPh}2h4NO%8-<~g)W#+ zNXyK@ijDJnPFw6IHsHBgvBk-Krer;|FwKPu)tSTZ%fst@*~loQ9^a1ViY0?g&1npn zZ>ma^P}>lbUAYad5j-Y9@K`)oEEyhx3?}+;kW<5KeKagvB%Vg~xB%7T@myvE$TcQr z6htq5{zv|ruOKxo)pMn6P_y$ z%bOiD^u+dXv$wb`Ly#^iNSA|a44VTCTku@5@AENa(BiUAdwAm>V1X_-RBvw$Fm1zg z#X18_1R^gfsqCG93p3E5_D6!nh$v>CJ_;=xXx_a`R9_-*yMV($%4cCwtdnte}oI5$a zUAWVrad-9fU~2JDD*vsfWhVmZ^!9Li(pc}sbD61KUeq#556j3>#gc8LpY}EvLF2eP zz_Aa{WrhfhLu^x1yxZbt4N_J9P6z4UgXfA35~W+k4wOq6r5-Qh`vVM5#&g9P9bsVO zno8`8X^oP=y+P{tRZl(Nt}#?iVuhdY&?x9go)V<~R6JK4F2UrMb$lt-Z6~zP2GwQm zX+hdEc&<8wbctsT^8VLs8I9V|fs1Wy6r61od1|N8tL2`rRMy-d0Q_D&m+n*IS`h+l zHRlfwjx^}sl(>@kcDlG)eh&ojo{r~IZFN2&(deu{!I5y;SQ=3+Kr}lRqVh@|lT^HJ z*8@azc&?}eR5BtZ8}#Vxw=pHBSaBx}n=+J9g{u)DJ1`2ed{*1Xa$5dN6l;l5nUa^p z+{ZB^dbRlg*+D#4)T@VtSL^|&OJjmcr=*2UPKaO?+L%4>8OZ?leGHz`e{#Re*AolEjR~i%^@f$l#%a z=Zf=9&ZrElvM@qOjvZ|GArjh=hu0G61}GlFbLk=@H$%*x@ru{!O1AkGj0cOxXef^+ zV2mTYPS@s^s$IPRR3Fc!J|=>E3Q)=1yxGnz!pQGPqQ1enXgE^lV9Jrw5*-BK7x7$i zP$>D@URUN_pp6-n17=9CB9?h_~`b1E9z7 zT(MI28(8PV2E;74*2Z$hpoi_RXfL93hG_|&n`mQ+f`V(IJV2+e}=d`8w< z^Bq7uxRA_EJH)r}Jcp5+ECCJlnSs!rh398hn_9(j){Rz^R=ByPwbMLX+T!@O_^Qok zGqC62PEG7{aj&}g6h{UZ%P>7lD_w1&i{snI(Y5rR#~`KceLkM6){QvG5$Z-9X1s2^ zAOQM8JXh^kQ$US_&wP_Zc}?+(BI#_Qd~VE{^)1z4zldQ-ow?;;9`JlS;W|qM{XXXeg?M!T1IbVEKeG zEXLaxm11k;3}Mb@qLYOvy? z4k^04Vh43DXL2}uIikk(z5v(z$C3_KMw2#9)^bL{q3{~T2Lcoy#B)V$Gj}~|-&S(u zBYjQ08T$}pkRI{Fc&^wpV{`zG4>^E1g84vN6tkkm zYj!tH+Fjq=WRPNM|0dJ|gwXtcl2iH=?$maF8h83{C9WkOPt%>7HJ09>bs{eMeG;zH zkv`6SpmT3jxsEwg#3q60wxP<$(kOVRFuYT7FWV%d&@In#Gz!P*jDsp-*^-C1l?yJS zM>>5(rFki*c^U3Y^ry^27u!u~UvXw~MQ$B(f65BLb_PJZgvyv+lEW93rgr#J*1`n- zBgS#(pi=$_b4%_V?kcI%RU9A~M+=I+_C&DE4i*xrEWcxgL_*t^F0KUS?In~eISWv< zwX=Y-CF`;G&a3pk#)XRZ&M()Vc|~6DnJ-<1hHe!5wX=M`E8D_E8)~coaags#Q>Ci+ zcb2saOWHxH($qUBOXo0Zdy(2b#k*|A-2Ia&Feh;5yaM-91;tP>Sco1I4_2Wyq>~h+ z(skXTkjC1Dq=a({BRLg!`j2iGIsaN}zZZ5AnGpEro48iGPxhof`hF75i=tr%{l1=m zXKK9coEh7b?I`G_Drk7p9DP5PzUL>w(c@b8sEIq^iDXU_uOQe8N_0+ynjfc}(a&@I z{n;=op|>l{31IZ=BveOo^+~^Pa|t;yBu~mp$3W`QVMZq5(4Nk)a zR?K2ii^8q05Y9W4h9cb*jU=8b^d7}@5)vA%6&*ShM!Gnj1U%yr$?KC}3xuvo2bB|T zh~gE|V5F2W$IDQV8=^sqC%sVE%c5cV;1voG&mTEeB)2%GaO>iP_`nor814LB5oU^c zbu=c_TlO3f3U#&%mG6Y7m#W7515EmOt&8D*%%*ow$I1;$PwkkN$n8sv{ z@Wf?GJfgfu9LZChTcSMpam0^1g^$aJ!slvXGI=Lo>=ag2W(AxZFbWXQP-)@9rY%m6 zJ?o^&iR+z^T)d!4XtSG(h{lB~!Eg`UPE(vKqe68qpean88+Lb00Vd-_*t;^iJhyAm zNtYtVQ+I2h6h?IuVu8<2u;}Y`E@}Ci+eK0vY5fONNR^f!k_ALzRDS_CWa!OyI1;rspE9_wtJ`{&Gxox1F~P~(|08&`F>BWhx3@t z*K=HKcH>HMRFY71!WXMAdeuqfpT*TF#Z{#u|CraR+yf~ExNsNTcS3Ln$O=n&JEw18 zCi*QyUrXOtdf&-wOJk1SpSjEPaA|^qTWo?eXDeqro3p)I?-;#5%k`JG89Xm|myyp% z3VdSj;E{fwKz?4n_LRD)q)MS@QX)ptMwKVT#BhbNoP$VQc^fNT98&+qB_#~l9nfQLUC>MONPi~ zgvi@wDBu;zfM)Z;kRZ|`P>_i@6}wXI^HB9`Qbt&2#0Oj;_J?hs_X zgE%i}!^p4{shvV<5ninZi`fKR3N5K-7YM@UWVs2BkrRsLli1%S)vl9RxkkUw6-Aqy z^V91~X~T_VXRiH6pbWaC1n+uM*JvKoWo)gg7J{?4JSU{D9CBb?;1T{?)m=;ou^TVbG#6=FhXxH z@!n$9#Q7Mb&sTb%yW(fd`XQq*r;Eog>BP^{FS4x*6lkUQF87_4zc0GBqW2fT-;ecA z<(HK!;-6^eAi1KV*tZN1QkZ3>NP-OcXCjhUCrEM-C?_e@Rl`H=H^ZQFcyQtT3Q^QE z`R(S#0|%ImbNQ9>0Yo7$FTSQpDtqLi5SK+lOf4)dn(XXU(2gF=fKNht}Rnem%qdJ~Y7adL8^!UY}{0@eEvl=+nwhTG6fanDlk zY11veJB{DbrdWEuP(4EeG72_f&){!P6(C^R`jU3ucc4)4TVMOj=B;RpG zK`#!1x`7jY4b$L_N%To7oumfC6OxRg)zp=MB!}a!F-kVAur{k*{>H*3`XgtO-f#7 zVkApnrM4>DOtM_1Pa>({Q=$h9Ly4_vA`vnGrB8y6WgifidQFy!+FX)iN)~xmjPyZR zG9R32A$>YotpDhNEb-zi!NoPgRb;+@`wGPP0W7gU9`_%_{W{!#2=^bx^%-10g6p%m zK8NeF_;4JA;0{#?eI5ac5ZN}w2z>$X@ps&nC6+k|a@_lIE!kM{=tAqe*;rA*`#&{S zR5-M;;=Yn>s=)|iq1NrfK9%%MMQ3_spsGwGR5E8FcPVGi##QEKrC#d~;98mH*)S20 z_>d;Ix5|0E$&nYq!DY%f)s+V-;S5Rz7I#Q}Hd5TJG5tM}7z2+h>h%+xiw zk8t*G%^sGPA?FUlq?-1t!4QKyOwBg1jL|dRb8Z)(h_pS-EzLO9LDIBDgS?hOQll~+ z$htB|sp%t@P2*Jx64TbGHH!v$g97=wvQ2;s&3doX?;Oy_>t=OxpwE1-hNHeSvyrT$bN3$vIKTS+QpF= zv%MZhQpPiMwQkh63DkHtF&>i4hsSFC`wWPBrVd>B_lIU+X~7bxR?nI_lL{(y8vGUo z{y8P%+^8_Iw|8;S#DO|EA!o$?R2xBROxqX}W$+R=?euaNL^Ni`0DUcn=DY0Zg}U?1 zZQ4=o=XM4_n|8|2o0ZWJb>UgxobZzm(#fH%9m~=l{$kp&#MGSM$qCTIb z!POl0rbWg!rQr3DHQyF}Z0z76Z^wNO=C$`WoNu0SIu9oVP z706OYQ{|a$e9AhJF9|Fy;%swOQZ+31DbS_PYbt=Yy?dnk=%!Ag!F14BdgdoWD}YZ` z0AEzSFLQ#6Zf2$S$Bt(G@rObdGhSBEW*FN2xR21y4u`gs$`r$!s!|Uuqg-?Uqv*@B z^)mS{ZPOjr-11h*wZ_n9aUZXFBI8jEUDzbN7OE&BWm9*BssvEQ!Js8#Tdr$98JW^Z zl=`1Hj8#T`z|dIqp#jQI6dxC?7`1Dl2NclpYC8e#8@thYHiRFsVIqm5V; zMCFdma>kMtRG9PR6fH3vOElPQm8SEJ77wKcjMqUkl%+I(f-5C1S_cx4ZtPWMG8-K&4Z7}DojR4Z?e07zX$D%>I~t7v^DUEFa35oSK92jc zxoA?TKgskzh5Iu2G)hn|Yg_C&NOD>XPA2FafMa6Vi2B2JlG3m(qFQ#JW!|V~Sr)HK zio4GR%0jdCB~JRwxKEWN{m^2q zH+UF+`0#%$seGfXrv6o?{-d}*V(y}pAiu`xeI57Zau=n@{{)l&N!-h`0IZo~8aW5OVNNQ^SBnqHO zC|YcX={gI?pqjr$)IZ-~6u&qg3YnHryKbj&4uz9}LJ^sf{4%5Xl@U;#pYSSR^Db)4l*BHgG<6i39oQsb_;aTtDC^qCwte#4#P*}XZgc{LrGNRwY zy=;;pWu)I2kWl)*PQdu@j5bk%C%#uwqxl_1^Sij0HIx>O+4YEl25sOnAgoY$bZ1UG zVQJ=DCo$Wi&^qbg=cNAt_j<*unY)V1Raj)*7~$U4l04;t&gz?-?jPY^Hm3Ah9MOi!y?ygbDbsY9MZg!p4#TT zR84BRZ1Ib3kJV`YoY8z6_p;d~4W+v{G?QG1PN2t(wvbb~!zbEnkf|-WI?eBJntzFV zsn>Jb0N6N6KDOr@@LoLE%qP_AY{4^~LUE6*PVm1t!T-kn|Hf0G>Y~0|JOwI9|HqyJ z6%y?!u(UYl9!OvagO+fBUK}+t>S^2_Z{zk8>(X)h@wv*H)C{G~K%ORyn)vL(Axe&X zN{?MPHmpwdOqFWI<7-u_)DQ7?<`mb~i?;@VUVx)%EN3qbOS^-**+%0;)BI=-M6tN- z)EdjV3QKA8Sjdg6-)+#OsQIv&^H&F>c5Z7l=P5K5J-ySosndqmCtui3NW>ngM?)qP zys(mefl9k{H5n;p?au+E?rKVE3{tE@wgG5ImqU^%tc!&dfd(K}V9B=2l z&ZbKgu+o(Z3rwx<_~SY`4iUN(H^3pqimlQ*D(aLoL6P$iRhxDhgF6H5OX&^V4+{{?2X!#@Z8DQl)*$LYkt6>p}9dKV{FsvNhJ4yp;4?>D9ZH2Hdoj)2Ig#LGyaf*8v4*s&E*YF z8ZX}oiB5eZr%v^;V$PE_mvvT9nzrxEMCJTrRLT`|-b)$Q;;jZbWlXjQmVY0Eb*Q4{ z@HmC0%)o$aKx`qJc44O1%BS-RJjEsx`52H_qT!fD<9Pz(A%llKW!j3IY_pTf4BHIA z7mLb)Cn=sQ4tJX!GsI($gQ@ha-~+cYD(%fG?TUSppLPb-1S@8S_elW;c3q?8uvKBH zSO5CmpDqUNQtnrGF>vzO71z6p<9kO>H8;H+swS|hDhE?KU!S5< ztvEcv9x~QlrC7C{gYxdAIDMK*v+7LCC7Ly09h5a&Mq_0B6r^C-Mnb_Le_5VWEG>-t z6|hnhT`uJzuvT;a;NVDu{v8>Ya>AuyJ)mHf8CpkB*_}5d;jytalG>7xlvmDJj>YR} zT_LHc+fq42N+h>xo03bc82e7jv}_vVAQHc382y-ezbK9pZHSVO#N5X*BYLBGg{Y$5 zsATx>B*LE6RIP5R)JiwmOEG0KnCWyenxO*=b1!U*?SAb5DFZ=;sN%egGbF?E)f@(gsiJC| zd65Xaqtg=Ts?;kEAtd!SPTGWaKAF5didB*q&vZKd!z%sK?LR>lpkOF(cI6F8K^`a> zia@+gIjR6wEF%2|RzsSDV_B_U$9{e&rUyN2gdhc5Y|3u^%Xtp>w2&TV45aIQX0_q6 z#o+mzsT&mzt!;Ak;e~xH`AY4vXgo(VaM-5-J(~g1Nz+v|<8efl&nu7P68Cf(-1Ah9 zRc&+P;7H#CTk^&n>9Wi7&yyJGeN0@V+gA1cMJhAjeEd>!^XR(Ox7V@c(S*rfZIEsU zCWq&3=x$KU@+C@^6?@dUC?NneQ>x@e8t!-&-$&>AI@fG3V?)#H=0@|Z)6NqT}rKD z^5SYR7#naZoz@&jS@?75G%}#AR64;obAoTd{r+mL+d#Z?mJVc`qfON!yn|DuLf9TL z#f(gV+6}YTqZZ~Oyb4C^K~yvSE`~s>aTUjKmg&qKY(E0)`FZwA0Pj%(s9NqVJ0|rE zCx_QyP(p2VRLg0H2QCM47~<+wOXGbC&*;)1@2DvlcEMP|pzu2N52(~DDv7u?R>zGe zy9ey6p@v)eYSn3fh|{KlTE)%@`3M8F8hn2o!I&}4x@~#x3;eQR}NO<*(ILg&2 ze3Dc66z=rjdvTSiJe?2C9)@Qv+Q5c_tybA-IOHtO?OC+hT&s1WNhSAyOFN$*h3f=d zD{y@g7`}w-%ecOR>#Mka6xWhH;Hq>feM_OYk*&7EUeJe@xHt$in+njV}3K?I%f}Z zcqXvMc{*^Bn5n@aoM+;SiTUfmx!fLhRc>n!y9DE$1dJaCjQ5w#Sx8>Fr(d1nZWAd+ zd{|G#;PY6s{UD}Dm420=2T!iUzTro^P4NN;q zT6Jtv9Xte?U=ooP+w_TJIqr|VoMTuX9E0*}rRLBu*t)b(!VL6Y+-R{lQ z#h62A09PYH0&op30`O>DF#tac03-M>ah=X1=D1m9;k5uwOk9VHn7AHSjESEcn+cS5 z>zUbeTSF7Za_`fq2{yXtgherN13+sgZcH%o^I+n;&GEBhLpy$^ytpO7#xH=4(iJw> zT&n^_YB1J`E!i=&0)8vYpLUEA@Y@o=zX9OmIXL!#`wo3ZbG1s^JXY;N1itrP#Znfq zv?{^UFOFR=qOP1q<3;uurs{=uEKT_`kznGN#?BXE0>g1~7wy&W@pyqszu8-VSuS?SD)H?XQiCmK14Ab9}APJ~lx6xCGi?2iozP_~mqrt$;s1 z0RDso@ZSLNGHZrtp;(&ZY=!iRj8rnCXkjX+u}%;b?mKx-O0f2VqiOQj{*CA02^UO zU$H=zXj+c40BX9kEo@WQrTmQ z=~R_}fSHpv?CA;S{%jfYB{vLTnqzd8FExffi#z2@JpujC0e!sYm-fFv>GX&?PFD=g zF+-9UjRZsA21DO{j@1<-2LeXs6O8-?7#Xj%ayye~!yNjNQTA(fxLxtEz&x~> zhfacrzZzHC;(u(k4oy6eDWux5J4ySY1k%3-(($GV40S2Zzu-frGNMDz z@jT=!gwJ4v(s4dBf$$%I@c$1U^c8E*3Rrt~g0+7HYyVds_7&XcFx=p!1pNND>E-m;2ZyZ1BLTl0nT?PaGn61W=n6rKRdVRhT~~WXI4js+7mN-@|d|dg*jST&$nu88T~Mj0mN~i!9{J! zkKl@RS!W_pS*L0p9f|vx@ek%uvivL%5keU(eJ+9UECkwKl8arqA3g@NZ*-xtxyfGo ztfljLPWubElXSkANc(K0UFNTTIS%$vV)+t7`!YlON&?zBfHqYkmWl^|sMNp8ssAXa z{$q*M&qeBG`;B@v=+FlX56KLDeJXqQnSi_Qj?Bxy#(2KYcz!&AXC?3~*TEr596!Oy z|0E~>Q;FoyL-J+&Bw$op@n8`J;HMeD&oF?WO#nC_07~7b z^5+=M&oi1|NT9g@Xv$_`EDpUVM;1WFIhaJr>>G^o7a8R*B~V^C9!k-KU}I`*lZlgI zLWvT@GAjlU-kABbLV4!7B>qpD<1-h<}>E zc?EEmdhp|_(>Ga53*FEcM0cmU=0_dOqELN{QArd2X9-kS0#)VevAhSjD71ghXupj+ zjnn=jf%Yn(EmNp1>0lRy={t<+FB#KcB`{rGrTjhA!Y2D}y#+VP+3aE)?z0|fJb+UH z@pi2-1elDCXQ%Jpi2!@I?A%AuY6I-kZ#Mc59A2ZxxPQ$!cQDSsN#MMuitIE_v*VOb zDVA%XK+;M`v_2uE)A7w2m| zBer!Uw$!{1=F!s>QX~0CM)FU%Qw{j%1d{83tWIg&{X}5v}dk1+0M>3nvZb zUl_{2GL(NyK)HTYD2L`|+jCt^-{6g)2xnsEF7sVO`FDo$9}ML`6Hsmdlu|b{V;{bx z8ioI2K>y8v{wD$GMgS@u86T~#PAm0keW%{i|`C!P4O)Sh#I3?(ig3M6&PwAq33L`xgcM|St38c3HY3axy zcQjQvV=HJG;o(3Wp{X;rRED3CC%J`l!G?kK&IME0E(pr!V-naNi}$692a%-4R&>K&fT_x;2UB@wRfsPN5I-(~ z`0;pOy3;COw>DZFC(bN(u2=!J^?ytbht;8L{<&fb_$2}GCnSJB5${WFpDb{_KMGDW z+-@mxAD!}e>2Iy_p2UB&0)H8UKLh2L%JAiQj}0M3YaSTB#fVUHKYIr zCtfLZ8yTIHygPv+)==Js_hm++T=HVZeoH$EO5uG1;}xUUCnlu16L>4u>Y*norG=U} zNl9Vd8pw86Lbkg{knQmEj)tOj`a>6K5t3k)8{RboSvM(cQ4*o9D5Z{3o1afy{$eiNTJfF z1re(I5~!Yn_f^MU>R6W4$v$bE`|MdnS@C2a1^oUXyPui>{xrNV-GjyX9Re?&{8Jsb zKKVz%ejtE7lYo6c-j}LA^9DkpUT6$zG$4l_0ebULJ4`!1rt>&T%DXs@9+7`9QpewM z58xjv6;H=KR;O!tUvWOEP)5({DM;4N%oNt(tR5xTMj+SO1mZg0R~$~rQ7QFW{a}84 zD!Ka)aK?_V$-`@T&LLI&9VbTHjRd*_c>mJl%N8a$+bf;4!*IDGG$PKfkGL!!>~B)J%~Ns z_na8_011D`$@r|FfIh(c(gmKpJlpc%A@3eC$6C=E$%w+dF`6 zIaWO%2K^gy2QMU5le}AMnd4v#QTc9ibXv30Z2-s zuLvai%7jFp1$-4XmJXji=7^8vfJldrn5;;PCnPD%`h+BE^PZiM>2vVDqOQ$5sR!C? zxDQ&=IYtVtKF5gAzCI!0=K^iTZqGwI_PIg|qdr%NFuo~)@p-^lY7mk)#bca1qyXu2 zhX~MH6M&vSVise|JXUD=DNM>Z zJ|#ulm^&%vCm|{8bA|b(z=A)U(J#Y8ETdnJ_Z79kA?D!hrb4-lYHrH4Y*R~-*s~m-uB5Pii1T0i@((BS|5dH_TL>1C^7JJpH#F7tkCh*2Zs42<=UH|7Kio!Sz;L zZ^KnK#Br_=hQmkAUMBQ!2dY@J_zt`$^zXz)=--9w`DNOz6#T5;Ze}cdW9vOJV{-zm z+*a!?%(QWM{NYAA2c~x$t2oJpcLNXpj{7z)Dmd@K1M%@*+`o+bS8#n5*Zc5He7qkQ z@$ms%FMI^~SUFMk+CnHib-iX=& zC{|zn19%|(U&5tp#t-5>;r}6AgrC}{>dotL{HlFgD*PV?tQh>y;61_r5nKeH8mLj> z=UNfZXNt`N#R3^^gp!{&Q>Sf*;gHLyokaR?Vd;x$#Ag932LE$-Pw+pFOW=RLtX*Po zIKywYS!-t-Z$mYeb~Vcz&}^ut$5#wmUNt?bE;)mlo#uO*&E2N4&O}q#?+E)}06X}z zqwX)_Ay#?5g!jb$mvIsMU%~aos_Y+V%)zBVwr1^e@$V5_ngG5EM(}3^@S}#YV!!lb zcuxZO8ZHvR*Kv(3fXU?+fFZav0sJ@^!JietPZ-9E0{BV1CjtBvE)u{`<9cP)5`e}1 z#iKNANR)oqzmT(nJ~rCY;nudG+jznwhRs~i$y9@)WL&mgnf@6d!{2dYB=NI&h?VJ| z!+YZB=W!87zkuttBXg9j(WN}OF1rd>-vB!NS+0H&4>7KO3Ga!kU&cjT{R*xT^C{g* z4d+P>LaK1|t3ZZ7%h9jlA;!_K<2`Zo8@Pz0-^BIxs`+GE(8Ycun}FYv<*I%KqEbA^ zYlMFb4B^jK!QaM1Oc1|=_aunl#YKYnJzS#;ViHrUWfz1HU78?%9}MBo3gQp&5EH~7 z;ynrCo4802e}t>lfw6SPoxW*_My|Iup75A1<8#OGO}f}W1~~lLV*V$1h%xo2cu!1y z3l}liJ+{tP&EyOjQ~54mMiZhLHB3>dJ@C&xRV&Z z2lp|=Fh+Zrs18yZ=xl7=2~=qmi+yo?~!N#e0H#8tw%5bll61 zq8kUUHx;M?_>2VLGa2w%4ESu^mtDU8kf93Pa}sdRWwSE?&+;u9A#J#(0T?fmUA&)HQn-ZXJ zX3)1V=v#4rMC3ern|xaWa>kHXG33>_m-%6>-sk0V?sn_zCoxOoMZ}7=Zz6$s4I^I5 zh$nGh?$)Be_V(3BN5s1>fp%P9@;p$#At2t<)r{ zaz~9tQ{6)=tgTjRM0{5Q=}tzfEjLOH-$q61YFs6(yAoJ;GgfVzvAj}Mm8=rdJqe_H z8L76uSZ1WI?X86L?gY|(j8xlKlrB8=bBku})gtMM!%p*qrGC~}XcrfI8$Gk9tzBWMVGSD5gAtwIQyluh1tav`NmYn7zy+o$GMu4f)sk4nNI*d7y(>$ zgB+cw>~`0>Q$=}Gf-OZQ?JS+D?8x{V6oj27V4|4YhW5b(JBOGZ-OyI8!r#1^IB{R|nor0DmYV z@>cNtGSeQ79_U`GVGm;ia0LF%@!RCke! zQchs3R&MQq4B-l5SXANOF^sMph1k2B1mY<8e6s?ax;w(pUa%^8BDUP3);Q0B>@e7z^nj?(r zRwCy5!se%9PPJCn{yIPS3{FA^y^h(oE)0ZzFkYBo;6==UZoA%6G0W^eanD&ptu^1l zUc7?~{jgC}gKSqcZJTC!@@&dCS!%kiduGtqy*R<$OPITt;!XvUM%-_Ggt&{>yk%kU zWeN6P&g|)?{E^B$RS=gs^InnQ?v>2lt8k~xqqV8(XDLfIwKuqO11KhJYUa~J)zY==Z3)KS z&W!1{eQC{w@}jhq=1*KIN&C0R42grBcO)2kCo`nmzc(!@r(zz8Vw}YWPTnAcG?d2G zk=fs^GAndf^sWSN?`GcgDC&bt;_c|V)wkChy+QLp6KlcNiIin8-q4qfHtqw_EsCga zN?sB)CGSbF`d(&Lm&*@4qO3-nlx5`feF;wA&z$PwL$o)4yi$0(aWF>dT) zhjA@ryRR+qI<=R)PU(6TdXM`41S=n9Rz8NijCLz35&_Y;X;F%4GOs}&bH7gc)8}j_$I@kuh)5yxUihl#~|+SsL$9nn><0%C9$HRPm`EeF@KJ?q1y9 z80^LI9cYxM=2p7n&-P(Rv6K8$uGB%EjN|g)o_7Vd17#Cu?5zzBPPIAqH87Z41@$lH z&Z{D1sKGmF)8e3WpjKZ&=bW#;Ku5?wP@wBMP^MPDwl?5ebPjW+V^i%1F$^OJ8|ZY` z$1@EXZevU7s%r5msY_MRUag;P&CiCwSnudDU_|@4W;p#Y5)nO>i0;DXzeevw+Bld^ zTwNdn3E4mtXRUfvY&+i(F#&8O+IJ48U6mMtIBiR@T)X#>sEAuW{|=5j=Si3VqJD7Sd?e`wblSc`$?8AK3^#ZY;!_SXBs01XfJ7 zn}fSgLeAs=4VQ8>H-=bczEjAP&`M3BIG%`-mQAd?qL9MsRUCps-{wT^%5H{SIS4-; zG`vQM%kDff*bLx}-U^iQ?DoeoNhZ;B?oqk}RH zYXu$pNmWyfMNac5p=ksGTQZ$uWgdsnpoA}u^N6KHQ##hHuFM&)K3<Kf%D0_0B;1;70`OBi@ryG6hx7Suh%;AY(ye>~S=h0s5<1xE*lS$F~!HMj; zI8G)@%|r*MWx}h9CzPF)87Lt{5U!3wxVJI8f6&BEPn;LNv1)QU5|O^hkv0k=>ktri zh>q#N!5B1F;*JX*1XT~>M<8mK6sch&YTi+kZPdDJ87Iap5keFeR8-@oh6P)A`C3;f z)4#1A-h`EqpafOPiG<$OSil5pcrTEQM&wnM*WvU*inkBVzf>$DuEdxOrbTwgcqwTT zL-I)Tlx@bGywR(kJCVqg)PyTkNe=0lEcbE8cs%+Ilq?n!qO%64do% zXjDq(#wdrep)`%>)@`o|Vz zs+){xy1B9e$;2xKXQ^u*D_4p%3F7XSD0hCGy$6r=F-~u7uF76KIwcn` zofJN|UnZ-@S&a9Jr86PPVpK{-b<|4gJUBDm#OmSQbuku^jkoeL=F_=j%EQJdvcRHU zQ6vdXA_irg{ zH#r;;nvCPi3Hd#MD|>fUt<#c_*ONFpX#rvBgim5IxiBFkds`_IQgZQ#_H~ZADJZK3 z&B3v}>7>34BgA_;hj6?O6iaX}C^PzaMhuA_FyV*f!ZAFTqfv;g8V~zn>}Y)WcsLP> zNUK7Y3PlUyQ**4y7~XSKB0lzeJl7CR*a@X_BaA~N)#N4r zjFT~%{Xy>-2x7XiDj?{$A$|-Zry7s^W8RJCE^wj$gDOv&5P$ws3{B)N+|_J1Q6dkZ zLxu*V--TGWKxKL2B;>Yc&23?SMskZrAYzxMzF~4L`U0;Jh*P4eIH;}ks7)V)u5j+= zXyc{G~o`RgPd+(kpFtRRNSJZ+}tfH^k zo;~;N+DUUV-|ifMkp@oB z6Y)~_J}exGW5wQ1t91+&1jYKY0tm#X&lK={@;_Uf1uL7e$FzPdSJ9t1L7Mf|MPaR8 zrGsU;BADo$c=uwhH+UH1Li{h~&au6ERsNlVp0%%rG4Np5-C2IlfmzX6bA1G55Rf9D zG+pmu`J-nNS}h6LYBsTozvp4|1xKjyvAnQa3bsRq(7YrG%IC^&*DRpTLcx~8M{+NQ zp@c4x*J`{VgK;9UMw)|I(#1F_lH5asb*xGhNjh|jqzw5q%DjvlwKJB@yS4fN^%sl| zBUy|?D6bO6)n{+*WyMB1S5{`nj(vwU6_dzcA>^kU1A^Q4M|ltgP{%sr;qi#{`8G(i zeaO)5cUlcYaY8B@mnz7{=KHh`O>|cJbj-LPZ5E1KvGRmuOkg5%sZYd{pr}V?$vefRX@e66*d=qs>l zD-EiPJFzPNp2r(twSU{u`oUUzzLD)~%r*OHT+v0_%34t{3^`JtpEpao>$A0!oLSszppjmc zK*!OD^3}tGY;Uxs?W{}|aftF&!zu5dLbpq6@{D?jR2c4la}>@wybm8Pg)!J9Bexra zAwBejs|tY#(YgF~3&tM2P<>M&?plefLQ&+)i;<}_s4w<;a#Gr!tBL|K|Nu24Dpb@}z1+c0_VtqC5B&8^u<+j}PuvnDQCFVd>C`$1ndEKnd zw`utwX9%02z^ZiG+J}lAHi+=OkCtfeWyMUpC#3C@W}W8oF%&^$LVH~#T+uU)v3Q!0 zCQxO9##W3*2}sS>A*ZPaF}`AkRKs|Ll!Whr2D4w3u&p$jnh8sUq&|BeoeP^G^*IrP zh+YzrDDjHXRZ-t!t4c@^p?y{ZzbG;x_VOYKLjhRA}USRR?n}7 zUTKz8y#N&T0{N2L(`7KO95fdiw+*Qqen=v69ux7LNZgVp;e{gtlJWkBEwvU*32VLn zkc>~nAfi_?s+c;F48&rp*ODki_7n-T=c)pSw)ntH0)k4u`2HP=U5RZS{D4G4s%!8C zqk5V_45_a12t-nH3n7R`&d!kB^1=}TD_BiHDKpm>_O#!tXSkY%n<3bf2Hm_Y+Dv_y9 zUu;BNd+$fpK^0U{GGAXv*~&|TQ0h{e=$#uD3@J^1Kq4U>DScs$mq^%Q_YxPqn2MaQ zHg_fx0cBG=&DhZlONxUYTTq5YBl6NB zhv9ZM=MN5!H0a;kd$|pelTnhoibcdP;}WBZA01$6iHgnIYGiHr1VL98su6VIiJ**C z6+#*pI-OQ=tQyNFKaNj0cVpMb1UCQ0!@(k9CDlY6A}m8l?y8DINQaO8V<6J?k`erh z2JLA4deF)oZo<O&}wUa3KL36l87)5-0T>O&fFjaaTv4P{3{5M?sK^ zN@%73w!6SRA0M}}IzV+#@qk215Ze%*UAS|tQABKeqq3-!j5G-GuyB`vIs)~Dbn>=m zw$e^UBytI1cm zD3RNSCKB!d-dYgbq|~uE%8&phIXwTdwimYBs&!1Hf^*hE_|lLUOi&k^`3Oq1_b~~n zU_|EX0vWq07pu^;by5Io9bVqjSbWIJcD>oHwK9%Flx1M-?E@V$F!sU`0cmOd4|XGI zbm=4qmWV+_Wwh-Fah-}(L^n9G4OA)$k(FM`3)9bF`w~^`M_`)3MCxqL5kra$Xp9!b zE-@Cf!3Hb{4dx4rty)hFnA6>pp;C@H%|^c=U3UD(#=1sSQg^zFW_ojL{t?ZJ?G z>xI+uFdr6LLZT=STWEriMC9cCn;_#pwi41h>Es4k|F#|E>Qxegf}gOvw$M0Q60nTd+GAw2p0U9Dqr}+=@GDt$yQV8Z@^KH|9>br?=QRfwpn(Eb*AP(5&}5v^6EG z^}FqS=R&psvzNBrpYb3n=?psY?Dh-d>lTkKNu#gUid-rniItgCHqn7eG$A;tmyfnj z+0yAA+u4E5?+F8NaqiXz?ZPr6t?9*C;^{)SKxKEcl9W!P-ImyfO22QG->#%Vkz3ep zN%Tu8$#|}#(dA`3)OcQRrJ;m;MJgt@Q zd8D_>yx)l-xuY>11F1*1BvOpbF{9G(1|PDskb*12Y89L`>pVokh@QeJBhhrYaD6Yn zgEMCLoK8YQ(<~;~T}P2FkFqOHHsjkYqnp)+?16~Y)A=D#>w{vQ3~;0Dc-W1(bOtZ zh^5Mt`ryZ+0!S&`8s#C;s;M%g2*(14Y?tlgvAa{^G9}G0nwQA#6yiZy!YWvP9NAhz z;p6gg+GkohpuHg!R@FB}TiO@|h?hVK5XvD=PT7XV$w`2aT)d!4XuCcc7perqJ=n!S zjK}x=`8x{Y+=u}`h-{3OE(ze3NG085>i#rawFerV%&qHw;G zlCn`3Y07MpCigBNhVd|47aMb;qFVIgM^$q2kNHF~Hz%jqNt1#WqN2A9|tx#kP%C`tJ*gT4^{N zPD;pOiCSk;kV~r@PzLsp=X;ilG=d^}kM`bni>8hUW9=6y!kNCY;i=Ak@WSc1W#BdO zIiFYt648_`9lB349`r2zD13?}8?#Z6>k_GQ5VoVcc6g}VDozv((nuw3;AF|vna>dt zv72$x?Yv%_!J*?~dpC+CYR7a4S?kjwrWO_!jlI7yz%A?&g*~+>Xrr+xVbRAX15{+k zH=T>IlN|s(=e?W09Ybyha zexRZSmtCm~;uVbOWSOQcoT&D_@ln!lF0?2&Cg8dL(M*<*+CtuciQ+MMEwHp1vb?A=PMWGqjKbI$6doe)L9EQfhpIC`w=UoVikC z>pr^_leJ3 z`Mj-DWHw`WOChA_Zo~K5iihlQh-%R}nO%_-)0(rmR?4#|7F<60QPc_nr66ldCVKEq zcygp{mIp>EQgwpY#m2xA*k{dIvVu(t;gVWc7EV?OBN)S|frW|Gh>~DZl2x!>jX`Y= z8a;GP*#00^hYo>VN{GZE-ek2a@wwPO+a^@SDB6uk`#dy|%d@JQW7f?$lZ2%%G!xe(=;K^%D>Wr$~w1Rk97r?6)t60li$>!v>&4ko4 zVN8D$ZwQW)0x24U$4o2;|1AOjVPU0(w5z$EO$AYt7Sd*)Ez35Jr~2kYAf)ImArMWa zr~9qYb&DFI#))%00)HcmqBLMZ4jxbB*jRXK<^_~BL>5^6}6$FckUkz{$5u-Q-p}ggo^zyq5#6sdajBp-bI3Ln(Qz7-%(!q_i z+p%x5`!>P@1-I+zBo*08Q}__}yDF1SShuE5WTfAXd^%k(kw31N_d)$tbUuP;ChgEv z>v?6t$SpP5$TRwI1s8e7X*G+HFZ5Ta?QG*JL6jnT4tI_Dtl&Vi(K~^Xf2_n?b)?xI zkr5kr261OFUYOxEefTYgrNK}>u9S2WaUTVe${|@Gi0R!^857tjgopt;{(TiK-yd!$ z-Ebr_^7_O)oQ+RF^zre@T%g3M$VtLs#FLoNV(*_z&cdrV}Ml{sbvG8TEd}*nOMp}5blygWM*N+Lwo&P=}Bo{Gc_o>)r+eo?PP4*jF7;j<|^{40u;&H$dr##byeh{*j!tai0tL1 zKqH$gmnAu*eC*^_U2H@R3lR%&!iZk+5`HM+4whp!*O+bA+S$h2P}ZdF$nqv&_z;fA zzjsN7tkRUEkPaOL?luilCIjhy$I_b7v}STNa=^JA#Cc=q0Kf z+tpG+TFv(2QR)p7RfTkGq(fUT;zlj!7{W8g16(U4aK?qV-?7n9RXLh)H!Pa#+X~T6 zv2WHCct}=w0cM*W$A#+>hXJw?9Urcz9v1O3ky|X{X_lAulR=K88!zF-ik5jnjB#=V z(ZN$4|-)zho z8&eo9iRoIYLd;X_8{4kZ8`Kf|oDTwINFud*gU1KLSLDLRGhC?JS;B)GPcc5>{Umc)kC<54`s0Q-D*g&?^6ajLc(5^if8C#Ceti6V%Jd<@FP-lV~HrWGrYHU zEaAOPWNTa?dvXo!9-Y^YiBUwtlyae1dgBYlqj!g7eeYnSm2DU~-48i92D#->qM2l+W z^2sNsw|w&P=_&c-A1?7M&Cpdje|k4d4P8}hb+H*qYy1$<`T)%O9UFAU1r-*8pswB* zgP!VM-5N>Ui8-KY1FPh{LAA!}X7MgH7x;Aj(y}EIP&pkyut5caKLF4G3KCF3MFM!W z&PrgmhyASBnTPFGqH?X#?y5c=NrQsE%2BV`STi~n=S3ciRL6)lqhdMqrLj)eA#So5 z?L10qLLeU-(#^sW1>}|@&1A;gu#T$B$^d~4>t>#fRsyXJ>*(SjrQ4*ftfUTDSnRikRBRhuU~upR5VzFe zQm%d(bGy5ig58j`BfL1~FfNCnpt!t2|D z%FylB*H5+@iDGL*GZqdl(hs1xF?TM4AoLmDTU#SoD*d&$uRfZ9VZ$;E6E*=NtUX>> zu07_RZ9o`6I!A0sPF_hjkbn&-G~H52Dx}bKOBg{&Hzm#GchrRxHOF+a^Xe46Zvf)NSCXQXvRz`#(c@D5ExLWSSpPz0T$`7H@PTtHQy`KtjnXqOk9U zxmF*pGY*Li8{1%+c~ zvqcJCMOrFAOlmNrK3aalbUgw=`>zSCFqocTAwqpMIzStp+8<5b7Vn|(JZ+Mv@7S6 z$GVMPImf){6IL*)FzcKv_${?DQVAAfh}oX+G1S?LZM7Ims(y+9nX6bLWp#fT5!-<1 zyik=&s&*wBT0V+~)a_w39#d5!(4W(87j}n9aon8`_IOjxlMZ~b$gmLD4wW^Zi6m`U%~>Kv+jx4sxU9E!opw_&^2qmiZ#Sp96rMoIpB8^ma&>97o6KR50v=gto4}Rydh{!U3Un7ZiQ(jj=lP7P(lO?0E#QLn^WcJzeGgdzkb0=#_j+bdM zl6PB_(NbR0Sq-JA#pjxYl7bbZXxlrl)VtDAC}PpQUY3d{JV&Ka#-dbQUq!hpGk- plan.CompleteAmount) + plan.ShiftType = 0; + + bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; + if (updateFlag) { - plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; - plan.CompleteAmount = 0; - plan.ShiftType = 1; + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; - if (saveFlag > 0) - { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); - } - else + if (plan.PlanAmount > plan.CompleteAmount) { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; + plan.CompleteAmount = 0; + plan.ShiftType = 1; + + int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; + if (saveFlag > 0) + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); + } + else + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + } } } else { - plan.ShiftType = 0; - - bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; - if (updateFlag) - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); - } + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); } + } } } diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 36288f46..57f88858 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index a4db58d9..54fddce2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index a056af0d3f9dc463157ec9d2f3a3a69d49f71e33..8c7cf623647bf2a0c37ba5b4a3a756ded13a9157 100644 GIT binary patch delta 55 zcmV-70LcHC0hj?PP)kQa3;+NCr8yS$>!B4}74X+VEuo9+W7`x2N2FZ|s} diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache index 303b31a5..6a03d169 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache @@ -4,7 +4,7 @@ library C# .cs -D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\ +E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\ HwControlLib none false @@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP 1204305769 71208292394 -194-2067936865 +194-1617825143 Themes\Generic.xaml; -False +True From b14f8ad298c29060f1d5ff383d0a5e02ed56837b Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 10 Jan 2024 13:38:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?change-=E6=B3=A1=E5=89=8D=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A4=9A=E7=A7=8D=E5=9E=8B=E5=8F=B7=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E6=B3=A1=E6=9C=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service_New/BaseSpaceInfoServices.cs | 13 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/CollectionFoamMachine.cs | 17 ++ .../Business/InStoreBusiness.cs | 59 +++++-- Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs | 4 + .../ViewModels/BeforeFoamingPageModelView.cs | 12 ++ .../ViewModels/FoamMonitorPageViewModel.cs | 157 +++++++++--------- .../Views/UserPage/BeforeFoamingPageView.xaml | 8 +- .../Views/UserPage/SelectType.xaml | 2 +- 9 files changed, 171 insertions(+), 103 deletions(-) diff --git a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs index 97df3a74..36230dda 100644 --- a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs @@ -37,7 +37,7 @@ namespace Admin.Core.Service - #region 入库通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道 + #region 入库通过物料类型获取指定货道，如果没有对应类型的货道停住 /// /// 入库通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道 /// @@ -50,15 +50,12 @@ namespace Admin.Core.Service List spaceInfos = null; try { - spaceInfos = await _baseSpaceInfoRepository.QueryAsync(x => x.StoreCode == store && x.MaterialType == materialType && x.SpaceStatus == 1); - if (spaceInfos==null || spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配 - spaceInfos = await GetEmptySpaceInfo(store); + spaceInfos = await _baseSpaceInfoRepository.QueryAsync(x => x.StoreCode == store && (x.MaterialType == materialType || x.typeCodeB == materialType || x.typeCodeC == materialType ) && x.SpaceStatus == 1); + if (spaceInfos == null || spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配 + return null; logHelper.Info($"根据仓库{store}；物料：{materialType}；获取到的货道信息：{spaceInfos.ToJson()}"); - //spaceInfo = InStoreFilter(spaceInfos); - //logHelper.Info($"仓库{store}；物料：{materialType}；匹配的入库货道信息：{spaceInfo.ToJson()}"); - - //spaceInfo.MaterialType = materialType; + } catch (Exception ex) { diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index d114eba8..aa57dd8c 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\ diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs index 9330ff24..15f418e3 100644 --- a/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs +++ b/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs @@ -11,6 +11,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -68,6 +69,7 @@ namespace Aucma.Core.BoxFoam.Business semaphore.WaitOne(); try { + Thread.Sleep(3000); var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamMachinePlc")); if (obj != null) @@ -79,6 +81,7 @@ namespace Aucma.Core.BoxFoam.Business ReadGunData(obj, "DB50.1084", gunKeys, "B1"); //B1枪数据 ReadGunData(obj, "DB50.1272", gunKeys, "A2"); //A2枪数据 ReadGunData(obj, "DB50.1460", gunKeys, "B2"); //A2枪数据 + RefreshSystemDataDelegateEvent?.Invoke(systemKeys); RefreshGunDataDelegateEvent?.Invoke(gunKeys); @@ -99,6 +102,7 @@ namespace Aucma.Core.BoxFoam.Business } tempKeys.Add(kvPair.Key, record); } + //有变化更新记录所有信息 if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff)) { kvPair.Value.ProductLineCode = "CX_02"; @@ -107,6 +111,17 @@ namespace Aucma.Core.BoxFoam.Business int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result; RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value); } + // 设备状态变化，更新设备状态 + if (kvPair.Value.SystemStatus!= tempKeys[kvPair.Key].SystemStatus) + { + BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System.Equals(kvPair.Value.System) && x.ProductLineCode.Equals(kvPair.Value.ProductLineCode) && x.GunCode.Equals(kvPair.Value.GunCode)).OrderByDescending(x => x.CreateTime).FirstOrDefault(); + if (record != null) + { + record.SystemStatus = kvPair.Value.SystemStatus; + bool flag = _lastShotRecordServices.UpdateAsync(record).Result; + } + + } } @@ -210,6 +225,8 @@ namespace Aucma.Core.BoxFoam.Business BoxLastShotRecord lastShotRecord = new BoxLastShotRecord(); lastShotRecord.System = gunCode.Substring(1, 1); lastShotRecord.GunCode = gunCode; + + // 系统状态 if(lastShotRecord.System == "1") { if(obj.plc.ReadBool("DB50.388.0")) diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs index 0976264a..d5b8287d 100644 --- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs @@ -110,12 +110,12 @@ namespace Aucma.Core.BoxFoam.Business { spaceAddresses.Add(spaceConfig.GetSpaceAddress(storeCode, space.SpaceCode)); } - // 模拟入库 - //Task.Run(() => - //{ - // Thread.Sleep(2000); - // InStore("B24010181060282920011"); - //}); + // 模拟入库 + Task.Run(() => + { + Thread.Sleep(5000); + InStore("B24010183025024860011"); + }); //实时监测入库任务下发和入库任务完成 StartPassDownAndRealInstoreFinish(); } @@ -272,6 +272,7 @@ namespace Aucma.Core.BoxFoam.Business BaseSpaceInfo spaceInfo = await GetSpaceInfoByMaterialType(storeCode, materialType); if (spaceInfo != null) { + logHelper.Info($"匹配货道：{spaceInfo.ToJson()}"); LogDelegateEvent?.Invoke($"匹配货道：{spaceInfo.ToJson()}"); @@ -298,6 +299,8 @@ namespace Aucma.Core.BoxFoam.Business else { //报警停线 + LogDelegateEvent?.Invoke($"未匹配到货道,请设置货道型号!"); + } } catch (Exception ex) @@ -364,18 +367,37 @@ namespace Aucma.Core.BoxFoam.Business BaseSpaceInfo result = null; try { - // List info = _spaceInfoService.GetBaseSpaceInfosByMaterialType(storeCode, materialType); + List info = await _baseSpaceInfoServices.InStoreGetSpaceInfoByMaterialType(storeCode, materialType); if (info != null) { if (info.Count > 0) { + // 更新货道库存 foreach (BaseSpaceInfo item in info) { var spaceInfo = ReadSpaceInfoByPlc(item); item.SpaceStock = spaceInfo.SpaceStock; - // item.OnRouteAmount = spaceInfo.OnRouteAmount; - // item.SpaceStatus = spaceInfo.SpaceStatus; + + if(item.typeCodeB.Equals(materialType) && (item.SpaceStock+item.OnRouteAmount)==0) + { + string str1 = item.typeCodeB; + string str2 = item.typeNameB; + item.typeCodeB = item.MaterialType; + item.typeNameB = item.typeNameA; + item.MaterialType = str1; + item.typeNameA = str2; + } + // 对调C型号和主型号 + else if(spaceInfo.typeCodeC.Equals(materialType) && (item.SpaceStock + item.OnRouteAmount) == 0) + { + string str1 = item.typeCodeC; + string str2 = item.typeNameC; + item.typeCodeC = item.MaterialType; + item.typeNameC = item.typeNameA; + item.MaterialType = str1; + item.typeNameA = str2; + } } info = info.Where(x => x.SpaceStatus == 1 && x.SpaceCapacity > (x.SpaceStock + x.OnRouteAmount)).ToList(); @@ -407,8 +429,7 @@ namespace Aucma.Core.BoxFoam.Business { SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.StoreCode, spaceInfo.SpaceCode); spaceInfo.SpaceStock = obj.plc.ReadInt16(spaceAddress.onStore); - // spaceInfo.OnRouteAmount = obj.plc.ReadInt32(spaceAddress.onRoute); - // spaceInfo.SpaceStatus = obj.plc.ReadInt32(spaceAddress.spaceStatus); + } return spaceInfo; } @@ -551,12 +572,15 @@ namespace Aucma.Core.BoxFoam.Business #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 var item = ReadSpaceInfoByPlc(spaceInfo); spaceInfo.SpaceStock = item.SpaceStock; - // 入库完成，在途减1 - spaceInfo.OnRouteAmount -= 1; + if (spaceInfo.OnRouteAmount>0) + { + // 入库完成，在途减1 + spaceInfo.OnRouteAmount -= 1; + } #endregion - await _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); + #region 添加货道明细 不控制出库，暂时未添加明细 BaseSpaceDetail spaceDetail = new BaseSpaceDetail(); @@ -580,10 +604,15 @@ namespace Aucma.Core.BoxFoam.Business recordInstore.InStoreTime = DateTime.Now; recordInstore.BarCodeCode = taskInfo.MaterialCode; #endregion - bool result = await _recordInstoreServices.SaveRecordToDb(recordInstore, taskInfo, spaceInfo, spaceDetail); + + await _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); + _ = _recordInstoreServices.AddAsync(recordInstore).Result; + bool result = _realTaskInfoService.DeleteAsync(taskInfo).Result; + // bool result = await _recordInstoreServices.SaveRecordToDb(recordInstore, taskInfo, spaceInfo, spaceDetail); if (result) { LogDelegateEvent?.Invoke($"入库完成，更新数据库成功"); + RefreshDataGridDelegateEvent?.Invoke();//刷新datagrid 列表 } else { diff --git a/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs b/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs index c959cffc..571b9076 100644 --- a/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs +++ b/Aucma.Core.BoxFoam/Models/SpaceInfoModel.cs @@ -42,6 +42,10 @@ namespace Aucma.Core.BoxFoam.Models /// public string typeCodeB { get; set; } /// + /// 物料型号C + /// + public string typeCodeC { get; set; } + /// /// 入库状态 /// public string inStoreFlag { get; set; } diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs index ae6056b7..509b9204 100644 --- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs @@ -32,6 +32,7 @@ namespace Aucma.Core.BoxFoam.ViewModels // 设置型号 SubmitCommand = new RelayCommand(obj => SubmitCommandExecute(obj)); SubmitCommand2 = new RelayCommand(obj => SubmitCommandExecute2(obj)); + SubmitCommand3 = new RelayCommand(obj => SubmitCommandExecute3(obj)); _baseSpaceDetailServices = App.ServiceProvider.GetService(); _baseSpaceInfoServices = App.ServiceProvider.GetService(); SelectTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync; @@ -59,6 +60,16 @@ namespace Aucma.Core.BoxFoam.ViewModels SelectType type = new SelectType(2, spaceCode); type.ShowDialog(); + } + + public RelayCommand SubmitCommand3 { get; set; } + + private void SubmitCommandExecute3(string spaceCode) + { + + SelectType type = new SelectType(3, spaceCode); + type.ShowDialog(); + } #endregion @@ -83,6 +94,7 @@ namespace Aucma.Core.BoxFoam.ViewModels model.totalAmount = item.SpaceStock + item.OnRouteAmount; model.materialType = item.MaterialType; model.typeCodeB = item.typeCodeB; + model.typeCodeC = item.typeCodeC; model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White"; if (item.SpaceStatus == 2) { diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index d177b7c1..ade2ece5 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -82,95 +82,104 @@ namespace Aucma.Core.BoxFoam.ViewModels /// private Task InitEveryDayMethod() { - ProductionHourList = new List(); - List listTime = _baseBomInfoServices.getWorkTime().Result; - foreach (WorkTime time in listTime) - { - ProductionHourList.Add(time.hourTime); - } - - // 货道列表 - List list = _boxFoamDataServices.QueryAsync(x=>x.ProductLineCode.Equals("CX_02") && x.StationCode=="1005").Result; - - if(list != null) + try { - ChartValues achievement = new ChartValues(); - //Achievement.Clear(); - #region 按时间统计 - if(list.Count > 0) { - achievement.Add(list.Sum(x => x.AnHour)); - achievement.Add(list.Sum(x => x.TwoHour)); - achievement.Add(list.Sum(x => x.ThreeHour)); - achievement.Add(list.Sum(x => x.FourHour)); - achievement.Add(list.Sum(x => x.FiveHour)); - achievement.Add(list.Sum(x => x.SixHour)); - achievement.Add(list.Sum(x => x.SevenHour)); - achievement.Add(list.Sum(x => x.EightHour)); - achievement.Add(list.Sum(x => x.NineHour)); - achievement.Add(list.Sum(x => x.TenHour)); - achievement.Add(list.Sum(x => x.ElevenHour)); - achievement.Add(list.Sum(x => x.TwelveHour)); + ProductionHourList = new List(); + List listTime = _baseBomInfoServices.getWorkTime().Result; + foreach (WorkTime time in listTime) + { + ProductionHourList.Add(time.hourTime); } - var column = new ColumnSeries(); - column.DataLabels = true; - column.Title = "当日小时产量统计"; - column.Values = achievement; - column.Foreground = Brushes.White; - // Achievement.Add(column); - if (Achievement.Count > 0) + // 货道列表 + List list = _boxFoamDataServices.QueryAsync(x => x.ProductLineCode.Equals("CX_02") && x.StationCode == "1005").Result; + + if (list != null) { - for(int i = 0; i < achievement.Count; i++) + ChartValues achievement = new ChartValues(); + //Achievement.Clear(); + #region 按时间统计 + if (list.Count > 0) { - Achievement.FirstOrDefault().Values[i] = achievement[i]; + achievement.Add(list.Sum(x => x.AnHour)); + achievement.Add(list.Sum(x => x.TwoHour)); + achievement.Add(list.Sum(x => x.ThreeHour)); + achievement.Add(list.Sum(x => x.FourHour)); + achievement.Add(list.Sum(x => x.FiveHour)); + achievement.Add(list.Sum(x => x.SixHour)); + achievement.Add(list.Sum(x => x.SevenHour)); + achievement.Add(list.Sum(x => x.EightHour)); + achievement.Add(list.Sum(x => x.NineHour)); + achievement.Add(list.Sum(x => x.TenHour)); + achievement.Add(list.Sum(x => x.ElevenHour)); + achievement.Add(list.Sum(x => x.TwelveHour)); } - } - else - { - Achievement.Add(column); - } - #endregion + var column = new ColumnSeries(); + column.DataLabels = true; + column.Title = "当日小时产量统计"; + column.Values = achievement; + column.Foreground = Brushes.White; + // Achievement.Add(column); + if (Achievement.Count > 0) + { + for (int i = 0; i < achievement.Count; i++) + { + Achievement.FirstOrDefault().Values[i] = achievement[i]; + } + } + else + { + Achievement.Add(column); + } + #endregion - #region 按类型统计 - MaterialNameList = new List(); - ChartValues achievement2 = new ChartValues(); - //foreach(BoxFoamData space in list) - //{ - // MaterialNameList.Add(space.Fixtureboxtype); - //} - var grouped = list.GroupBy(x => x.Fixtureboxtype); - foreach (var item in grouped) - { - var flattenedList = item.SelectMany(p => new[] { p.AnHour, p.TwoHour, p.ThreeHour, p.FourHour, p.FiveHour, p.SixHour, p.SevenHour, p.EightHour, p.NineHour, p.TenHour, p.ElevenHour, p.TwelveHour }).ToList(); - MaterialNameList.Add(item.Key); - achievement2.Add(flattenedList.Sum()); - } - // ModelStatistics.Clear(); - var column2 = new ColumnSeries(); - column2.DataLabels = true; - column2.Title = "当日型号产量统计"; - column2.Values = achievement2; - column2.Foreground = Brushes.White; - // ModelStatistics.Add(column2); - if (ModelStatistics.Count > 0) - { - for(int i=0;i< achievement2.Count; i++) + #region 按类型统计 + MaterialNameList = new List(); + ChartValues achievement2 = new ChartValues(); + //foreach(BoxFoamData space in list) + //{ + // MaterialNameList.Add(space.Fixtureboxtype); + //} + var grouped = list.GroupBy(x => x.Fixtureboxtype); + foreach (var item in grouped) { - ModelStatistics.FirstOrDefault().Values[i] = achievement2[i]; + var flattenedList = item.SelectMany(p => new[] { p.AnHour, p.TwoHour, p.ThreeHour, p.FourHour, p.FiveHour, p.SixHour, p.SevenHour, p.EightHour, p.NineHour, p.TenHour, p.ElevenHour, p.TwelveHour }).ToList(); + + MaterialNameList.Add(item.Key); + achievement2.Add(flattenedList.Sum()); } - } - else - { - ModelStatistics.Add(column2); + // ModelStatistics.Clear(); + var column2 = new ColumnSeries(); + column2.DataLabels = true; + column2.Title = "当日型号产量统计"; + column2.Values = achievement2; + column2.Foreground = Brushes.White; + // ModelStatistics.Add(column2); + if (ModelStatistics.Count > 0) + { + for (int i = 0; i < achievement2.Count; i++) + { + ModelStatistics.FirstOrDefault().Values[i] = achievement2[i]; + } + } + else + { + ModelStatistics.Add(column2); + } + + #endregion } - #endregion + + + } + catch (Exception ex) + { + Console.WriteLine(ex.Message.ToString()); } - - //await InitExecMethod(); return Task.CompletedTask; } diff --git a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml index 04a5d322..c05a0511 100644 --- a/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/UserPage/BeforeFoamingPageView.xaml @@ -106,7 +106,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -170,14 +170,14 @@ - + diff --git a/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml index 500aa8dc..eaf00b86 100644 --- a/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml +++ b/Aucma.Core.BoxFoam/Views/UserPage/SelectType.xaml @@ -179,7 +179,7 @@ - + From 01082bc1869b509be6d077ba950a08382b6e9ec5 Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 10 Jan 2024 13:57:46 +0800 Subject: [PATCH 5/7] change. --- Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs b/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs index 40208211..623a1563 100644 --- a/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs @@ -334,9 +334,6 @@ namespace Aucma.Core.ProductOffLine.ViewModels achievement2.Add(item.Amount); } - - - var column2 = new ColumnSeries(); column2.DataLabels = true; column2.Title = "产量"; From 1a40eaa2a89b2c54fc69c11109c8c1c9bb45246d Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 10 Jan 2024 13:58:05 +0800 Subject: [PATCH 6/7] . --- Aucma.Core.BoxFoam/Business/InStoreBusiness.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs index d5b8287d..24665fbb 100644 --- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs @@ -111,11 +111,11 @@ namespace Aucma.Core.BoxFoam.Business spaceAddresses.Add(spaceConfig.GetSpaceAddress(storeCode, space.SpaceCode)); } // 模拟入库 - Task.Run(() => - { - Thread.Sleep(5000); - InStore("B24010183025024860011"); - }); + //Task.Run(() => + //{ + // Thread.Sleep(5000); + // InStore("B24010183025024860011"); + //}); //实时监测入库任务下发和入库任务完成 StartPassDownAndRealInstoreFinish(); } From c87c7137eb25131361c95c5c5ea4892a3bac0169 Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 10 Jan 2024 14:01:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?change=20-=20=E6=96=B0=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E4=B8=8A=E4=BD=8D=E6=9C=BA=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.Core.Api.csproj.nuget.dgspec.json | 533 ++++++++++-------- .../obj/Admin.Core.Api.csproj.nuget.g.props | 10 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 56 -> 142874 bytes Admin.Core.Api/obj/project.assets.json | 43 +- Admin.Core.Api/obj/project.nuget.cache | 452 +++++++-------- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj | 2 +- .../ViewModels/MainWindowViewModel.cs | 1 + Aucma.Core.BoxFoam/appsettings.json | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 265 bytes .../HwControlLib_MarkupCompile.i.cache | 2 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 25 +- .../obj/HwControlLib.csproj.nuget.g.props | 8 +- HwControlLib/obj/project.assets.json | 25 +- HwControlLib/obj/project.nuget.cache | 4 +- 20 files changed, 613 insertions(+), 506 deletions(-) diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index 0a98b80a..fe5e8758 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -1,41 +1,46 @@ { "format": 1, "restore": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -78,36 +83,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -263,36 +273,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -332,60 +347,65 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" } } } @@ -421,39 +441,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -483,39 +508,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -545,36 +575,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -604,36 +639,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -663,29 +703,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -748,42 +793,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -813,48 +863,53 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -890,29 +945,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -951,29 +1011,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1012,39 +1077,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1074,36 +1144,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1139,36 +1214,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1204,42 +1284,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1269,7 +1354,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index a5a55588..15920027 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,18 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + - C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 49f1a9f2a16243ec53dc4768f820a9d0f0ad8241..d8850da534819b613f49f14b373f108fc9d2c5c0 100644 GIT binary patch literal 142874 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 Yx_UBQr--_}vx<*yU2JR8X5ZZZ12Qd&SO5S3 delta 29 acmbPrhr@z}fq|i6B8!Ruhz4R9XaE3FLj(i> diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 6f928a74..209a19d7 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -7052,12 +7052,11 @@ ] }, "System.Collections.NonGeneric/4.3.0": { - "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", "type": "package", "path": "system.collections.nongeneric/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -9790,12 +9789,11 @@ ] }, "System.Runtime.Serialization.Primitives/4.3.0": { - "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", "type": "package", "path": "system.runtime.serialization.primitives/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -11257,40 +11255,47 @@ ] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -11333,7 +11338,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 66791f7b..c8cd40d1 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,233 +1,233 @@ { "version": 2, - "dgSpecHash": "ikzDviTkPCZihaCgfwo8AuzSJtovmijOXuLwxKtGKgxnoK/TUK28Ezke2gSYzzQArjgQtsTmEg3YwxUUY0FkCg==", + "dgSpecHash": "HsMojseCVmTxRPG4iGkEf/2OvAGUxYsYPY9resKB+wCYzU12wwdfiUulJ6iIYjBrrvQkt9KbYTYesAxpAJXRFg==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ - "C:\\Users\\admin\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" + "C:\\Users\\Lenovo\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 2ffa7b25..1fdeb046 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index 2b7e2280..968ed779 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index ba998751..1e7c9f10 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index 41538400..67886d71 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index 19486c3e..9c6bffa2 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index aa57dd8c..48679c0e 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ diff --git a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj index afffdecb..a4a39d03 100644 --- a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj +++ b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj @@ -1,7 +1,7 @@  - WinExe + Exe net6.0-windows enable true diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index e494d270..96b2057c 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -143,6 +143,7 @@ namespace Aucma.Core.BoxFoam.ViewModels case "Exit": if (System.Windows.MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) { + log.Warn($"系统退出，当前时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Application.Current.Shutdown(); Environment.Exit(0); } diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index bbf72b1a..1fb6db0c 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -202,7 +202,7 @@ "EquipName": "泡前库Plc", "PlcType": "Siemens", "Enabled": true, - "IP": "127.0.0.1", + "IP": "10.10.93.41", "Port": 102 }, { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index 8c7cf623647bf2a0c37ba5b4a3a756ded13a9157..decde3af09d0c22125e131bf62df934b15aa51db 100644 GIT binary patch delta 169 zcmbQi*vT|OgNc=KqM`Cc2ljeq1_lNNXRDad;?$zz7@yR<{IdKQy}Z)&)RLHj#N_P6 z^wi=Qpc)2q7ps`3dm5hhPkg$4>C@KjF=3g-rHMHT!6l_BnfVGv28Na~!5N7~sVOmj zrS7RE0Z`2#z4|~40*dm}ixP7c+%j{3CZ^<<lgam&w1NiCXa Gr~m*iJ3GDr delta 54 zcmeBVn!z|hgK^44L*NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 57c51ab1..1558f2be 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,27 +8,34 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -64,7 +71,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 7ca2e0be..248dc48c 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==", + "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file