[maven-release-plugin] prepare release rocketmq-dashboard-2.0.0

style: Remove unused imports for the checkstyle. (#232 )
* fix: 5.x query message detail throw: Failed to query message by Id: xxx * style: Remove unused imports for the checkstyle. --------- Co-authored-by: yangzengc <yangzengc@ewan.cn>
2026-06-09 06:13:18 +08:00 · 2024-09-18 09:57:04 +08:00 · 2024-09-12 16:51:34 +08:00 · 2024-09-07 19:59:38 +08:00 · 2024-08-27 20:30:00 +08:00
4 changed files with 51 additions and 51 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -28,14 +28,14 @@
    <groupId>org.apache.rocketmq</groupId>
    <artifactId>rocketmq-dashboard</artifactId>
    <packaging>jar</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.0.0</version>
    <name>rocketmq-dashboard</name>

    <scm>
        <url>git@github.com:apache/rocketmq-dashboard.git</url>
        <connection>scm:git:git@github.com:apache/rocketmq-dashboard.git</connection>
        <developerConnection>scm:git:git@github.com:apache/rocketmq-dashboard.git</developerConnection>
-        <tag>1.0.0</tag>
+        <tag>rocketmq-dashboard-2.0.0</tag>
    </scm>

    <mailingLists>
@@ -459,7 +459,7 @@
                        <configuration>
                            <target>
                                <copy todir="${project.build.directory}/classes/public">
-                                    <fileset dir="${project.basedir}/frontend/build"/>
+                                    <fileset dir="${project.basedir}/frontend/build" />
                                </copy>
                            </target>
                        </configuration>
--- a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
@@ -17,27 +17,29 @@
 package org.apache.rocketmq.dashboard.service.client;

 import com.google.common.base.Throwables;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
 import org.apache.rocketmq.client.QueryResult;
 import org.apache.rocketmq.client.exception.MQBrokerException;
 import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.client.impl.MQAdminImpl;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.message.MessageRequestMode;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
+import org.apache.rocketmq.remoting.RemotingClient;
+import org.apache.rocketmq.remoting.exception.RemotingCommandException;
+import org.apache.rocketmq.remoting.exception.RemotingConnectException;
+import org.apache.rocketmq.remoting.exception.RemotingException;
+import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
+import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
+import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.RequestCode;
 import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
 import org.apache.rocketmq.remoting.protocol.body.BrokerReplicasInfo;
 import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
 import org.apache.rocketmq.remoting.protocol.body.ClusterAclVersionInfo;
@@ -64,23 +66,20 @@ import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail;
 import org.apache.rocketmq.remoting.protocol.subscription.GroupForbidden;
 import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
-import org.apache.rocketmq.dashboard.util.JsonUtil;
-import org.apache.rocketmq.remoting.RemotingClient;
-import org.apache.rocketmq.remoting.exception.RemotingCommandException;
-import org.apache.rocketmq.remoting.exception.RemotingConnectException;
-import org.apache.rocketmq.remoting.exception.RemotingException;
-import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
-import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
-import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.tools.admin.api.BrokerOperatorResult;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
 import org.apache.rocketmq.tools.admin.common.AdminToolResult;
-import org.joor.Reflect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
 import static org.apache.rocketmq.remoting.protocol.RemotingSerializable.decode;

@Service
@@ -465,15 +464,18 @@ public class MQAdminExtImpl implements MQAdminExt {
        }
        catch (Exception e) {
        }
-        MQAdminImpl mqAdminImpl = MQAdminInstance.threadLocalMqClientInstance().getMQAdminImpl();
-        QueryResult qr = Reflect.on(mqAdminImpl).call("queryMessage", topic, msgId, 32,
-            MessageClientIDSetter.getNearlyTimeFromID(msgId).getTime() - 1000 * 60 * 60 * 13L, Long.MAX_VALUE, true).get();
-        if (qr != null && qr.getMessageList() != null && qr.getMessageList().size() > 0) {
-            return qr.getMessageList().get(0);
+
+        Set<String> clusterList = MQAdminInstance.threadLocalMQAdminExt().getTopicClusterList(topic);
+        if (clusterList == null || clusterList.isEmpty()) {
+            return MQAdminInstance.threadLocalMQAdminExt().queryMessage("", topic, msgId);
        }
-        else {
-            return null;
+        for (String name : clusterList) {
+            MessageExt messageExt = MQAdminInstance.threadLocalMQAdminExt().queryMessage(name, topic, msgId);
+            if (messageExt != null) {
+                return messageExt;
+            }
        }
+        return null;
    }

    @Override
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java
@@ -37,10 +37,9 @@ import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.common.protocol.body.Connection;
-import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
+import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.exception.ServiceException;
 import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
@@ -68,7 +67,6 @@ import java.util.ArrayList;
 import java.util.Set;
 import java.util.Collection;
 import java.util.Date;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

@@ -220,19 +218,12 @@ public class MessageServiceImpl implements MessageService {

        try {
            ConsumerConnection consumerConnection = mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
-            MessageExt messageExt = mqAdminExt.viewMessage(topic, msgId);
            for (Connection connection : consumerConnection.getConnectionSet()) {
                if (StringUtils.isBlank(connection.getClientId())) {
                    continue;
                }
-                ConcurrentMap<String, SubscriptionData> subscriptionTable = consumerConnection.getSubscriptionTable();
-                SubscriptionData subscriptionData = subscriptionTable.get(topic);
-                if (subscriptionData.getSubString().equals(SubscriptionData.SUB_ALL)
-                        || subscriptionData.getTagsSet().contains(messageExt.getTags())) {
-                    logger.info("clientId={}", connection.getClientId());
-                    return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
-                }
-                throw new IllegalStateException("CONSUMER NOT SUBSCRIPT THIS TAG");
+                logger.info("clientId={}", connection.getClientId());
+                return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
            }
        } catch (Exception e) {
            Throwables.throwIfUnchecked(e);
--- a/src/main/resources/static/view/pages/consumer.html
+++ b/src/main/resources/static/view/pages/consumer.html
@@ -276,15 +276,6 @@
                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
                        </div>
                    </div>
-                    <!--<div class="form-group">-->
-                    <!--<label class="control-label col-sm-4">retryMaxTimes:</label>-->
-                    <!--<div class="col-sm-8">-->
-                    <!--<input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes"-->
-                    <!--type="text"-->
-                    <!--required/>-->
-                    <!--<span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>-->
-                    <!--</div>-->
-                    <!--</div>-->
                    <div class="form-group">
                        <label class="control-label col-sm-3">brokerId:</label>
                        <div class="col-sm-9">
@@ -293,6 +284,14 @@
                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
                        </div>
                    </div>
+                    <div class="form-group">
+                        <label class="control-label col-sm-3">retryMaxTimes:</label>
+                        <div class="col-sm-9">
+                            <input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes" type="text"
+                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
+                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
+                        </div>
+                    </div>
                    <div class="form-group">
                        <label class="control-label col-sm-3">whichBrokerWhenConsumeSlowly:</label>
                        <div class="col-sm-9">
@@ -403,6 +402,14 @@
                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
                        </div>
                    </div>
+                    <div class="form-group">
+                        <label class="control-label col-sm-3">retryMaxTimes:</label>
+                        <div class="col-sm-9">
+                            <input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes" type="text"
+                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
+                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
+                        </div>
+                    </div>
                    <div class="form-group">
                        <label class="control-label col-sm-3">whichBrokerWhenConsumeSlowly:</label>
                        <div class="col-sm-9">
Author	SHA1	Message	Date
RongtongJin	f5c09ac287	[maven-release-plugin] prepare release rocketmq-dashboard-2.0.0	2024-09-18 09:57:04 +08:00
Guyu	e97072a3b1	style: Remove unused imports for the checkstyle. (#232 ) * fix: 5.x query message detail throw: Failed to query message by Id: xxx * style: Remove unused imports for the checkstyle. --------- Co-authored-by: yangzengc <yangzengc@ewan.cn>	2024-09-12 16:51:34 +08:00
Evan	6d360509c0	fix: 5.x query message detail throw: Failed to query message by Id: xxx (#231 ) Co-authored-by: yangzengc <yangzengc@ewan.cn>	2024-09-07 19:59:38 +08:00
Akai	464f57adf8	Support retryMaxTimes filed set for consumer group (#229 ) * fix:Fixed the issue that normal messages in version v4 are not showed * feat:support retryMaxTimes args set --------- Co-authored-by: yuanziwei <yuanziwei@xiaomi.com> Co-authored-by: yuanziwei.akai <yuanziwei.akai@bytedance.com>	2024-08-27 20:30:00 +08:00