diff --git a/MasstransferExporter/ImageExporter/ImageService.cs b/MasstransferExporter/ImageExporter/ImageService.cs index a242e2d..8cf542c 100644 --- a/MasstransferExporter/ImageExporter/ImageService.cs +++ b/MasstransferExporter/ImageExporter/ImageService.cs @@ -24,7 +24,7 @@ public class ImageService : Instant /// private static async Task ListenImageQueryEvent(EventType type, bool start) { - await MessageQueueHelper.Subscribe(Topics.UpdateLicenseEvent, HandleImageQueryEvent); + await MessageQueueHelper.Subscribe(Topics.QueryImage, HandleImageQueryEvent); } /// @@ -34,10 +34,10 @@ public class ImageService : Instant { if (queryDto == null) return; - var batchNumber = queryDto.batchNumber; - var bizNumber = queryDto.bizNumber; - var imageType = queryDto.imageType; - var picType = queryDto.picType; + var batchNumber = queryDto.BatchNumber; + var bizNumber = queryDto.BizNumber; + var imageType = queryDto.ImageType; + var picType = queryDto.PicType; var isThumbnail = "thumbnail".Equals(imageType); diff --git a/MasstransferExporter/ImageExporter/Model/ImageQueryDTO.cs b/MasstransferExporter/ImageExporter/Model/ImageQueryDTO.cs index 99a68a4..c94acb9 100644 --- a/MasstransferExporter/ImageExporter/Model/ImageQueryDTO.cs +++ b/MasstransferExporter/ImageExporter/Model/ImageQueryDTO.cs @@ -1,12 +1,14 @@ -namespace MasstransferExporter.ImageExporter.Model; +using Newtonsoft.Json; + +namespace MasstransferExporter.ImageExporter.Model; public class ImageQueryDTO { - public string picType { get; set; } + [JsonProperty("picType")] public string PicType { get; set; } - public string bizNumber { get; set; } + [JsonProperty("bizNumber")] public string BizNumber { get; set; } - public string batchNumber { get; set; } + [JsonProperty("batchNumber")] public string BatchNumber { get; set; } - public string imageType { get; set; } + [JsonProperty("imageType")] public string ImageType { get; set; } } \ No newline at end of file diff --git a/MasstransferExporter/Program.cs b/MasstransferExporter/Program.cs index c908617..b51ebfd 100644 --- a/MasstransferExporter/Program.cs +++ b/MasstransferExporter/Program.cs @@ -38,8 +38,8 @@ class Program // 启动完成后,广播启动通知 EventBus.Publish(EventType.StartUp, true); - DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(), - TimeSpan.FromSeconds(3)); + // DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(), + // TimeSpan.FromSeconds(3)); // 启动与主程序的通信 diff --git a/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs b/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs index 0d8f842..44dac45 100644 --- a/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs +++ b/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs @@ -3,7 +3,6 @@ using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; using MasstransferCommunicate.Mqtt.Model; using MasstransferInfrastructure.Mqtt.Model; -using MasstransferSecurity.Utils; using MQTTnet; using MQTTnet.Client; using MQTTnet.Protocol; @@ -27,29 +26,15 @@ internal class MqttClient /// private MqttClientOptions GetConnectionOptions(MqttConnectOptions options) { - var clientId = DeviceInfoUtil.GenerateUniqueID(); - return new MqttClientOptionsBuilder() .WithTcpServer(options.ServerAddress, options.Port) - // .WithCredentials(options.UserName, options.Password) .WithClientId(Constants.SN) + .WithKeepAlivePeriod(TimeSpan.FromSeconds(60)) + .WithCleanStart(true) .WithCleanSession() - .WithTlsOptions( - o => - { - o.UseTls(options.EnableTls); - o.WithSslProtocols(options.Protocols); - } - ) .Build(); } - private X509Certificate2 GetCertificate(string certBase64) - { - var certBytes = Convert.FromBase64String(certBase64); - return new X509Certificate2(certBytes); - } - /// /// 连接MQTT /// @@ -66,7 +51,15 @@ internal class MqttClient client.ApplicationMessageReceivedAsync += (e) => { - MessageReceived?.Invoke(client, e); + try + { + MessageReceived?.Invoke(client, e); + } + catch (Exception exception) + { + Console.WriteLine(exception); + } + return Task.CompletedTask; };