From dcc81ba6fcaa1a67b7562da0d9713f0087ba41b0 Mon Sep 17 00:00:00 2001
From: Hinse <756681202@qq.com>
Date: Wed, 6 Jul 2022 09:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=85=A8=E9=83=A8=E5=B0=8F=E5=86=99=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Waste.Application/Mapper.cs                   | 12 ++--
 .../ResultInfos/ResultAppService.cs           | 11 ++--
 .../ResultInfos/ResultService.cs              | 14 +++--
 .../SubscribeInfo/Dtos/SubscribeDto.cs        | 40 ++++++++++---
 Waste.Application/Test/TestAppService.cs      | 36 +++++++-----
 .../ThirdApiInfo/Message/IMessageService.cs   | 21 -------
 .../ThirdApiInfo/Message/MessageService.cs    | 58 -------------------
 Waste.Application/Waste.Application.xml       | 44 ++++----------
 .../waste.ybhdmob.com.pubxml.user             |  2 +-
 9 files changed, 85 insertions(+), 153 deletions(-)
 delete mode 100644 Waste.Application/ThirdApiInfo/Message/IMessageService.cs
 delete mode 100644 Waste.Application/ThirdApiInfo/Message/MessageService.cs

diff --git a/Waste.Application/Mapper.cs b/Waste.Application/Mapper.cs
index dfddc08..375c27c 100644
--- a/Waste.Application/Mapper.cs
+++ b/Waste.Application/Mapper.cs
@@ -17,12 +17,16 @@ namespace Waste.Application
             config.ForType<ApiReportBaseDataItem, ApiReportBaseData>()
                  .Map(dest => dest.weight, src => src.DayWeight.ToString("f2"))
                  .Map(dest => dest.pweight, src => src.DayPureWeight.ToString("f2"))
-                 .Map(dest=>dest.time,src=>src.CreateTime.ToString("yyyy-MM-dd"))
-                 .Map(dest=>dest.type,src=>src.WasteType)
+                 .Map(dest => dest.time, src => src.CreateTime.ToString("yyyy-MM-dd"))
+                 .Map(dest => dest.type, src => src.WasteType)
                  ;
             config.ForType<SendThirdMessageSubscribeS2SDto, SendThirdMessageSubscriDto>()
-                 .Map(dest => dest.Time, src => src.Time.GetTimeStamp())
+                 .Map(dest => dest.time, src => src.Time.GetTimeStamp())
                  ;
+            config.ForType<SendThirdMessageSubscriDto, SendMessageToThirdS2CDto>()
+               .Map(dest => dest.trashcode, src => src.trashcode.ToStr())
+               .Map(dest => dest.wastestype, src => src.wastestype.ToStr())
+               ;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Waste.Application/ResultInfos/ResultAppService.cs b/Waste.Application/ResultInfos/ResultAppService.cs
index ffa32ec..7fd3407 100644
--- a/Waste.Application/ResultInfos/ResultAppService.cs
+++ b/Waste.Application/ResultInfos/ResultAppService.cs
@@ -12,10 +12,12 @@ namespace Waste.Application.ResultInfos
     public class ResultAppService : IDynamicApiController
     {
         private readonly IResultService _resultService;
+
         public ResultAppService(IResultService resultService)
         {
             _resultService = resultService;
         }
+
         /// <summary>
         /// 投放记录列表
         /// </summary>
@@ -26,6 +28,7 @@ namespace Waste.Application.ResultInfos
         {
             return await _resultService.GetListAsync(param);
         }
+
         /// <summary>
         /// 添加记录
         /// </summary>
@@ -45,11 +48,5 @@ namespace Waste.Application.ResultInfos
         {
             await _resultService.InsertResultByWifiAsync(data);
         }
-
-        public async Task<string> RecvResult(SendMessageToThirdS2CDto data)
-        {
-            var getdata = data;
-            return await Task.FromResult("success");
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/Waste.Application/ResultInfos/ResultService.cs b/Waste.Application/ResultInfos/ResultService.cs
index 069d903..f23f693 100644
--- a/Waste.Application/ResultInfos/ResultService.cs
+++ b/Waste.Application/ResultInfos/ResultService.cs
@@ -34,6 +34,7 @@ namespace Waste.Application
             _loggerService = loggerService;
             _capBus = capPublisher;
         }
+
         /// <summary>
         /// 获取投放记录
         /// </summary>
@@ -127,7 +128,8 @@ namespace Waste.Application
                     {
                         it.PostStatus = res.Status;
                     }
-                    var allext = cache.Get(list => {
+                    var allext = cache.Get(list =>
+                    {
                         var ids = list.Select(e => e.Id).ToList();
                         return dbClient.Queryable<W_MeasureResult>().Where(e => ids.Contains(e.ResultId)).ToList();
                     });
@@ -143,6 +145,7 @@ namespace Waste.Application
                 limit = param.limit
             };
         }
+
         /// <summary>
         /// wifi模块测量结果增加
         /// </summary>
@@ -285,6 +288,7 @@ namespace Waste.Application
                 });
             }
         }
