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) 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) &&