Support DLQ topic resend message (#653)
Co-authored-by: zhangxu16 <zhangxu16@xiaomi.com>
diff --git a/rocketmq-console/src/main/resources/static/src/message.js b/rocketmq-console/src/main/resources/static/src/message.js
index 1d70fe5..0c0aefb 100644
--- a/rocketmq-console/src/main/resources/static/src/message.js
+++ b/rocketmq-console/src/main/resources/static/src/message.js
@@ -165,7 +165,20 @@
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/rocketmq-console/src/main/resources/static/view/pages/message.html b/rocketmq-console/src/main/resources/static/view/pages/message.html
index a5d4746..f8bf3c8 100644
--- a/rocketmq-console/src/main/resources/static/view/pages/message.html
+++ b/rocketmq-console/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"
