dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop/2.5.5'

Browse Source
This commit is contained in:
Igor Kulikov 2020-11-11 09:23:39 +02:00
commit 74d4f84a7d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
View File

@ -87,8 +87,9 @@ public class TbAwsSqsProducerTemplate<T extends TbQueueMsg> implements TbQueuePr
sendMsgRequest.withQueueUrl(getQueueUrl(tpi.getFullTopicName())); sendMsgRequest.withQueueUrl(getQueueUrl(tpi.getFullTopicName()));
sendMsgRequest.withMessageBody(gson.toJson(new DefaultTbQueueMsg(msg))); sendMsgRequest.withMessageBody(gson.toJson(new DefaultTbQueueMsg(msg)));
sendMsgRequest.withMessageGroupId(tpi.getTopic()); String sqsMsgId = UUID.randomUUID().toString();
sendMsgRequest.withMessageDeduplicationId(UUID.randomUUID().toString()); sendMsgRequest.withMessageGroupId(sqsMsgId);
sendMsgRequest.withMessageDeduplicationId(sqsMsgId);
ListenableFuture<SendMessageResult> future = producerExecutor.submit(() -> sqsClient.sendMessage(sendMsgRequest)); ListenableFuture<SendMessageResult> future = producerExecutor.submit(() -> sqsClient.sendMessage(sendMsgRequest));

1
docker/queue-kafka.env
View File

@ -1,3 +1,2 @@
TB_QUEUE_TYPE=kafka TB_QUEUE_TYPE=kafka
TB_KAFKA_SERVERS=kafka:9092 TB_KAFKA_SERVERS=kafka:9092
TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES=retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100

6
msa/js-executor/queue/awsSqsTemplate.js
View File

@ -52,11 +52,13 @@ function AwsSqsProducer() {
queueUrls.set(responseTopic, responseQueueUrl); queueUrls.set(responseTopic, responseQueueUrl);
} }
let msgId = uuid();
let params = { let params = {
MessageBody: msgBody, MessageBody: msgBody,
QueueUrl: responseQueueUrl, QueueUrl: responseQueueUrl,
MessageGroupId: 'js_eval', MessageGroupId: msgId,
MessageDeduplicationId: uuid() MessageDeduplicationId: msgId
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {