修复16进制转10进制BUG

Waste.Application/PostInfo/SuZhou/ISuZhouService.cs

@@ -90,6 +90,11 @@ namespace Waste.Application
         /// <returns></returns>
          int GetNonce();
 
+        /// <summary>
+        /// 获取UTC时间戳
+        /// </summary>
+        /// <returns></returns>
+        int GetUTCTimestamp();
         /// <summary>
         /// 获取签名
         /// </summary>

Waste.Application/PostInfo/SuZhou/SuZhouService.cs

@@ -195,6 +195,18 @@ namespace Waste.Application
             int timestamp = Convert.ToInt32((DateTime.Now - dateTimeStart).TotalSeconds);
             return timestamp;
         }
+
+        /// <summary>
+        /// 获取UTC时间戳
+        /// </summary>
+        /// <returns></returns>
+        public int GetUTCTimestamp()
+        {
+            DateTime utcTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now);
+            DateTime utcStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            int timestamp = Convert.ToInt32((utcTime - utcStartTime).TotalSeconds);
+            return timestamp;
+        }
         /// <summary>
         /// 获取随机数
         /// </summary>

Waste.Application/ThirdApiInfo/Dtos/ThirdApiInfoDto.cs

@@ -96,7 +96,7 @@ namespace Waste.Application.ThirdApiInfo
         /// <summary>
         /// 记录ID
         /// </summary>
-        public Guid? ResultId { get; set; } = null;
+        public string ResultId { get; set; } = "";
         /// <summary>
         /// 串口数据
         /// </summary>

Waste.Application/ThirdApiInfo/OpenService.cs

@@ -38,15 +38,16 @@ namespace Waste.Application.ThirdApiInfo
         public async Task<ResultInfo> GetDevInfoAsync(GetDevInfoRequestDto data)
         {
             //更新上报记录结果
-            if (data.ResultId.HasValue && data.ResultId.Value != Guid.Empty)
+            Guid resultid=Guid.Empty;
+            if (!string.IsNullOrEmpty(data.ResultId) && Guid.TryParse(data.ResultId,out resultid))
             {
-                int status = data.data.ToInt();
+                int status = data.data.ToInt();//0-成功,1-失败
-                if (await dbClient.Queryable<W_ResultExt>().AnyAsync(x => x.ResultId == data.ResultId.Value))
+                if (await dbClient.Queryable<W_ResultExt>().AnyAsync(x => x.ResultId == resultid))
                 {
                     await dbClient.Updateable<W_ResultExt>().SetColumns(x => new W_ResultExt
                     {
                         Status = status
-                    }).Where(x => x.ResultId == data.ResultId.Value).ExecuteCommandAsync();
+                    }).Where(x => x.ResultId == resultid).ExecuteCommandAsync();
                 }
                 else
                 {
@@ -55,7 +56,7 @@ namespace Waste.Application.ThirdApiInfo
                         Id = IDGen.NextID(),
                         Status = status,
                         CreateTime = DateTime.Now,
-                        ResultId = data.ResultId.Value
+                        ResultId = resultid
                     };
                     await dbClient.Insertable(insertdata).ExecuteCommandAsync();
                 }
@@ -75,7 +76,7 @@ namespace Waste.Application.ThirdApiInfo
                 {
                     return new ResultInfo(ResultState.FAIL, "设备还未获取验证信息");
                 }
-                int timestamp = _suZhouService.GetTimestamp();
+                int timestamp = _suZhouService.GetUTCTimestamp();
                 int noncestr = _suZhouService.GetNonce();
                 var returndata = new GetDevInfoResponseDto
                 {
@@ -99,7 +100,7 @@ namespace Waste.Application.ThirdApiInfo
                     var trashhex = data.data.Substring(16, 10);
                     var typehex = data.data.Substring(28, 16);
                     var weighthex = data.data.Substring(46, data.data.Length - 46);
-                    returndata.trash = Convert.ToInt64(trashhex).ToString(); //垃圾桶编号使用10进制
+                    returndata.trash = (Int64.Parse(trashhex, System.Globalization.NumberStyles.HexNumber)).ToString(); ; //垃圾桶编号使用10进制
                     var type = GetChsFromHex(typehex);
                     var weight = GetChsFromHex(weighthex);
                     returndata.type = TrashType(type);
@@ -288,7 +289,7 @@ namespace Waste.Application.ThirdApiInfo
                 data.UserId = UserId;
                 data.Secret = devicesecret.Secret;
                 data.SecretHash = devicesecret.SecretHash;
-                data.DeviceId = devicesecret.DeviceId.ToString();
+                data.DeviceId = devicesecret.DevId.ToString();
             }
             return new ResultInfo(ResultState.SUCCESS, "success", data);
         }

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|2021-08-10T23:54:57.1322848Z;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|2021-08-12T12:11:21.5851106Z;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>

WasteConsoleTest/WasteConsoleTest/Program.cs

@@ -17,8 +17,8 @@ namespace WasteConsoleTest
     class Program
     {
         private static WSocketClientHelp wSocketClient = null;
-        public static string Secret = "g8OEiOAaKjYK38aj";
+        public static string Secret = "lsBThmYBYUMrmwkl";
-        public static string SecretHash = "9729e43752011ad4";
+        public static string SecretHash = "bfbaf98fb5b343b2";
         static async Task Main(string[] args)
         {
             var builder = new HostBuilder().ConfigureServices((hostContext, services) =>

WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs

@@ -13,9 +13,9 @@ namespace WasteConsoleTest
         ClientWebSocket ws = null;
         Uri uri = null;
         bool isUserClose = false;//是否最后由用户手动关闭
-        public static string Secret = "g8OEiOAaKjYK38aj";
+        public static string Secret = "lsBThmYBYUMrmwkl";
-        public static string SecretHash = "9729e43752011ad4";
+        public static string SecretHash = "bfbaf98fb5b343b2";
-        public static string deviceid = "08d95bb6-a0f1-4964-85ac-9786b3571656";
+        public static string deviceid = "08d9588d-4796-48f9-8c5b-f28f271b51d0";
 
         // <summary>
         /// WebSocket状态