+
         /// <summary>
         /// 新的A8 4G模块测量结果增加
         /// </summary>
@@ -382,6 +386,7 @@ namespace Waste.Application
                 });
             }
         }
+
         /// <summary>
         /// 给第三方推送消息
         /// </summary>
@@ -401,11 +406,12 @@ namespace Waste.Application
             if (configdata != null && !configdata.Url.IsEmpty())
             {
                 var senddata = input.Adapt<SendThirdMessageSubscriDto>();
-                senddata.Body = configdata.Body.ToStr();
+                senddata.body = configdata.Body.ToStr();
                 senddata.Url = configdata.Url.ToStr();
                 await _capBus.PublishAsync("third.service.sendmessage", senddata);
             }
         }
+
         /// <summary>
         /// 增加测量记录
         /// </summary>
@@ -464,7 +470,6 @@ namespace Waste.Application
                 }
                 //000F000002.16进制
                 //  var areaHex = Convert.ToHexString(areaBytes);
-
             }
             decimal weight = myPackage.Weight.IsEmpty() ? 0 : myPackage.Weight.ToDecimal();
             //记录数据
@@ -533,6 +538,7 @@ namespace Waste.Application
         {
             return Convert.ToInt32(((int)bt).ToString("X2"), 16);
         }
+
         private static int GetTimestamp(DateTime time)
         {
             DateTime dateTimeStart = TimeZoneInfo.ConvertTimeToUtc(new DateTime(1970, 1, 1, 8, 0, 0));
@@ -549,4 +555,4 @@ namespace Waste.Application
             else return 0;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Waste.Application/SubscribeInfo/Dtos/SubscribeDto.cs b/Waste.Application/SubscribeInfo/Dtos/SubscribeDto.cs
index 8734088..4afa49b 100644
--- a/Waste.Application/SubscribeInfo/Dtos/SubscribeDto.cs
+++ b/Waste.Application/SubscribeInfo/Dtos/SubscribeDto.cs
@@ -15,59 +15,73 @@ namespace Waste.Application.SubscribeInfo
         /// 设备ID
         /// </summary>
         public Guid DeviceId { get; set; }
+
         /// <summary>
         /// 最近使用时间
         /// </summary>
         public DateTime? LastHeartTime { get; set; }
+
         /// <summary>
         /// 记录ID
         /// </summary>
         public Guid ResultId { get; set; }
+
         /// <summary>
         /// 设备服务商ID
         /// </summary>
         public Guid BusinessId { get; set; }
+
         /// <summary>
         /// 设备的IMEI
         /// </summary>
         public string imei { get; set; }
+
         /// <summary>
         /// ICCID
         /// </summary>
         public string iccid { get; set; }
+
         /// <summary>
         /// IMSI
         /// </summary>
         public string imsi { get; set; }
+
         /// <summary>
         /// 纬度
         /// </summary>
         public decimal latitude { get; set; }
+
         /// <summary>
         /// 经度
         /// </summary>
         public decimal longtitude { get; set; }
+
         /// <summary>
         /// 信号强度
         /// </summary>
         public int gslq { get; set; }
+
         /// <summary>
         /// 垃圾类型
         /// </summary>
         public string wastetype { get; set; }
+
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
         public string trash { get; set; }
+
         /// <summary>
         /// 毛重
         /// </summary>
         public string weight { get; set; }
+
         /// <summary>
         /// 皮重
         /// </summary>
         public decimal Tare { get; set; }
     }
