Merge a4a6000734 into d58e13da95

fix(dockerfile): Unable to build docker image
Fix the problem of not being able to build docker image Use multi-stage builds to optimize Signed-off-by: cndoit18 <cndoit18@outlook.com>
2026-02-23 14:45:46 +08:00 · 2024-06-12 23:51:13 +08:00 · 2023-01-06 19:31:57 +08:00
11 changed files with 54 additions and 95 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+target/
--- a/docs/1_0_0/UserGuide_CN.md
+++ b/docs/1_0_0/UserGuide_CN.md
@@ -63,18 +63,6 @@
 * 根据消息主题和消息Id进行消息的查询
 * 消息详情可以展示这条消息的详细信息，查看消息对应到具体消费组的消费情况（如果异常，可以查看具体的异常信息）。可以向指定的消费组重发消息。

-## RocketMQ-V5.0 仪表盘
-* 版本切换
-  * RocketMQ右上角可切换不同版本，用户可以自主选择 RocketMQ-5.x 或 RocketMQ-4.x 版本
-* 主题页面 
-  * 支持延迟/顺序/事务消息的筛选
-  * 支持延迟/顺序/事物/普通等多种消息类型主题的新增与更新
-* 消费页面
-  * 支持顺序消费类型订阅组的过滤
-  * 提供顺序消费类型订阅组的新增与更新，如果需要开启顺序消费，FIFO类型的订阅组一定需要打开consumeOrderlyEnable选项
-* 代理页面（RocketMQ 5.0新增） 
-  * 支持代理节点的新增与查询
-  * 支持代理节点地址配置：在application.yml中可对proxyAddr和proxyAddrs属性进行预配置

 ## HTTPS 方式访问Dashboard
 * HTTPS功能实际上是使用SpringBoot提供的配置功能即可完成，首先，需要有一个SSL KeyStore来存放服务端证书，可以使用本工程所提供的测试密钥库:
--- a/docs/1_0_0/UserGuide_EN.md
+++ b/docs/1_0_0/UserGuide_EN.md
@@ -64,18 +64,6 @@
 * look over this message's detail info.you can see the message's consume state(each group has one line),show the exception message if has exception.
 you can send this message to the group you selected

-## RocketMQ-V5.0 dashboard
-* Version switching
-  * RocketMQ can switch between different versions in the upper right corner, and users can freely choose between RocketMQ-5.X or RocketMQ-4.X versions
-* Theme page
-  * Support filtering of delayed/sequential/transaction messages
-  * Support the addition and update of multiple message types such as delay, sequence, object, and ordinary themes
-* Consumption page
-  * Support filtering of subscription groups for fifo consumption types
-  * Provide the addition and update of subscription groups for sequential consumption types. If fifo consumption needs to be enabled, FIFO type subscription groups must have the consumeOrderlyEnable option enabled
-* Proxy page (Added in RocketMQ 5.0)
-  * Support for adding and querying proxy nodes
-  * Support proxy node address configuration: ProxyAddr and proxyAddrs properties can be pre configured in application.yml

 ## Access Dashboard with HTTPS
 * SpringBoot itself has provided the SSL configuration. You can use the project test Keystore:resources/rmqcngkeystore.jks. The store is generated with the following unix keytool commands:
--- a/pom.xml
+++ b/pom.xml
@@ -28,14 +28,14 @@
    <groupId>org.apache.rocketmq</groupId>
    <artifactId>rocketmq-dashboard</artifactId>
    <packaging>jar</packaging>
-    <version>2.0.0</version>
+    <version>1.0.1-SNAPSHOT</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>rocketmq-dashboard-2.0.0</tag>
+        <tag>1.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/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -15,9 +15,16 @@
 # limitations under the License.
 #

-FROM java:8
-VOLUME /tmp
-ADD rocketmq-dashboard-*.jar rocketmq-dashboard.jar
-RUN sh -c 'touch /rocketmq-dashboard.jar'
-ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-dashboard.jar" ]
+FROM maven:3.8.6-openjdk-8 AS builder
+
+ADD . .
+
+# package jar
+RUN mvn clean package -Dmaven.test.skip=true
+
+FROM openjdk:8u342-jdk
+
+# copy jar from the builder stage
+COPY --from=builder target/rocketmq-dashboard-*.jar rocketmq-dashboard.jar
+
+ENTRYPOINT exec java $JAVA_OPTS -jar rocketmq-dashboard.jar
--- 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,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
--- a/src/main/resources/static/src/i18n/en.js
+++ b/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",
--- a/src/main/resources/static/src/i18n/zh.js
+++ b/src/main/resources/static/src/i18n/zh.js
@@ -61,7 +61,6 @@ 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,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
            }
--- a/src/main/resources/static/view/pages/consumer.html
+++ b/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">
--- a/src/main/resources/static/view/pages/topic.html
+++ b/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}}
Author	SHA1	Message	Date
cndoit18	96772ab392	Merge `a4a6000734` into `d58e13da95`	2024-06-12 23:51:13 +08:00
cndoit18	a4a6000734	fix(dockerfile): Unable to build docker image Fix the problem of not being able to build docker image Use multi-stage builds to optimize Signed-off-by: cndoit18 <cndoit18@outlook.com>	2023-01-06 19:31:57 +08:00