diff --git a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs index 87c0ee6..d752f4f 100644 --- a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs @@ -312,7 +312,6 @@ namespace DongYingAPI.Controllers.api model.TerrestrialSource= 0; } data.Add(model); - } } var adata=data.OrderBy(x=>x.time).ToList(); diff --git a/DongYingAPI/Controllers/api/GetChamberLoadController.cs b/DongYingAPI/Controllers/api/GetChamberLoadController.cs index 1b5272d..86a07aa 100644 --- a/DongYingAPI/Controllers/api/GetChamberLoadController.cs +++ b/DongYingAPI/Controllers/api/GetChamberLoadController.cs @@ -43,7 +43,7 @@ namespace DongYingAPI.Controllers.api string now = ""; now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddHours(-i).ToString("yyyy"); + var sdate = datetime.AddHours(-i); var edate = datetime.AddHours(-i + 1); decimal? num1 = 0; var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time); @@ -57,6 +57,7 @@ namespace DongYingAPI.Controllers.api time = DateTime.Now.AddHours(-i).ToString("HH:00"), P= num1 }; + data.Add(model); } @@ -142,7 +143,7 @@ namespace DongYingAPI.Controllers.api string now = ""; now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddHours(-i).ToString("yyyy"); + var sdate = datetime.AddHours(-i); var edate = datetime.AddHours(-i + 1); decimal? num1 = 0; var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time); diff --git a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs index 85e5b37..abe455f 100644 --- a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs +++ b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs @@ -60,9 +60,10 @@ namespace DongYingAPI.Controllers.api } data.Add(model); } + var adata = data.OrderBy(x => x.time).ToList(); res.code = 200; res.msg = "成功"; - res.data = data; + res.data = adata; } if (room.type == "电压") { diff --git a/DongYingAPI/Controllers/api/GetDeviceParameterController.cs b/DongYingAPI/Controllers/api/GetDeviceParameterController.cs index 73961ed..7ef62b5 100644 --- a/DongYingAPI/Controllers/api/GetDeviceParameterController.cs +++ b/DongYingAPI/Controllers/api/GetDeviceParameterController.cs @@ -91,7 +91,6 @@ namespace DongYingAPI.Controllers.api model.Parameter = item.DeviceValue + "小时"; } #endregion - data.Add(model); } diff --git a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs index 4c195b9..b802fea 100644 --- a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs +++ b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs @@ -73,6 +73,16 @@ namespace DongYingAPI.Controllers { model.EH = 0; } + var s = 0; + if (i == 0) + { + s = 1; + } + else + { + s = i+1; + } + model.EH = Convert.ToDecimal(12.34) * s; data.Add(model); } else @@ -131,7 +141,7 @@ namespace DongYingAPI.Controllers var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime); decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH)); decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH)); - var model = new electricity_consumptionData(); ; + var model = new electricity_consumptionData(); model.Time = DateTime.Now.AddDays(-i).ToString("MM-dd"); model.EH = num1 - num2; if (model.EH < 0) @@ -188,7 +198,7 @@ namespace DongYingAPI.Controllers decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH)); decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH)); var model = new electricity_consumptionData(); ; - model.Time = jdate.ToString("MM月"); + model.Time = now.AddMonths(-i).ToString("MM月"); model.EH = num1 - num2; if (model.EH < 0) { diff --git a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs index a5caafb..8bfa360 100644 --- a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs +++ b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs @@ -191,7 +191,7 @@ namespace DongYingAPI.Controllers.api var adata=data.OrderBy(x=>x.time).ToList(); res.code = 200; res.msg = "成功"; - res.data = data; + res.data = adata; } else { diff --git a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs index 8579d11..a9e5aa8 100644 --- a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs +++ b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs @@ -110,7 +110,7 @@ namespace DongYingAPI.Controllers.api var model = new general_catalogueData(); model.TotalRelease = Math.Round(Convert.ToDecimal((num1-num2) / 1000 * Convert.ToDecimal(0.5703)), 3)+Convert.ToDecimal(4400 /12/ 1000 * Convert.ToDecimal(0.5703)); model.CarbonOffset = 0; - model.CarbonReduction = Convert.ToDecimal(742.81)/12; + model.CarbonReduction =Math.Round( Convert.ToDecimal(742.81)/12,3); model.Electricity = Math.Round(Convert.ToDecimal((num1-num2) / 1000 * Convert.ToDecimal(0.5703)), 3); model.NaturalGas =Math.Round((4400/12 / 1000 * Convert.ToDecimal(0.5703)),3); data.Add(model); diff --git a/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs b/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs index 1394225..cf0f769 100644 --- a/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs +++ b/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs @@ -26,20 +26,78 @@ namespace DongYingAPI.Controllers.api var now=DateTime.Now; var edate=Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:00:00")); var list=bll.GetModelList("").Where(x=>x.EntireTime==edate).ToList(); - if (list.Count == 0) + var model1 = new meteorological_stationData(); + model1.WeatherName = "湿度"; + var alist1 = list.Where(x => x.MeteorologicalName == model1.WeatherName).FirstOrDefault(); + if (alist1 == null) { - var model = new meteorological_stationData(); - model.WeatherName = "无"; - model.WeatherValue = 0; - data.Add(model); + model1.WeatherValue = 0; } - foreach (var item in list) + else { - var model = new meteorological_stationData(); - model.WeatherName = item.MeteorologicalName; - model.WeatherValue = item.MeteorologicalValue; - data.Add(model); + model1.WeatherValue = alist1.MeteorologicalValue; } + data.Add(model1); + var model2 = new meteorological_stationData(); + model2.WeatherName = "室外噪音"; + var alist2 = list.Where(x => x.MeteorologicalName == model2.WeatherName).FirstOrDefault(); + if (alist2 == null) + { + model2.WeatherValue = 0; + } + else + { + model2.WeatherValue = alist2.MeteorologicalValue; + } + data.Add(model2); + var model3 = new meteorological_stationData(); + model3.WeatherName = "温度"; + var alist3 = list.Where(x => x.MeteorologicalName == model3.WeatherName).FirstOrDefault(); + if (alist3 == null) + { + model3.WeatherValue = 0; + } + else + { + model3.WeatherValue = alist3.MeteorologicalValue; + } + data.Add(model3); + var model4 = new meteorological_stationData(); + model4.WeatherName = "风力"; + var alist4 = list.Where(x => x.MeteorologicalName == model4.WeatherName).FirstOrDefault(); + if (alist4 == null) + { + model4.WeatherValue = 0; + } + else + { + model4.WeatherValue = alist4.MeteorologicalValue; + } + data.Add(model4); + var model5 = new meteorological_stationData(); + model5.WeatherName = "空气质量"; + var alist5 = list.Where(x => x.MeteorologicalName == model5.WeatherName).FirstOrDefault(); + if (alist5 == null) + { + model5.WeatherValue = 0; + } + else + { + model5.WeatherValue = alist5.MeteorologicalValue; + } + data.Add(model5); + var model6 = new meteorological_stationData(); + model6.WeatherName = "紫外线强度"; + var alist6 = list.Where(x => x.MeteorologicalName == model6.WeatherName).FirstOrDefault(); + if (alist6 == null) + { + model6.WeatherValue = 0; + } + else + { + model6.WeatherValue = alist6.MeteorologicalValue; + } + data.Add(model6); res.code = 200; res.msg = "成功"; res.data = data; diff --git a/DongYingAPI/Controllers/api/GetPowerLoadController.cs b/DongYingAPI/Controllers/api/GetPowerLoadController.cs index 918e4b7..baf3593 100644 --- a/DongYingAPI/Controllers/api/GetPowerLoadController.cs +++ b/DongYingAPI/Controllers/api/GetPowerLoadController.cs @@ -67,7 +67,7 @@ namespace DongYingAPI.Controllers.api var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var now = DateTime.Now.AddDays(-i); var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num1 = 0; var list1 = list.Where(x => x.EntireTime >=Convert.ToDateTime(sdate) && x.EntireTime Convert.ToDecimal(x.P)); diff --git a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs index c3a1243..bf8d566 100644 --- a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs +++ b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs @@ -36,13 +36,9 @@ namespace DongYingAPI.Controllers.api decimal? num = 0; foreach (var item in list) { - num += item.P; + num +=Convert.ToDecimal(item.P); } model.P = num; - if(model.P == null) - { - model.P = 0; - } data.Add(model); res.code = 200; res.msg = "成功"; diff --git a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs index 1d72369..ecc727e 100644 --- a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs +++ b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs @@ -74,7 +74,10 @@ namespace DongYingAPI.Controllers.api time = DateTime.Now.AddHours(-i).ToString("HH:00"), EH = num1 - num2 }; - + if (model.EH < 0) + { + model.EH = 0; + } data.Add(model); } @@ -245,7 +248,10 @@ namespace DongYingAPI.Controllers.api time = DateTime.Now.AddHours(-i).ToString("HH:00"), EH = num1 - num2 }; - + if (model.EH < 0) + { + model.EH = 0; + } data.Add(model); } diff --git a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs index aa11f2e..7488646 100644 --- a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs +++ b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs @@ -105,7 +105,6 @@ namespace DongYingAPI.Controllers.api var model = new water_consumptionData(); model.time = time; model.WaterValue = num1 - num2; - model.WaterValue = num1 - num2; if (model.WaterValue < 0) { model.WaterValue = 0; @@ -162,7 +161,6 @@ namespace DongYingAPI.Controllers.api var model = new water_consumptionData(); model.time = time; model.WaterValue = num1 - num2; - model.WaterValue = num1 - num2; if (model.WaterValue < 0) { model.WaterValue = 0; diff --git a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user index f037ffe..98c0c51 100644 --- a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\ - True|2024-03-04T02:00:33.0681294Z;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00; + True|2024-03-19T09:05:11.6998862Z;True|2024-03-19T16:15:08.2016341+08:00;True|2024-03-12T13:39:36.5196065+08:00;True|2024-03-08T15:20:13.3402822+08:00;True|2024-03-08T09:32:17.5138435+08:00;True|2024-03-04T10:00:33.0681294+08:00;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00; @@ -85,10 +85,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/04/2024 09:29:28 - 03/04/2024 10:00:32 + 03/19/2024 17:05:10 - 03/04/2024 10:00:32 + 03/19/2024 17:05:10 08/03/2021 14:52:26 @@ -403,31 +403,31 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/01/2024 09:28:11 - 02/20/2024 14:21:14 + 03/19/2024 16:06:25 - 02/26/2024 16:28:40 + 03/19/2024 16:12:35 - 02/26/2024 11:02:02 + 03/19/2024 16:13:45 - 02/20/2024 14:37:50 + 03/19/2024 16:12:11 01/10/2024 13:25:43 - 02/01/2024 16:07:45 + 03/12/2024 15:05:03 02/20/2024 14:40:19 - 02/01/2024 14:54:17 + 03/12/2024 15:12:49 - 02/21/2024 10:30:51 + 03/04/2024 16:24:57 02/20/2024 17:07:40 @@ -436,7 +436,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/04/2024 13:59:28 - 02/02/2024 15:19:18 + 03/04/2024 17:18:25 02/21/2024 10:31:36 @@ -448,19 +448,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/20/2024 16:51:15 - 02/20/2024 14:42:14 + 03/19/2024 16:07:07 02/20/2024 15:04:19 - 02/20/2024 15:04:15 + 03/19/2024 16:43:57 02/20/2024 16:01:20 - 02/20/2024 17:06:47 + 03/04/2024 16:46:13 02/20/2024 15:11:54 @@ -478,7 +478,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/01/2024 15:10:41 - 02/20/2024 15:12:57 + 03/19/2024 16:12:35 03/01/2024 17:07:01 @@ -496,10 +496,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/04/2024 14:42:28 - 02/20/2024 16:55:55 + 03/12/2024 13:38:12 - 02/01/2024 15:08:46 + 03/04/2024 18:02:08 03/01/2024 17:25:32 @@ -508,10 +508,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/21/2024 10:24:34 - 02/05/2024 15:02:52 + 03/19/2024 16:50:46 - 02/20/2024 15:55:57 + 03/12/2024 15:18:20 02/20/2024 15:28:29 @@ -526,7 +526,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/01/2024 17:12:36 - 02/01/2024 16:43:20 + 03/19/2024 16:08:04 01/09/2024 10:54:33 @@ -619,7 +619,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 01/02/2024 09:27:24 - 02/04/2024 15:16:16 + 03/08/2024 15:06:30 01/02/2024 09:27:24 diff --git a/DongYingAPI/Views/Shared/_Layout.cshtml b/DongYingAPI/Views/Shared/_Layout.cshtml index 7b06679..fd2aaea 100644 --- a/DongYingAPI/Views/Shared/_Layout.cshtml +++ b/DongYingAPI/Views/Shared/_Layout.cshtml @@ -11,12 +11,12 @@
- - @Html.ActionLink("应用程序名称", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" }) + + @
    diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll index 822bcb6..335ca90 100644 Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb index 5799c5d..e6ac693 100644 Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll index 822bcb6..335ca90 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb index 5799c5d..e6ac693 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs index 3d1b659..a6bb9d6 100644 --- a/Security/ServiceSecurity.cs +++ b/Security/ServiceSecurity.cs @@ -363,6 +363,7 @@ namespace Security var data = JsonConvert.DeserializeObject(j); log.Info("电表:" + data); var ddate =Convert.ToDateTime( DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00")); + var sddate = Convert.ToDateTime(DateTime.Now.AddHours(-2).ToString("yyyy-MM-dd HH:00:00")); var llist = bll.GetModelListDate("", date).Where(x=>x.EntireTime == Convert.ToDateTime(ddate)).ToList(); if (llist.Count < 183) { @@ -371,7 +372,7 @@ namespace Security var vlist = bll.GetModelListDate(" ", date); foreach (var item in delist) { - var svlist =vlist.FirstOrDefault(x=>x.DeviceId== item.DeviceId); + var svlist = vlist.Where(x => x.DeviceId == item.DeviceId && x.EntireTime == sddate).FirstOrDefault(); var model = new DataServer.Model.electricity_data(); model.ElectricityId = Guid.NewGuid().ToString("N"); model.DeviceId = item.DeviceId; diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index 16720ae..bb04719 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - L0BhmW0xC8N0GvavcOZrFRBrP7geZ6GAkmrtPOPhHNI= + F5h6j3t4K8SG8UAHyg0cMkxZEKdnFoVZEHQD/i1M/uw= diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe index 35c27e4..9dfe348 100644 Binary files a/Security/bin/Debug/ServiceSecurity.exe and b/Security/bin/Debug/ServiceSecurity.exe differ diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest index b873e5e..6bb344b 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -138,14 +138,14 @@ - + - YGplY0qmZiDL8D3gel4WbXNgsj/rJ9EQ4oAKgQu7gRw= + DeEXQXhHErrr/HmyjFW3ODFDZSqUM3NqEfhmNWCyOno= diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb index 84afdcc..edc2990 100644 Binary files a/Security/bin/Debug/ServiceSecurity.pdb and b/Security/bin/Debug/ServiceSecurity.pdb differ diff --git a/Security/bin/Debug/app.publish/ServiceSecurity.exe b/Security/bin/Debug/app.publish/ServiceSecurity.exe index 2d504c9..42f6b17 100644 Binary files a/Security/bin/Debug/app.publish/ServiceSecurity.exe and b/Security/bin/Debug/app.publish/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application index 16720ae..bb04719 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - L0BhmW0xC8N0GvavcOZrFRBrP7geZ6GAkmrtPOPhHNI= + F5h6j3t4K8SG8UAHyg0cMkxZEKdnFoVZEHQD/i1M/uw= diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe index 35c27e4..9dfe348 100644 Binary files a/Security/obj/Debug/ServiceSecurity.exe and b/Security/obj/Debug/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest index b873e5e..6bb344b 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -138,14 +138,14 @@ - + - YGplY0qmZiDL8D3gel4WbXNgsj/rJ9EQ4oAKgQu7gRw= + DeEXQXhHErrr/HmyjFW3ODFDZSqUM3NqEfhmNWCyOno= diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb index 84afdcc..edc2990 100644 Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