From 1fc200212c23e57dc2e597fe90caa3d68fc6981e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=97=AD?= <maixiaohai00@gmail.com>
Date: Thu, 25 Feb 2021 09:28:08 +0800
Subject: [PATCH] Support DLQ topic resend message (#653)

Co-authored-by: zhangxu16 <zhangxu16@xiaomi.com>
---
 src/main/resources/static/src/message.js          | 15 ++++++++++++++-
 src/main/resources/static/view/pages/message.html |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/src/message.js b/src/main/resources/static/src/message.js
index 1d70fe5..0c0aefb 100644
--- a/src/main/resources/static/src/message.js
+++ b/src/main/resources/static/src/message.js
@@ -165,7 +165,20 @@ module.controller('messageController', ['$scope', 'ngDialog', '$http','Notificat
 
 module.controller('messageDetailViewDialogController',['$scope', 'ngDialog', '$http','Notification', function ($scope, ngDialog, $http,Notification) {
 
-        $scope.resendMessage = function (msgId,topic,consumerGroup) {
+        $scope.resendMessage = function (messageView,consumerGroup) {
+            var topic = messageView.topic;
+            var msgId = messageView.msgId;
+            console.log('==='+topic+'==='+msgId);
+            if (topic.startsWith('%DLQ%')) {
+                if (messageView.properties.hasOwnProperty("RETRY_TOPIC")) {
+                    topic = messageView.properties.RETRY_TOPIC;
+                }
+                if (messageView.properties.hasOwnProperty("ORIGIN_MESSAGE_ID")) {
+                    msgId = messageView.properties.ORIGIN_MESSAGE_ID;
+                }
+
+            }
+            console.log('==='+topic+'==='+msgId);
             $http({
                 method: "POST",
                 url: "message/consumeMessageDirectly.do",
diff --git a/src/main/resources/static/view/pages/message.html b/src/main/resources/static/view/pages/message.html
index a5d4746..f8bf3c8 100644
--- a/src/main/resources/static/view/pages/message.html
+++ b/src/main/resources/static/view/pages/message.html
@@ -236,7 +236,7 @@
                 <td class="text-center">{{item.trackType}}</td>
                 <td class="text-center">
                     <button class="btn btn-raised btn-sm btn-primary" type="button"
-                            ng-click="resendMessage(ngDialogData.messageView.msgId,ngDialogData.messageView.topic,item.consumerGroup)">
+                            ng-click="resendMessage(ngDialogData.messageView,item.consumerGroup)">
                         Resend Message
                     </button>
                     <button class="btn btn-raised btn-sm btn-primary" type="button"