[rocketmq] branch develop updated: [ISSUE #6266] get MessageId from UNIQ_KEY firstly when build system message (#6267)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaili pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2b42e1648 [ISSUE #6266] get MessageId from UNIQ_KEY firstly when build system message (#6267)
2b42e1648 is described below

commit 2b42e164800cb9e168536a2f1d650091e9f9c41e
Author: lk <xd...@outlook.com>
AuthorDate: Wed Mar 8 09:46:49 2023 +0800

    [ISSUE #6266] get MessageId from UNIQ_KEY firstly when build system message (#6267)
---
 .../java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
index 21526054a..a1fd88603 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
@@ -139,7 +139,10 @@ public class GrpcConverter {
         }
 
         // message_id
-        String uniqKey = messageExt.getMsgId();
+        String uniqKey = messageExt.getProperty(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX);
+        if (uniqKey == null) {
+            uniqKey = messageExt.getMsgId();
+        }
         if (uniqKey != null) {
             systemPropertiesBuilder.setMessageId(uniqKey);
         }