Merge 94dda468f9 into 2bc59db340

Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

frontend/package.json

@@ -9,7 +9,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-json-view": "^1.21.3",
-    "react-scripts": "5.0.1",
+    "react-scripts": "4.0.3",
     "web-vitals": "^1.0.1"
   },
   "proxy": "http://localhost:8080",

pom.xml

@@ -28,7 +28,7 @@
     <groupId>org.apache.rocketmq</groupId>
     <artifactId>rocketmq-dashboard</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <name>rocketmq-dashboard</name>
 
     <scm>
@@ -104,7 +104,7 @@
         <easyexcel.version>2.2.10</easyexcel.version>
         <asm.version>4.2</asm.version>
         <junit.version>4.12</junit.version>
-        <snakeyaml.version>1.32</snakeyaml.version>
+        <snakeyaml.version>1.30</snakeyaml.version>
         <cglib.version>2.2.2</cglib.version>
         <joor.version>0.9.6</joor.version>
         <bcpkix-jdk15on.version>1.68</bcpkix-jdk15on.version>
@@ -167,7 +167,6 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-namesrv</artifactId>
             <version>${rocketmq.version}</version>
-            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -187,7 +186,6 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-broker</artifactId>
             <version>${rocketmq.version}</version>
-            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -461,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>

src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java

@@ -17,29 +17,27 @@
 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;
@@ -66,20 +64,23 @@ 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
@@ -464,18 +465,15 @@ public class MQAdminExtImpl implements MQAdminExt {
         }
         catch (Exception e) {
         }
-
-        Set<String> clusterList = MQAdminInstance.threadLocalMQAdminExt().getTopicClusterList(topic);
-        if (clusterList == null || clusterList.isEmpty()) {
-            return MQAdminInstance.threadLocalMQAdminExt().queryMessage("", topic, msgId);
+        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);
         }
-        for (String name : clusterList) {
-            MessageExt messageExt = MQAdminInstance.threadLocalMQAdminExt().queryMessage(name, topic, msgId);
-            if (messageExt != null) {
-                return messageExt;
-            }
+        else {
+            return null;
         }
-        return null;
     }
 
     @Override

src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java

@@ -276,7 +276,7 @@ public class MessageServiceImpl implements MessageService {
             int idx = 0;
             for (MessageQueue messageQueue : messageQueues) {
                 Long minOffset = consumer.searchOffset(messageQueue, query.getBegin());
-                Long maxOffset = consumer.searchOffset(messageQueue, query.getEnd());
+                Long maxOffset = consumer.searchOffset(messageQueue, query.getEnd()) + 1;
                 queueOffsetInfos.add(new QueueOffsetInfo(idx++, minOffset, maxOffset, minOffset, minOffset, messageQueue));
             }
 

src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java

@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.common.stats.Stats;
 import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
 import org.apache.rocketmq.remoting.protocol.body.GroupList;
 import org.apache.rocketmq.remoting.protocol.route.BrokerData;
 import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.service.DashboardCollectService;
+import org.apache.rocketmq.store.stats.BrokerStatsManager;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.tools.command.stats.StatsAllSubCommand;
 
@@ -63,7 +63,7 @@ public class CollectTaskRunnble implements Runnable {
                 String masterAddr = bd.getBrokerAddrs().get(MixAll.MASTER_ID);
                 if (masterAddr != null) {
                     try {
-                        BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.TOPIC_PUT_NUMS, topic);
+                        BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, BrokerStatsManager.TOPIC_PUT_NUMS, topic);
                         inTPS += bsd.getStatsMinute().getTps();
                         inMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                     } catch (Exception e) {
@@ -78,7 +78,7 @@ public class CollectTaskRunnble implements Runnable {
                         if (masterAddr != null) {
                             try {
                                 String statsKey = String.format("%s@%s", topic, group);
-                                BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.GROUP_GET_NUMS, statsKey);
+                                BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, BrokerStatsManager.GROUP_GET_NUMS, statsKey);
                                 outTPS += bsd.getStatsMinute().getTps();
                                 outMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                             } catch (Exception e) {

src/main/resources/static/src/i18n/en.js

@@ -60,7 +60,6 @@ var en = {
     "RETRY": "RETRY",
     "FIFO": "FIFO",
     "TRANSACTION": "TRANSACTION",
-    "UNSPECIFIED": "UNSPECIFIED",
     "DLQ": "DLQ",
     "QUANTITY":"Quantity",
     "TYPE":"Type",

src/main/resources/static/src/i18n/zh.js

@@ -61,7 +61,6 @@ var zh = {
     "RETRY": "重试",
     "FIFO": "顺序",
     "TRANSACTION": "事务",
-    "UNSPECIFIED": "未指定",
     "DLQ": "死信",
     "QUANTITY":"数量",
     "TYPE":"类型",

src/main/resources/static/src/topic.js

@@ -48,7 +48,6 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
     $scope.filterDelay = false
     $scope.filterFifo = false
     $scope.filterTransaction = false
-    $scope.filterUnspecified = false
     $scope.filterRetry = false
     $scope.filterDLQ = false
     $scope.filterSystem = false
@@ -92,9 +91,6 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
     $scope.$watch('filterTransaction', function () {
         $scope.filterList(1);
     });
-    $scope.$watch('filterUnspecified', function () {
-        $scope.filterList(1);
-    });
     $scope.$watch('filterDelay', function () {
         $scope.filterList(1);
     });
@@ -141,30 +137,22 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
                 return true
             }
         }
-        if (localStorage.getItem('isV5') && $scope.filterUnspecified) {
-            if (type.includes("UNSPECIFIED")) {
-                return true
-            }
-        }
         if ($scope.filterNormal) {
             if (type.includes("NORMAL")) {
                 return true
             }
-            if (!localStorage.getItem('isV5') && type.includes("UNSPECIFIED")) {
-                return true
-            }
         }
-        if (localStorage.getItem('isV5') && $scope.filterDelay) {
+        if ($scope.filterDelay) {
             if (type.includes("DELAY")) {
                 return true
             }
         }
-        if (localStorage.getItem('isV5') && $scope.filterFifo) {
+        if ($scope.filterFifo) {
             if (type.includes("FIFO")) {
                 return true
             }
         }
-        if (localStorage.getItem('isV5') && $scope.filterTransaction) {
+        if ($scope.filterTransaction) {
             if (type.includes("TRANSACTION")) {
                 return true
             }

src/main/resources/static/view/pages/consumer.html

@@ -276,6 +276,15 @@
                             <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">
@@ -284,14 +293,6 @@
                             <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">
@@ -402,14 +403,6 @@
                             <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">

src/main/resources/static/view/pages/topic.html

@@ -30,8 +30,6 @@
                 </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterTransaction" class="md-primary" ng-show="rmqVersion">{{'TRANSACTION' | translate}}
                 </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-model="filterUnspecified" class="md-primary" ng-show="rmqVersion">{{'UNSPECIFIED' | translate}}
-                </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterRetry" class="md-primary">{{'RETRY' | translate}}
                 </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterDLQ" class="md-primary">{{'DLQ' | translate}}