Bump cross-spawn and react-scripts in /frontend

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) to 7.0.6 and updates ancestor dependency [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts). These dependencies need to be updated together. Updates `cross-spawn` from 7.0.3 to 7.0.6 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) Updates `react-scripts` from 4.0.3 to 5.0.1 - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-4.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect - dependency-name: react-scripts dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
remove rocketmq-namesrv dependency (#254 )
2026-05-29 22:03:45 +08:00 · 2024-11-19 17:24:59 +00:00 · 2024-11-04 15:49:02 +08:00 · 2024-11-04 11:36:30 +08:00 · 2024-11-04 11:35:39 +08:00 · 2024-11-04 11:35:17 +08:00
12 changed files with 13585 additions and 17658 deletions
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,7 +9,7 @@
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "react-json-view": "^1.21.3",
-    "react-scripts": "4.0.3",
+    "react-scripts": "5.0.1",
    "web-vitals": "^1.0.1"
  },
  "proxy": "http://localhost:8080",
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
    <groupId>org.apache.rocketmq</groupId>
    <artifactId>rocketmq-dashboard</artifactId>
    <packaging>jar</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.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.30</snakeyaml.version>
+        <snakeyaml.version>1.32</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,6 +167,7 @@
            <groupId>org.apache.rocketmq</groupId>
            <artifactId>rocketmq-namesrv</artifactId>
            <version>${rocketmq.version}</version>
+            <scope>test</scope>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -186,6 +187,7 @@
            <groupId>org.apache.rocketmq</groupId>
            <artifactId>rocketmq-broker</artifactId>
            <version>${rocketmq.version}</version>
+            <scope>test</scope>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -459,7 +461,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
@@ -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()) + 1;
+                Long maxOffset = consumer.searchOffset(messageQueue, query.getEnd());
                queueOffsetInfos.add(new QueueOffsetInfo(idx++, minOffset, maxOffset, minOffset, minOffset, messageQueue));
            }

--- a/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java
+++ b/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, BrokerStatsManager.TOPIC_PUT_NUMS, topic);
+                        BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.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, BrokerStatsManager.GROUP_GET_NUMS, statsKey);
+                                BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.GROUP_GET_NUMS, statsKey);
                                outTPS += bsd.getStatsMinute().getTps();
                                outMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                            } catch (Exception e) {
--- a/src/main/resources/static/src/i18n/en.js
+++ b/src/main/resources/static/src/i18n/en.js
@@ -60,6 +60,7 @@ var en = {
    "RETRY": "RETRY",
    "FIFO": "FIFO",
    "TRANSACTION": "TRANSACTION",
+    "UNSPECIFIED": "UNSPECIFIED",
    "DLQ": "DLQ",
    "QUANTITY":"Quantity",
    "TYPE":"Type",
--- a/src/main/resources/static/src/i18n/zh.js
+++ b/src/main/resources/static/src/i18n/zh.js
@@ -61,6 +61,7 @@ var zh = {
    "RETRY": "重试",
    "FIFO": "顺序",
    "TRANSACTION": "事务",
+    "UNSPECIFIED": "未指定",
    "DLQ": "死信",
    "QUANTITY":"数量",
    "TYPE":"类型",
--- a/src/main/resources/static/src/topic.js
+++ b/src/main/resources/static/src/topic.js
@@ -48,6 +48,7 @@ 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
@@ -91,6 +92,9 @@ 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);
    });
@@ -137,22 +141,30 @@ 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 ($scope.filterDelay) {
+        if (localStorage.getItem('isV5') && $scope.filterDelay) {
            if (type.includes("DELAY")) {
                return true
            }
        }
-        if ($scope.filterFifo) {
+        if (localStorage.getItem('isV5') && $scope.filterFifo) {
            if (type.includes("FIFO")) {
                return true
            }
        }
-        if ($scope.filterTransaction) {
+        if (localStorage.getItem('isV5') && $scope.filterTransaction) {
            if (type.includes("TRANSACTION")) {
                return true
            }
--- 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">
--- a/src/main/resources/static/view/pages/topic.html
+++ b/src/main/resources/static/view/pages/topic.html
@@ -30,6 +30,8 @@
                </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}}
Author	SHA1	Message	Date
dependabot[bot]	8d8868099a	Bump cross-spawn and react-scripts in /frontend Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) to 7.0.6 and updates ancestor dependency [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts). These dependencies need to be updated together. Updates `cross-spawn` from 7.0.3 to 7.0.6 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) Updates `react-scripts` from 4.0.3 to 5.0.1 - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-4.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect - dependency-name: react-scripts dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-19 17:24:59 +00:00
yuz10	e57d423268	remove rocketmq-namesrv dependency (#254 )	2024-11-04 15:49:02 +08:00
dependabot[bot]	0d87486d7a	Bump snakeyaml from 1.30 to 1.32 (#130 ) --- updated-dependencies: - dependency-name: org.yaml:snakeyaml dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-04 11:36:30 +08:00
yuz10	94d7a4e418	remove rocketmq-broker dependency (#249 )	2024-11-04 11:35:39 +08:00
xx	3fbaa3ab92	fix: Duplicate message in the topic tab message list in the message menu. (#202 ) Co-authored-by: xx <xx@123.com>	2024-11-04 11:35:17 +08:00
RongtongJin	e6d454301f	[maven-release-plugin] prepare for next development iteration	2024-09-18 09:57:37 +08:00
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
Akai	5d08d3b122	Support Unspecified Topic Add & Update & Query (#223 ) * fix:Fixed the issue that normal messages in version v4 are not showed * feat:support unspecified topic --------- Co-authored-by: yuanziwei <yuanziwei@xiaomi.com>	2024-07-24 10:57:04 +08:00
Akai	d9fc76d3a3	fix:Fixed the issue that normal messages in version v4 are not showed (#222 ) Co-authored-by: yuanziwei <yuanziwei@xiaomi.com>	2024-07-24 10:56:47 +08:00