From 4cbc021ada515e30b9805244098bf25b544a1f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Wed, 10 Sep 2025 09:57:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8A=E6=8A=A5=E5=90=8E=EF=BC=8C=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs b/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs index 15c73bb..ec07e56 100644 --- a/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs +++ b/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs @@ -879,9 +879,9 @@ namespace OpenAuth.App.ServiceApp.DroneDocking var result = JsonSerializer.Deserialize>(responseBody); Console.WriteLine($"无人机状态上报结果：{responseBody}"); //解密数据 - byte[] resbytesx = Convert.FromBase64String(resxClScrete); + /*byte[] resbytesx = Convert.FromBase64String(resxClScrete); byte[] resdatabytes = Convert.FromBase64String(result?.data); - string data = _helper.Decrypt(resbytesx, resdatabytes); + string data = _helper.Decrypt(resbytesx, resdatabytes);*/ // 结果 } catch (HttpRequestException e) From e08a671ef705c66050142ff695af34f7946c9b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Wed, 10 Sep 2025 09:59:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bugfix=EF=BC=9A=E5=8F=AF=E8=83=BD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8E=BB=E9=87=8D=E5=A4=84=E7=90=86=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=93=E6=9D=9F=E6=B6=88=E6=81=AF=E6=9C=AA?= =?UTF-8?q?=E8=83=BD=E8=A2=AB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceApp/Subscribe/ConfigSubscribe.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs index fdb8ff8..a70a9a0 100644 --- a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs +++ b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs @@ -550,15 +550,6 @@ public class ConfigSubscribe : IJob { string flightId1 = (string)data.output.ext.flight_id; var waylineMissionState = (int)data.output.ext.wayline_mission_state; - // current_step - var isHandle = IsDuplicate(Md5.Encrypt($"{result.bid}{flightId1}")); - _logger.LogDebug($"md5: {isHandle} 重复否：{IsDuplicate(Md5.Encrypt(message))}" + - $"主题：{topic} 信息：{message} "); - if (isHandle) - { - _logger.LogInformation("跳过处理"); - break; - } _logger.LogDebug("航线进度未跳过处理"); code = data.result; // result @@ -639,6 +630,15 @@ public class ConfigSubscribe : IJob _logger.LogDebug($"航线进度：{waylineMissionState} {step} {message}"); if (step.Equals(25)) // todo 关于会接收到不同消息问题，如何处理 { + // current_step + var isHandle = IsDuplicate(Md5.Encrypt($"{result.bid}{flightId1}")); + _logger.LogDebug($"md5: {isHandle} 重复否：{IsDuplicate(Md5.Encrypt(message))}" + + $"主题：{topic} 信息：{message} "); + if (isHandle) + { + _logger.LogInformation("跳过处理"); + break; + } var task = await _sqlSugarClient.Queryable() .FirstAsync(y => y.Id == taskAssign1.TaskId); if (task != null && !string.IsNullOrEmpty(task.AIInspection) &&