diff --git a/TelpoPush.Service/Mq/Kafka/KafkaService.cs b/TelpoPush.Service/Mq/Kafka/KafkaService.cs index a9de3eb..d2b5345 100644 --- a/TelpoPush.Service/Mq/Kafka/KafkaService.cs +++ b/TelpoPush.Service/Mq/Kafka/KafkaService.cs @@ -32,6 +32,7 @@ namespace TelpoPush.Service.Mq.Kafka //SslCaLocation = @"D:\THOMAS\Project\SSJL\C#\Net8\TelpoPushThirdSsl\pem\ca-root.pem", EnableAutoCommit = false, // 禁止AutoCommit AutoOffsetReset = AutoOffsetReset.Earliest, // 从最早的开始消费起 + CancellationDelayMaxMs=1 }; } diff --git a/TelpoPush.Worker.ThirdSsl/Handlers/ThirdSslProcess.cs b/TelpoPush.Worker.ThirdSsl/Handlers/ThirdSslProcess.cs index 2cd6ca2..829c690 100644 --- a/TelpoPush.Worker.ThirdSsl/Handlers/ThirdSslProcess.cs +++ b/TelpoPush.Worker.ThirdSsl/Handlers/ThirdSslProcess.cs @@ -33,7 +33,7 @@ namespace TelpoPush.Worker.ThirdSsl.Handlers { //lock (_syncLocker) //{ - _logger.LogInformation($"获取kafka数据Message:<{message}>"); + _logger.LogInformation($"获取kafka数据Message:<{message}>"); if (!string.IsNullOrEmpty(message)) { @@ -43,7 +43,7 @@ namespace TelpoPush.Worker.ThirdSsl.Handlers switch (model.TopicName) { case "topic.push.telpo.zkheartrate": - await DataServiceZkRealHRMonitor(model); + await DataServiceZkRealHRMonitor(model); break; default: break; diff --git a/TelpoPush.Worker.ThirdSsl/Worker.cs b/TelpoPush.Worker.ThirdSsl/Worker.cs index 13a151f..fa9c3be 100644 --- a/TelpoPush.Worker.ThirdSsl/Worker.cs +++ b/TelpoPush.Worker.ThirdSsl/Worker.cs @@ -21,7 +21,7 @@ namespace TelpoPush.Worker.ThirdSsl while (!stoppingToken.IsCancellationRequested) { await _kafkaSubscribe.SubscribeAsync(); - await Task.Delay(30000, stoppingToken); + //await Task.Delay(30000, stoppingToken); } } } diff --git a/TelpoPush.Worker.ThirdSsl/appsettings.production.json b/TelpoPush.Worker.ThirdSsl/appsettings.production.json index 91fbc96..2fd9cab 100644 --- a/TelpoPush.Worker.ThirdSsl/appsettings.production.json +++ b/TelpoPush.Worker.ThirdSsl/appsettings.production.json @@ -6,12 +6,12 @@ }, "ServiceConfig": { "TelpoDataUrl": "http://ai.ssjlai.com/data", - "KafkaBootstrapServers": "k0.id.gdssjl.com:9094", // "172.19.42.53:9092", + "KafkaBootstrapServers": "k0.ai.gdssjl.com:9094,k1.ai.gdssjl.com:9094,k2.ai.gdssjl.com:9094", // "172.19.42.53:9092", "KafkaTopics": [ "topic.push.telpo.zkheartrate" ], "KafkaGroupId": "telpo-tcp-group", "KafkaSaslUsername": "telpo-consumer", "KafkaSaslPassword": "telpo-consumer-pwd", - "KafkaSslCaLocation": "pem/ca-root.pem", + "KafkaSslCaLocation": "pem/ca-root-prod.pem", "CacheDurationSeconds": 1200, //20分钟 "CacheDurationSeconds10": 600 //10分钟 }, diff --git a/TelpoPush.Worker.ThirdSsl/appsettings.test.json b/TelpoPush.Worker.ThirdSsl/appsettings.test.json index f48daa6..c1c8f0c 100644 --- a/TelpoPush.Worker.ThirdSsl/appsettings.test.json +++ b/TelpoPush.Worker.ThirdSsl/appsettings.test.json @@ -14,7 +14,7 @@ "KafkaGroupId": "telpo-tcp-group", "KafkaSaslUsername": "telpo-consumer", "KafkaSaslPassword": "telpo-consumer-pwd", - "KafkaSslCaLocation": "pem/ca-root.pem", + "KafkaSslCaLocation": "pem/ca-root-test.pem", "CacheDurationSeconds": 1200, //20分钟 "CacheDurationSeconds10": 600 //10分钟 }, diff --git a/pem/ca-root-prod.pem b/pem/ca-root-prod.pem new file mode 100644 index 0000000..4be3758 --- /dev/null +++ b/pem/ca-root-prod.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFDTCCAvWgAwIBAgIUMXj3EAgZN6x7V7Pj3TloZJSamAswDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLa2Fma2EtYWRtaW4wHhcNMjQwNTE3MTIwMjMyWhcNMzQw +NTE1MTIwMjMyWjAWMRQwEgYDVQQDDAtrYWZrYS1hZG1pbjCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAKsZQjhqkv6X4Xg6P3Iv7D07bAizDsTiBvocNQ3Z +/jmzL+oatokQxZzoU1glNaCDKBfrbUj7kP2thIlk6zgh3dYdUWAlC/fjDZ2GDTNa +B+XTdmL0Cj7i4b7QFc7QkPw6X/Fw1FUDT3kwkGP1OISZPq7LHR9s+Tt/UdatWqpK +/WeWNW2CXBMAIV7P1c5/8GS1PtHJm4yoUI3dvQZd1Pn4e6a6liAgbIFDjDs8f2ng +onlyM7WwqU7qnAdACaGCYn1kdN7pleoBHrKe2SvT7eX7QpkJ/7dIKeCgXqTtbeDm +fhv+XMoJvVAKhvSfizYVrcr321L3Tm+1BHnxTn76vzY+UriMkdGse0tk10Izl6Hu +X+nyf4RLkDVUqBuGyQclWonsueUxAZx3vzfnZSMxpvzEguYyWC2yyD0aoePbzY+a +/SOaAdm7FN5+Q6/HPnc1NgU4QsB5bsfYe0qUbeXJ4fI6vUbeym2VUrBIUWbC4lAT +0ElPm0A9AasuZLuXPPUaD68CdCHGHEqE6M2j2M7mQsoAN4ZOcBmj0PeurRGgVh1G +nk/1l/IbGNbD8agvy/WWxxVr2Q/QknSab44VdsBjHA6z6traq3Fb4/VqL1pk6VIu +eyoK52BNI+nAJ+9aZPtEytzzqTPcV35WR7fGvJ+nYSgdm13e5XPjTM3o93REKqw4 +GasPAgMBAAGjUzBRMB0GA1UdDgQWBBQmfsjtaWRJRPA33fSNq9Fznp+LPzAfBgNV +HSMEGDAWgBQmfsjtaWRJRPA33fSNq9Fznp+LPzAPBgNVHRMBAf8EBTADAQH/MA0G +CSqGSIb3DQEBCwUAA4ICAQBjRp3aixXzG8PNsX4DJuqJQPIMKGkPnxGCMUIdjYjm ++rAbRDRJzWqIOTYFE1FwXr5vkMr6MAR92ZwUY5k2+POwPo1ZHj8g/ESngfnLuh8Y +UojmYUU1Nofe8np1ApAArOxW/E0aPrjZOnTRGFK0M3Zzh4DP8bcC6Cy2UFfzYctb +X4lHI/CFpuqK+0uHXjSMQ67P/gyt3h7H9PjBpH08E4t/jWmldTr+KLPj3dAnnJyA +fa1WDkcxeVruhtjAXPyHAfpkWBfi3XWYJYhCas1Ng7CAdfPODAv3ya+H4EJkJt9L +hKoPybQFOPNX29hnxRX6X028yTC9e2qbMe9oaXW42ZsPGFo4nqNWzWSkiHfNx/Pp +U8kV1PLkbc0k8KKu09mj/Ude5RUJzBmTapYVG8EoeT2NHLr+XIEzw6mRzGjRqsau +kXC70tLoytLLoOfYdhInne87hD1b/XBSHktdlNGEz1yin9W7G87cfFxDNvfUZ8qN +yN/7YcXD9PS93uoE4NEgSn1np+SEeVFwUO2RRtGOShd/x3ghdI3fUTT6r8RJJmYP +L4rTQw+kpIcnKEnzybOqt4sJZYLzVBW1yCMdHIzwJGtbEgA9drZsbHA6DGAgRv/4 +1JxYR97ilnPqPsbVFKP9d83vWUoWLi8hP9LrU6SAxTP0XAocQ5tLUHHcv+8fQ78X +CQ== +-----END CERTIFICATE----- diff --git a/pem/ca-root.pem b/pem/ca-root-test.pem similarity index 100% rename from pem/ca-root.pem rename to pem/ca-root-test.pem