+
     /// <summary>
     /// 设备版本信息
     /// </summary>
@@ -77,11 +91,13 @@ namespace Waste.Application.SubscribeInfo
         /// 设备机器码
         /// </summary>
         public string ecode { get; set; }
+
         /// <summary>
         /// 版本号
         /// </summary>
         public string ver { get; set; }
     }
+
     /// <summary>
     /// 发送第三方消息
     /// </summary>
@@ -96,18 +112,22 @@ namespace Waste.Application.SubscribeInfo
         /// 垃圾类别
         /// </summary>
         public string WasteType { get; set; }
+
         /// <summary>
         /// 物品小类别
         /// </summary>
         public string WasteSType { get; set; } = "";
+
         /// <summary>
         /// 重量,单位KG
         /// </summary>
         public decimal Weight { get; set; }
+
         /// <summary>
         /// 垃圾桶编号
         /// </summary>s
         public string TrashCode { get; set; }
+
         /// <summary>
         /// 上报时间
         /// </summary>
@@ -124,6 +144,7 @@ namespace Waste.Application.SubscribeInfo
         /// </summary>
         public string Url { get; set; }
     }
+
     /// <summary>
     /// 推送给第三方的信息
     /// </summary>
@@ -132,33 +153,36 @@ namespace Waste.Application.SubscribeInfo
         /// <summary>
         /// 垃圾类别
         /// </summary>
-        public string WasteType { get; set; }
+        public string wastetype { get; set; }
 
         /// <summary>
         /// 物品小类别
         /// </summary>
-        public string WasteSType { get; set; } = "";
+        public string wastestype { get; set; } = "";
 
         /// <summary>
         /// 重量,单位KG
         /// </summary>
-        public string Weight { get; set; }
+        public string weight { get; set; }
+
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
-        public string TrashCode { get; set; }
+        public string trashcode { get; set; }
+
         /// <summary>
         /// 上报时间
         /// </summary>
-        public long Time { get; set; }
+        public long time { get; set; }
+
         /// <summary>
         /// 额外信息
         /// </summary>
-        public string Body { get; set; }
+        public string body { get; set; }
 
         /// <summary>
         /// 设备ID
         /// </summary>
-        public Guid DeviceId { get; set; }
+        public Guid deviceid { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Waste.Application/Test/TestAppService.cs b/Waste.Application/Test/TestAppService.cs
index 5cdd8e6..bbf8f9e 100644
--- a/Waste.Application/Test/TestAppService.cs
+++ b/Waste.Application/Test/TestAppService.cs
@@ -25,12 +25,14 @@ namespace Waste.Application
         private readonly IHttpClientFactory _clientFactory;
         private readonly ILoggerService _loggerService;
         private readonly ISubscribeService _subscribeService;
+
         public TestAppService(ILoggerService loggerService, IHttpClientFactory clientFactory, ISubscribeService subscribeService)
         {
             _loggerService = loggerService;
             _clientFactory = clientFactory;
             _subscribeService = subscribeService;
         }
+
         /// <summary>
         /// 接收测试
         /// </summary>
@@ -48,23 +50,24 @@ namespace Waste.Application
         [HttpGet]
         public void ConnectServer()
         {
-
         }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <returns></returns>
         [HttpGet]
         public async Task TestThirdSendAsync()
         {
-            await _subscribeService.SeedThirdMessageAsync(new SendThirdMessageSubscriDto { 
-                Url= "https://localhost:44335/api/test/recv",
-                WasteType= "\u0000\u0000\u0000\u0000纸壳",
-                Weight="20.9",
-                TrashCode="0",
-                Time= 1653033312,
-                Body="",
-                DeviceId= Guid.Parse("39fcdce8-9e54-b87f-fc8e-616a9072c224")
+            await _subscribeService.SeedThirdMessageAsync(new SendThirdMessageSubscriDto
+            {
+                Url = "https://localhost:44335/api/test/recv",
+                wastetype = "\u0000\u0000\u0000\u0000纸壳",
+                weight = "20.9",
+                trashcode = "0",
+                time = 1653033312,
+                body = "",
+                deviceid = Guid.Parse("39fcdce8-9e54-b87f-fc8e-616a9072c224")
             });
         }
 
@@ -77,17 +80,18 @@ namespace Waste.Application
         [HttpGet]
         public async Task TestSendAsync()
         {
-            GarbagePltC2SDto garbageC2SDto = new GarbagePltC2SDto { 
-                Weight=10.1,
+            GarbagePltC2SDto garbageC2SDto = new GarbagePltC2SDto
+            {
+                Weight = 10.1,
                 secret = "6Vxkfkg3kxqkkzgT",
                 secrethash = "51fb893bccc1395e",
-                ScanningTime= 1627917492,
-                DStatus=0,
+                ScanningTime = 1627917492,
+                DStatus = 0,
                 deviceid = "08d954b6-df45-4de1-8fde-f5109798b855",
                 Trash = "000F000002",
                 Type = 4
             };
-            if(garbageC2SDto.Weight == ((int)garbageC2SDto.Weight).ToDouble())
+            if (garbageC2SDto.Weight == ((int)garbageC2SDto.Weight).ToDouble())
             {
                 garbageC2SDto.Weight = garbageC2SDto.Weight.ToDouble(0);
             }
@@ -157,4 +161,4 @@ namespace Waste.Application
             return sign;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Waste.Application/ThirdApiInfo/Message/IMessageService.cs b/Waste.Application/ThirdApiInfo/Message/IMessageService.cs
deleted file mode 100644
index ccbb5f0..0000000
--- a/Waste.Application/ThirdApiInfo/Message/IMessageService.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Waste.Application.ThirdApiInfo.Message
-{
-    /// <summary>
-    /// 设备消息推送给第三方处理
-    /// </summary>
-    public interface IMessageService
-    {
-        /// <summary>
-        /// 消息发送
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        Task SeedMessageAsync(SendMessageS2SDto input);
-    }
-}
diff --git a/Waste.Application/ThirdApiInfo/Message/MessageService.cs b/Waste.Application/ThirdApiInfo/Message/MessageService.cs
deleted file mode 100644
index f1cf68c..0000000
--- a/Waste.Application/ThirdApiInfo/Message/MessageService.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using DotNetCore.CAP;
-using Furion.DependencyInjection;
-using Nirvana.Common;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Waste.Application.SubscribeInfo;
-using Waste.Domain;
-
-namespace Waste.Application.ThirdApiInfo.Message
-{
-    /// <summary>
-    /// 设备消息推送给第三方处理
-    /// </summary>
-    public class MessageService : IMessageService, ITransient
-    {
-        private readonly ISqlSugarRepository<W_DeviceConfig> repository;
-        private readonly ICapPublisher _capBus;
-        private readonly SqlSugarClient dbClient;
-        public MessageService(ISqlSugarRepository<W_DeviceConfig> sqlSugarRepository, ICapPublisher capBus)
-        {
-            repository = sqlSugarRepository;
-            dbClient = repository.Context;
-            _capBus = capBus;
-        }
-        /// <summary>
-        /// 消息发送
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public async Task SeedMessageAsync(SendMessageS2SDto input)
-        {
-            if (!await dbClient.Queryable<W_DeviceConfig>().AnyAsync(x => x.DeviceId == input.DeviceId))
-            {
-                return;
-            }
-            var config = await dbClient.Queryable<W_DeviceConfig>().Where(x => x.DeviceId == input.DeviceId).Select(x => new W_DeviceConfig
-            {
-                Body = x.Body,
-                Url = x.Url
-            }).FirstAsync();
-
-            var time = input.Time.GetTimeStamp();
-            await _capBus.PublishAsync("third.service.sendmessage", new SendThirdMessageSubscriDto
-            {
-                WasteType = input.WasteType,
-                Body = config.Body,
-                Time = time,
-                TrashCode = input.TrashCode,
-                Url = config.Url,
-                Weight = input.Weight
-            });
-        }
-    }
-}
diff --git a/Waste.Application/Waste.Application.xml b/Waste.Application/Waste.Application.xml
index 68dbe2e..4f63fec 100644
--- a/Waste.Application/Waste.Application.xml
+++ b/Waste.Application/Waste.Application.xml
@@ -2287,37 +2287,37 @@
             推送给第三方的信息
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.WasteType">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.wastetype">
             <summary>
             垃圾类别
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.WasteSType">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.wastestype">
             <summary>
             物品小类别
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.Weight">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.weight">
             <summary>
             重量,单位KG
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.TrashCode">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.trashcode">
             <summary>
             垃圾桶编号
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.Time">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.time">
             <summary>
             上报时间
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.Body">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.body">
             <summary>
             额外信息
             </summary>
         </member>
-        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.DeviceId">
+        <member name="P:Waste.Application.SubscribeInfo.SendMessageToThirdS2CDto.deviceid">
             <summary>
             设备ID
             </summary>
@@ -2730,10 +2730,10 @@
             <returns></returns>
         </member>
         <member name="M:Waste.Application.TestAppService.TestThirdSendAsync">
-            <summary>
+             <summary>
             
-            </summary>
-            <returns></returns>
+             </summary>
+             <returns></returns>
         </member>
         <member name="T:Waste.Application.ThirdApiInfo.DevHeartRequestDto">
             <summary>
@@ -3092,30 +3092,6 @@
             <param name="data"></param>
             <returns></returns>
         </member>
-        <member name="T:Waste.Application.ThirdApiInfo.Message.IMessageService">
-            <summary>
-            设备消息推送给第三方处理
-            </summary>
-        </member>
-        <member name="M:Waste.Application.ThirdApiInfo.Message.IMessageService.SeedMessageAsync(Waste.Application.ThirdApiInfo.SendMessageS2SDto)">
-            <summary>
-            消息发送
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Waste.Application.ThirdApiInfo.Message.MessageService">
-            <summary>
-            设备消息推送给第三方处理
-            </summary>
-        </member>
-        <member name="M:Waste.Application.ThirdApiInfo.Message.MessageService.SeedMessageAsync(Waste.Application.ThirdApiInfo.SendMessageS2SDto)">
-            <summary>
-            消息发送
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="T:Waste.Application.ThirdApiInfo.OpenAppService">
             <summary>
             开放数据
diff --git a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
index 5b0639b..c644887 100644
--- a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
+++ b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
-    <History>True|2022-06-21T06:41:45.3390865Z;False|2022-06-21T14:31:42.6318272+08:00;True|2022-06-21T14:07:42.4016410+08:00;True|2022-06-20T15:37:14.0002383+08:00;True|2022-06-20T08:32:15.3735483+08:00;True|2022-06-18T10:39:25.0997617+08:00;True|2022-06-15T11:23:32.6444305+08:00;True|2022-06-07T10:26:48.8057155+08:00;True|2022-05-19T14:38:58.4564787+08:00;True|2022-05-19T10:00:43.2712891+08:00;True|2022-05-17T18:00:53.2618269+08:00;True|2022-05-17T17:55:33.2053115+08:00;True|2022-05-17T17:38:48.8279756+08:00;True|2022-05-16T16:44:49.1758100+08:00;True|2022-03-30T10:54:32.5565057+08:00;True|2022-03-30T10:53:48.9972377+08:00;True|2022-03-30T10:50:31.5745775+08:00;True|2022-03-30T10:47:50.1605527+08:00;True|2022-03-30T10:15:59.9812921+08:00;True|2022-03-29T09:29:45.1039655+08:00;True|2022-03-29T09:21:47.0149226+08:00;True|2022-03-28T10:33:44.7419612+08:00;True|2022-03-28T10:22:40.9448563+08:00;True|2022-03-28T10:19:15.1438519+08:00;True|2022-01-20T10:39:53.2000547+08:00;True|2021-11-23T17:45:59.0399234+08:00;True|2021-11-23T14:52:52.6108389+08:00;True|2021-11-23T13:47:55.8909321+08:00;True|2021-11-23T13:46:38.7796888+08:00;True|2021-11-23T13:42:14.9551976+08:00;True|2021-11-23T13:40:54.9093258+08:00;True|2021-11-23T13:31:49.0003794+08:00;True|2021-11-23T13:29:43.7414639+08:00;True|2021-10-12T15:18:06.6012215+08:00;True|2021-10-12T15:11:17.7752651+08:00;True|2021-10-12T14:54:39.0578509+08:00;True|2021-10-12T11:25:18.7098128+08:00;True|2021-09-18T15:34:20.7386778+08:00;True|2021-09-15T11:09:28.0068993+08:00;True|2021-09-07T12:19:33.4635211+08:00;True|2021-09-07T11:36:13.4563799+08:00;True|2021-09-03T15:41:46.2819586+08:00;True|2021-08-31T17:16:16.0336390+08:00;True|2021-08-31T16:05:30.7224440+08:00;True|2021-08-23T09:44:46.2114418+08:00;True|2021-08-19T20:32:56.2854974+08:00;True|2021-08-18T14:01:33.0411246+08:00;True|2021-08-17T10:05:15.4299188+08:00;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;True|2021-08-13T14:59:40.4579407+08:00;True|2021-08-13T10:02:29.7650246+08:00;True|2021-08-13T09:45:10.6245894+08:00;True|2021-08-12T20:11:21.5851106+08:00;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
+    <History>True|2022-07-06T00:59:01.5108509Z;True|2022-06-21T14:41:45.3390865+08:00;False|2022-06-21T14:31:42.6318272+08:00;True|2022-06-21T14:07:42.4016410+08:00;True|2022-06-20T15:37:14.0002383+08:00;True|2022-06-20T08:32:15.3735483+08:00;True|2022-06-18T10:39:25.0997617+08:00;True|2022-06-15T11:23:32.6444305+08:00;True|2022-06-07T10:26:48.8057155+08:00;True|2022-05-19T14:38:58.4564787+08:00;True|2022-05-19T10:00:43.2712891+08:00;True|2022-05-17T18:00:53.2618269+08:00;True|2022-05-17T17:55:33.2053115+08:00;True|2022-05-17T17:38:48.8279756+08:00;True|2022-05-16T16:44:49.1758100+08:00;True|2022-03-30T10:54:32.5565057+08:00;True|2022-03-30T10:53:48.9972377+08:00;True|2022-03-30T10:50:31.5745775+08:00;True|2022-03-30T10:47:50.1605527+08:00;True|2022-03-30T10:15:59.9812921+08:00;True|2022-03-29T09:29:45.1039655+08:00;True|2022-03-29T09:21:47.0149226+08:00;True|2022-03-28T10:33:44.7419612+08:00;True|2022-03-28T10:22:40.9448563+08:00;True|2022-03-28T10:19:15.1438519+08:00;True|2022-01-20T10:39:53.2000547+08:00;True|2021-11-23T17:45:59.0399234+08:00;True|2021-11-23T14:52:52.6108389+08:00;True|2021-11-23T13:47:55.8909321+08:00;True|2021-11-23T13:46:38.7796888+08:00;True|2021-11-23T13:42:14.9551976+08:00;True|2021-11-23T13:40:54.9093258+08:00;True|2021-11-23T13:31:49.0003794+08:00;True|2021-11-23T13:29:43.7414639+08:00;True|2021-10-12T15:18:06.6012215+08:00;True|2021-10-12T15:11:17.7752651+08:00;True|2021-10-12T14:54:39.0578509+08:00;True|2021-10-12T11:25:18.7098128+08:00;True|2021-09-18T15:34:20.7386778+08:00;True|2021-09-15T11:09:28.0068993+08:00;True|2021-09-07T12:19:33.4635211+08:00;True|2021-09-07T11:36:13.4563799+08:00;True|2021-09-03T15:41:46.2819586+08:00;True|2021-08-31T17:16:16.0336390+08:00;True|2021-08-31T16:05:30.7224440+08:00;True|2021-08-23T09:44:46.2114418+08:00;True|2021-08-19T20:32:56.2854974+08:00;True|2021-08-18T14:01:33.0411246+08:00;True|2021-08-17T10:05:15.4299188+08:00;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;True|2021-08-13T14:59:40.4579407+08:00;True|2021-08-13T10:02:29.7650246+08:00;True|2021-08-13T09:45:10.6245894+08:00;True|2021-08-12T20:11:21.5851106+08:00;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
   </PropertyGroup>
 </Project>
\ No newline at end of file